| commit | f75a2aebde60259e6a1c7c88112cdcce8a770da2 | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Tue May 16 10:29:50 2017 -0700 |
| committer | Marco Nelissen <marcone@google.com> | Thu Sep 07 09:46:14 2017 -0700 |
| tree | 8041baff410919935ec22fc821198b9ba4aabb97 | |
| parent | 69545369eef7dcaf81b889a2fc216ec7923c9622 [diff] |
Don't CHECK on illegal state change Bug: 36075139 Change-Id: If399c1cb83a6cf79f0e52353dce9d8142e7728c6
diff --git a/media/libstagefright/omx/SimpleSoftOMXComponent.cpp b/media/libstagefright/omx/SimpleSoftOMXComponent.cpp index 761b425..a0b940d 100644 --- a/media/libstagefright/omx/SimpleSoftOMXComponent.cpp +++ b/media/libstagefright/omx/SimpleSoftOMXComponent.cpp
@@ -454,7 +454,12 @@ 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: