diff options
| author | Marco Nelissen <marcone@google.com> | 2012-12-20 11:19:49 -0800 |
|---|---|---|
| committer | Marco Nelissen <marcone@google.com> | 2012-12-20 11:19:49 -0800 |
| commit | 4c44e9fed87ff6363393f2559b150291242da247 (patch) | |
| tree | 3082997c20ed056ec25f71496a3c7a6a337a1a4e /media/libstagefright/codecs/m4v_h263/dec/SoftMPEG4.cpp | |
| parent | 0ebf429406d796df74f781dfe085ee73851fe2a1 (diff) | |
| download | frameworks_av-4c44e9fed87ff6363393f2559b150291242da247.zip frameworks_av-4c44e9fed87ff6363393f2559b150291242da247.tar.gz frameworks_av-4c44e9fed87ff6363393f2559b150291242da247.tar.bz2 | |
Ensure proper EOS behavior
If a buffer is tagged with EOS but has data in it, decode that data
instead of ignoring it.
Change-Id: Ie41c8485c3ad7fe7d9c64f0752c2e7601d91d602
Diffstat (limited to 'media/libstagefright/codecs/m4v_h263/dec/SoftMPEG4.cpp')
| -rw-r--r-- | media/libstagefright/codecs/m4v_h263/dec/SoftMPEG4.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/media/libstagefright/codecs/m4v_h263/dec/SoftMPEG4.cpp b/media/libstagefright/codecs/m4v_h263/dec/SoftMPEG4.cpp index d527fde..020cc0a 100644 --- a/media/libstagefright/codecs/m4v_h263/dec/SoftMPEG4.cpp +++ b/media/libstagefright/codecs/m4v_h263/dec/SoftMPEG4.cpp @@ -326,7 +326,7 @@ void SoftMPEG4::onQueueFilled(OMX_U32 portIndex) { OMX_BUFFERHEADERTYPE *outHeader = port->mBuffers.editItemAt(mNumSamplesOutput & 1).mHeader; - if (inHeader->nFlags & OMX_BUFFERFLAG_EOS) { + if ((inHeader->nFlags & OMX_BUFFERFLAG_EOS) && inHeader->nFilledLen == 0) { inQueue.erase(inQueue.begin()); inInfo->mOwnedByUs = false; notifyEmptyBufferDone(inHeader); @@ -445,6 +445,11 @@ void SoftMPEG4::onQueueFilled(OMX_U32 portIndex) { inHeader->nOffset += bufferSize; inHeader->nFilledLen = 0; + if (inHeader->nFlags & OMX_BUFFERFLAG_EOS) { + outHeader->nFlags = OMX_BUFFERFLAG_EOS; + } else { + outHeader->nFlags = 0; + } if (inHeader->nFilledLen == 0) { inInfo->mOwnedByUs = false; @@ -458,7 +463,6 @@ void SoftMPEG4::onQueueFilled(OMX_U32 portIndex) { outHeader->nOffset = 0; outHeader->nFilledLen = (mWidth * mHeight * 3) / 2; - outHeader->nFlags = 0; List<BufferInfo *>::iterator it = outQueue.begin(); while ((*it)->mHeader != outHeader) { |