summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2013-11-08 10:57:34 -0800
committerAndreas Huber <andih@google.com>2013-11-08 10:57:34 -0800
commit892e1b9ab055075ba9036fb7dd6404e9e0f2677a (patch)
treeb5ce9c2ca0ac05475a8384fcb85ea9f4af76c54b /media
parent51ac2d6451b8614aaad83e5bd29ccb7a3fc4651c (diff)
downloadframeworks_av-892e1b9ab055075ba9036fb7dd6404e9e0f2677a.zip
frameworks_av-892e1b9ab055075ba9036fb7dd6404e9e0f2677a.tar.gz
frameworks_av-892e1b9ab055075ba9036fb7dd6404e9e0f2677a.tar.bz2
Back to the old way of making sure that no more buffers are submitted
to the component while in executing->idle state. Change-Id: Ia207f0a112025ed0e2c4d62f404afbbfa694cbab related-to-bug: 11557463, 11573543
Diffstat (limited to 'media')
-rw-r--r--media/libstagefright/omx/GraphicBufferSource.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/media/libstagefright/omx/GraphicBufferSource.cpp b/media/libstagefright/omx/GraphicBufferSource.cpp
index a7c5317..b8970ad 100644
--- a/media/libstagefright/omx/GraphicBufferSource.cpp
+++ b/media/libstagefright/omx/GraphicBufferSource.cpp
@@ -156,7 +156,7 @@ void GraphicBufferSource::omxIdle() {
if (mExecuting) {
// We are only interested in the transition from executing->idle,
// not loaded->idle.
- mEndOfStream = mEndOfStreamSent = true;
+ mExecuting = false;
}
}
@@ -206,7 +206,9 @@ void GraphicBufferSource::addCodecBuffer(OMX_BUFFERHEADERTYPE* header) {
void GraphicBufferSource::codecBufferEmptied(OMX_BUFFERHEADERTYPE* header) {
Mutex::Autolock autoLock(mMutex);
- CHECK(mExecuting); // could this happen if app stop()s early?
+ if (!mExecuting) {
+ return;
+ }
int cbi = findMatchingCodecBuffer_l(header);
if (cbi < 0) {