summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2013-11-12 10:51:39 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2013-11-12 10:51:39 -0800
commit2c165bad49eb3a04f901d2e6e87a80757fc97485 (patch)
tree70aff9b8073f11b7c5f0fa3504b8958c32b0a0c2 /media
parent48da8933f18e7ebd5bccb8de04aada099ed99e74 (diff)
parent073dec19db486290a02d9952e392df9cda5700ad (diff)
downloadframeworks_av-2c165bad49eb3a04f901d2e6e87a80757fc97485.zip
frameworks_av-2c165bad49eb3a04f901d2e6e87a80757fc97485.tar.gz
frameworks_av-2c165bad49eb3a04f901d2e6e87a80757fc97485.tar.bz2
am 073dec19: am 22990fe1: Merge "Back to the old way of making sure that no more buffers are submitted" into klp-dev
* commit '073dec19db486290a02d9952e392df9cda5700ad': Back to the old way of making sure that no more buffers are submitted
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) {