Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 4b8e3fb5: Merge change 22777 into eclair

Browse Source 
Merge commit '4b8e3fb51155ab6c990803ff7780cd1b8c8f3dcf' into eclair-plus-aosp

* commit '4b8e3fb51155ab6c990803ff7780cd1b8c8f3dcf':
  Disregard the EOS buffer flag while flushing or shutting down the decoder.
This commit is contained in:
Andreas Huber
2009-08-26 10:40:33 -07:00
committed by Android Git Automerger
parent ba32abaca9 4b8e3fb511
commit 57fff7f619
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
media/libstagefright/OMXCodec.cpp
View File

@@ -857,7 +857,8 @@ void OMXCodec::on_message(const omx_message &msg) {
CHECK_EQ(err, OK); CHECK_EQ(err, OK);
buffers->removeAt(i); buffers->removeAt(i);
} else if (flags & OMX_BUFFERFLAG_EOS) { } else if (mPortStatus[kPortIndexOutput] == ENABLED
&& (flags & OMX_BUFFERFLAG_EOS)) {
LOGV("No more output data."); LOGV("No more output data.");
mNoMoreOutputData = true; mNoMoreOutputData = true;
mBufferFilled.signal(); mBufferFilled.signal();