diff options
author | Haynes Mathew George <hgeorge@codeaurora.org> | 2015-10-30 18:41:06 -0700 |
---|---|---|
committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-11-09 09:16:36 -0800 |
commit | 5918d3601f5711671a6fb5ccc2f65a931aae33eb (patch) | |
tree | e17b028dd38472698e8ddc779a709f19071a47d4 /media/libstagefright/omx | |
parent | a519bcf25b5ade710ef5bbaba68571b04f86b5e4 (diff) | |
download | frameworks_av-5918d3601f5711671a6fb5ccc2f65a931aae33eb.zip frameworks_av-5918d3601f5711671a6fb5ccc2f65a931aae33eb.tar.gz frameworks_av-5918d3601f5711671a6fb5ccc2f65a931aae33eb.tar.bz2 |
libstagefright: omx: Prevent assertion due to state mismatches
Instead handle them a bit better. Since the assertions dealt
with in this patchset can only happen if the OMX IL client died
while de-init'ing the component, it is impossible to deal with
all possible cases gracefully. Hence take an aggressive approach
by moving state of the component to OMX_StateInvalid. This looks
okay as per the spec, but might not be the best approach.
Change-Id: I3f23f5e3853523fe1a7fb3aaf38b46595fa91732
Diffstat (limited to 'media/libstagefright/omx')
-rw-r--r-- | media/libstagefright/omx/SimpleSoftOMXComponent.cpp | 44 |
1 files changed, 40 insertions, 4 deletions
diff --git a/media/libstagefright/omx/SimpleSoftOMXComponent.cpp b/media/libstagefright/omx/SimpleSoftOMXComponent.cpp index e6a0c49..1fd0641 100644 --- a/media/libstagefright/omx/SimpleSoftOMXComponent.cpp +++ b/media/libstagefright/omx/SimpleSoftOMXComponent.cpp @@ -417,16 +417,43 @@ void SimpleSoftOMXComponent::onSendCommand( } } +void SimpleSoftOMXComponent::onTransitionError() { + mState = OMX_StateInvalid; + mTargetState = OMX_StateInvalid; + notify(OMX_EventError, OMX_CommandStateSet, OMX_StateInvalid, 0); +} + void SimpleSoftOMXComponent::onChangeState(OMX_STATETYPE state) { + bool skipTransitions = false; + // We shouldn't be in a state transition already. - CHECK_EQ((int)mState, (int)mTargetState); + if (mState != mTargetState) { + // Workaround to prevent assertion + // XXX CHECK_EQ((int)mState, (int)mTargetState); + ALOGW("mState %d != mTargetState %d", mState, mTargetState); + skipTransitions = true; + onTransitionError(); + } switch (mState) { case OMX_StateLoaded: - CHECK_EQ((int)state, (int)OMX_StateIdle); + if (state != OMX_StateIdle) { + // Workaround to prevent assertion + // XXX CHECK_EQ((int)state, (int)OMX_StateIdle); + ALOGW("In OMX_StateLoaded, state %d != OMX_StateIdle", state); + skipTransitions = true; + onTransitionError(); + } break; case OMX_StateIdle: - CHECK(state == OMX_StateLoaded || state == OMX_StateExecuting); + if (!(state == OMX_StateLoaded || state == OMX_StateExecuting)) { + // Workaround to prevent assertion + // XXX CHECK(state == OMX_StateLoaded || state == OMX_StateExecuting); + ALOGW("In OMX_StateIdle, state %d != OMX_StateLoaded||OMX_StateExecuting", + state); + skipTransitions = true; + onTransitionError(); + } break; case OMX_StateExecuting: { @@ -440,11 +467,20 @@ void SimpleSoftOMXComponent::onChangeState(OMX_STATETYPE state) { notify(OMX_EventCmdComplete, OMX_CommandStateSet, state, NULL); break; } - + case OMX_StateInvalid: { + ALOGW("In OMX_StateInvalid, ignore state transition to %d", state); + skipTransitions = true; + onTransitionError(); + break; + } default: TRESPASS(); } + if (skipTransitions) { + return; + } + mTargetState = state; checkTransitions(); |