diff options
| author | Andreas Huber <andih@google.com> | 2011-11-10 16:51:58 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-10 16:51:58 +0000 |
| commit | eec2d81676a50338763b86073545a5365d19eee7 (patch) | |
| tree | 575862af4ce60087607dd536a19ec33168976052 /media/libstagefright/codecs/m4v_h263 | |
| parent | bb3e9ebcc7fd5823164b54835b56371f317189bb (diff) | |
| parent | ca957d753496aff94dbb93b547e1c605bbfa064b (diff) | |
| download | frameworks_av-eec2d81676a50338763b86073545a5365d19eee7.zip frameworks_av-eec2d81676a50338763b86073545a5365d19eee7.tar.gz frameworks_av-eec2d81676a50338763b86073545a5365d19eee7.tar.bz2 | |
am b42aea5b: Merge "Don\'t believe the PV decoder\'s lies..." into ics-mr1
* commit 'b42aea5b4c7cc7b2766f80f5ceda94b324d776e5':
Don't believe the PV decoder's lies...
Diffstat (limited to 'media/libstagefright/codecs/m4v_h263')
| -rw-r--r-- | media/libstagefright/codecs/m4v_h263/dec/SoftMPEG4.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
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 @@ 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, ×tamp, &bufferSize, + mHandle, &bitstream, ×tamp, &tmp, &useExtTimestamp, outHeader->pBuffer) != PV_TRUE) { LOGE("failed to decode video frame."); |