commit f4407649ea26382dd33109c71cc0c3b150f56f87
author Andreas Huber <andih@google.com> Wed May 09 01:47:07 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed May 09 01:47:07 2012 -0700
tree ea5ee2b7d5282a385f8471887c4ceb2666e96957
parent 70dbe3e9c240e6ae1a23edc4dc7ee8b6261667c5
parent a9623e018737889d32f6b231f913a70d020c7ac5

am a9623e01: Merge "Fix both H.263 and MPEG4 decoders." into jb-dev

* commit 'a9623e018737889d32f6b231f913a70d020c7ac5':
  Fix both H.263 and MPEG4 decoders.

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 a34a0ca..d527fde 100644
--- a/media/libstagefright/codecs/m4v_h263/dec/SoftMPEG4.cpp
+++ b/media/libstagefright/codecs/m4v_h263/dec/SoftMPEG4.cpp
@@ -420,12 +420,11 @@
             useExtTimestamp ? (inHeader->nTimeStamp + 500) / 1000 : 0xFFFFFFFF;
 
         int32_t bufferSize = inHeader->nFilledLen;
+        int32_t tmp = bufferSize;
 
         // 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, &tmp,
                     &useExtTimestamp,
@@ -444,9 +443,8 @@
         // decoder deals in ms, OMX in us.
         outHeader->nTimeStamp = timestamp * 1000;
 
-        CHECK_LE(bufferSize, inHeader->nFilledLen);
-        inHeader->nOffset += inHeader->nFilledLen - bufferSize;
-        inHeader->nFilledLen = bufferSize;
+        inHeader->nOffset += bufferSize;
+        inHeader->nFilledLen = 0;
 
         if (inHeader->nFilledLen == 0) {
             inInfo->mOwnedByUs = false;