diff options
| author | Andreas Huber <andih@google.com> | 2011-11-10 08:48:34 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-11-10 08:48:34 -0800 |
| commit | ca957d753496aff94dbb93b547e1c605bbfa064b (patch) | |
| tree | 575862af4ce60087607dd536a19ec33168976052 /media | |
| parent | d57a4ddd1ab42401c4a011df7e9577b843de1b68 (diff) | |
| parent | 0029faf8f4efbca3844c4174b75d46c432f8f272 (diff) | |
| download | frameworks_av-ca957d753496aff94dbb93b547e1c605bbfa064b.zip frameworks_av-ca957d753496aff94dbb93b547e1c605bbfa064b.tar.gz frameworks_av-ca957d753496aff94dbb93b547e1c605bbfa064b.tar.bz2 | |
Merge "Don't believe the PV decoder's lies..." into ics-mr1
Diffstat (limited to 'media')
| -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."); |