commit de7c96afc382ac73108116d3431342633fa4e489
author Andy McFadden <fadden@android.com> Wed Jul 24 00:26:25 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jul 24 00:26:26 2013 +0000
tree f60a93727e18d093459513c5f7227e0f94cd43f5
parent d1fbc4659ca79b08f1d75ccd082788da24f26ae9
parent ba812e3b3ca0a0c9459fe29bbc211c9a73313b8b

Merge "Don't abort on unusual state transition"

media/libstagefright/omx/GraphicBufferSource.cpp

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::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.