diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-08-26 10:38:53 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-08-26 10:38:53 -0700 |
| commit | 4b8e3fb51155ab6c990803ff7780cd1b8c8f3dcf (patch) | |
| tree | b99a9d151d85dadbe29a358fd52ef99a7babfb0c | |
| parent | c27bff913a2c9c4a1f42b00951740cf139cb19ad (diff) | |
| parent | d7795892a551643dfd884f884170cb51f70edf92 (diff) | |
| download | frameworks_base-4b8e3fb51155ab6c990803ff7780cd1b8c8f3dcf.zip frameworks_base-4b8e3fb51155ab6c990803ff7780cd1b8c8f3dcf.tar.gz frameworks_base-4b8e3fb51155ab6c990803ff7780cd1b8c8f3dcf.tar.bz2 | |
Merge change 22777 into eclair
* changes:
Disregard the EOS buffer flag while flushing or shutting down the decoder.
| -rw-r--r-- | media/libstagefright/OMXCodec.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/media/libstagefright/OMXCodec.cpp b/media/libstagefright/OMXCodec.cpp index 1c68f2b..9cdc7f7 100644 --- a/media/libstagefright/OMXCodec.cpp +++ b/media/libstagefright/OMXCodec.cpp @@ -857,7 +857,8 @@ void OMXCodec::on_message(const omx_message &msg) { CHECK_EQ(err, OK); buffers->removeAt(i); - } else if (flags & OMX_BUFFERFLAG_EOS) { + } else if (mPortStatus[kPortIndexOutput] == ENABLED + && (flags & OMX_BUFFERFLAG_EOS)) { LOGV("No more output data."); mNoMoreOutputData = true; mBufferFilled.signal(); |