diff options
| author | Andy McFadden <fadden@android.com> | 2013-07-24 00:26:25 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-07-24 00:26:26 +0000 |
| commit | de7c96afc382ac73108116d3431342633fa4e489 (patch) | |
| tree | f60a93727e18d093459513c5f7227e0f94cd43f5 /media | |
| parent | d1fbc4659ca79b08f1d75ccd082788da24f26ae9 (diff) | |
| parent | ba812e3b3ca0a0c9459fe29bbc211c9a73313b8b (diff) | |
| download | frameworks_av-de7c96afc382ac73108116d3431342633fa4e489.zip frameworks_av-de7c96afc382ac73108116d3431342633fa4e489.tar.gz frameworks_av-de7c96afc382ac73108116d3431342633fa4e489.tar.bz2 | |
Merge "Don't abort on unusual state transition"
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/omx/GraphicBufferSource.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/media/libstagefright/omx/GraphicBufferSource.cpp b/media/libstagefright/omx/GraphicBufferSource.cpp index bbd71be..d6fd95b 100644 --- a/media/libstagefright/omx/GraphicBufferSource.cpp +++ b/media/libstagefright/omx/GraphicBufferSource.cpp @@ -130,10 +130,12 @@ void GraphicBufferSource::omxExecuting() { void GraphicBufferSource::omxLoaded(){ Mutex::Autolock autoLock(mMutex); - ALOGV("--> loaded"); - CHECK(mExecuting); + if (!mExecuting) { + // This can happen if something failed very early. + ALOGW("Dropped back down to Loaded without Executing"); + } - ALOGV("Dropped down to loaded, avail=%d eos=%d eosSent=%d", + ALOGV("--> loaded; avail=%d eos=%d eosSent=%d", mNumFramesAvailable, mEndOfStream, mEndOfStreamSent); // Codec is no longer executing. Discard all codec-related state. |