Revert "Don't believe the PV decoder's lies..."

We see corruption in timestamp and hence framedrop
while playing an MPEG4 file. Reverting this commit
fixes the issue.

This reverts commit 977702929b085882aa7a748711cc3280f3195fbe.

Change-Id: I75566c21e6a383794d9873f02baf7a06882cddc4
Signed-off-by: Vishal Bhoj <vishal.bhoj@linaro.org>

1 files changed, 1 insertions, 6 deletions

diff --git a/media/libstagefright/codecs/m4v_h263/dec/SoftMPEG4.cpp b/media/libstagefright/codecs/m4v_h263/dec/SoftMPEG4.cpp
index aa07e5793a7f..ddced5f5f5e8 100644
--- a/media/libstagefright/codecs/m4v_h263/dec/SoftMPEG4.cpp
+++ b/media/libstagefright/codecs/m4v_h263/dec/SoftMPEG4.cpp
@@ -421,13 +421,8 @@ void SoftMPEG4::onQueueFilled(OMX_U32 portIndex) {
 
         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, &tmp,
+                    mHandle, &bitstream, &timestamp, &bufferSize,
                     &useExtTimestamp,
                     outHeader->pBuffer) != PV_TRUE) {
             LOGE("failed to decode video frame.");