commit b42aea5b4c7cc7b2766f80f5ceda94b324d776e5
author Andreas Huber <andih@google.com> Thu Nov 10 08:48:34 2011 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Thu Nov 10 08:48:34 2011 -0800
tree 5f06d48c8749af3a42f54ed85c01ac160e7b191e
parent 7c063cf9679a2ecdda5e1639cfdca3e1084019f9
parent 977702929b085882aa7a748711cc3280f3195fbe

Merge "Don't believe the PV decoder's lies..." into ics-mr1

media/libstagefright/codecs/m4v_h263/dec/SoftMPEG4.cpp

diff --git a/media/libstagefright/codecs/m4v_h263/dec/SoftMPEG4.cpp b/media/libstagefright/codecs/m4v_h263/dec/SoftMPEG4.cpp
index ddced5f..aa07e57 100644
--- a/media/libstagefright/codecs/m4v_h263/dec/SoftMPEG4.cpp
+++ b/media/libstagefright/codecs/m4v_h263/dec/SoftMPEG4.cpp
@@ -421,8 +421,13 @@
 
         int32_t bufferSize = inHeader->nFilledLen;
 
+        // The PV decoder is lying to us, sometimes it'll claim to only have
+        // consumed a subset of the buffer when it clearly consumed all of it.
+        // ignore whatever it says...
+        int32_t tmp = bufferSize;
+
         if (PVDecodeVideoFrame(
-                    mHandle, &bitstream, &timestamp, &bufferSize,
+                    mHandle, &bitstream, &timestamp, &tmp,
                     &useExtTimestamp,
                     outHeader->pBuffer) != PV_TRUE) {
             LOGE("failed to decode video frame.");