commit a63b4da5e41e7835b1ac6db235fd9764528082fc
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Jul 26 18:19:32 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jul 26 18:19:32 2017 +0000
tree 64259d7c737287f6ed7a64409b85fcb679071330
parent 58091c2e6c4bb9cec306cbfb47518d65af431200
parent ed31e32afc3c0b3883e7dcb7f3fbfee7af2c7df2

Merge "fix output nFilledLen when prepareForAdaptivePlayback is true" into oc-mr1-dev

media/libstagefright/codecs/mpeg2dec/SoftMPEG2.cpp

diff --git a/media/libstagefright/codecs/mpeg2dec/SoftMPEG2.cpp b/media/libstagefright/codecs/mpeg2dec/SoftMPEG2.cpp
index 9a69226..9d5f342 100644
--- a/media/libstagefright/codecs/mpeg2dec/SoftMPEG2.cpp
+++ b/media/libstagefright/codecs/mpeg2dec/SoftMPEG2.cpp
@@ -789,7 +789,7 @@
 
             if (s_dec_op.u4_output_present) {
                 ssize_t timeStampIdx;
-                outHeader->nFilledLen = (mWidth * mHeight * 3) / 2;
+                outHeader->nFilledLen = (outputBufferWidth() * outputBufferHeight() * 3) / 2;
 
                 timeStampIdx = getMinTimestampIdx(mTimeStamps, mTimeStampsValid);
                 if (timeStampIdx < 0) {