Merge "Don't CHECK on illegal state change"

7 years ago · 6112189b4f
parent c71583ee52 f75a2aebde
commit 6112189b4f
1 changed files with 6 additions and 1 deletions
--- a/media/libstagefright/omx/SimpleSoftOMXComponent.cpp
+++ b/media/libstagefright/omx/SimpleSoftOMXComponent.cpp
@ -454,7 +454,12 @@ void SimpleSoftOMXComponent::onChangeState(OMX_STATETYPE state) {
        state = OMX_StateLoaded;
    }

-    CHECK_EQ((int)mState, (int)mTargetState);
+    if (mState != mTargetState) {
+        ALOGE("State change to state %d requested while still transitioning from state %d to %d",
+                state, mState, mTargetState);
+        notify(OMX_EventError, OMX_ErrorUndefined, 0, NULL);
+        return;
+    }

    switch (mState) {
        case OMX_StateLoaded: