diff options
author | Android (Google) Code Review <android-gerrit@google.com> | 2009-09-17 14:46:45 -0400 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-09-17 14:46:45 -0400 |
commit | cdc9847ba4caa93817a8edf3014919d4480298ad (patch) | |
tree | 166441b1f4aa6b33366ee8690d39991e59e1ef20 /media | |
parent | 9e3ebf8c45ff1872a473c948acb8b7d9e3648f56 (diff) | |
parent | 5228dd1b7468bfc86a807a299f515d33048f96ac (diff) | |
download | frameworks_av-cdc9847ba4caa93817a8edf3014919d4480298ad.zip frameworks_av-cdc9847ba4caa93817a8edf3014919d4480298ad.tar.gz frameworks_av-cdc9847ba4caa93817a8edf3014919d4480298ad.tar.bz2 |
Merge change 25528 into eclair
* changes:
Another stagefright test-case and ignore end-of-stream notifications while we're flushing.
Diffstat (limited to 'media')
-rw-r--r-- | media/libstagefright/OMXCodec.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/media/libstagefright/OMXCodec.cpp b/media/libstagefright/OMXCodec.cpp index ba4c4c7..c4c6149 100644 --- a/media/libstagefright/OMXCodec.cpp +++ b/media/libstagefright/OMXCodec.cpp @@ -1148,6 +1148,13 @@ void OMXCodec::onCmdComplete(OMX_COMMANDTYPE cmd, OMX_U32 data) { CODEC_LOGV("Finished flushing both ports, now continuing from" " seek-time."); + // Clear this flag in case the decoder sent us either + // the EVENT_BUFFER_FLAG(1) or an output buffer with + // the EOS flag set _while_ flushing. Since we're going + // to submit "fresh" input data now, this flag no longer + // applies to our future. + mNoMoreOutputData = false; + drainInputBuffers(); fillOutputBuffers(); } |