diff options
| author | Gu, Wangyi <wangyi.gu@intel.com> | 2013-02-22 11:31:14 +0800 |
|---|---|---|
| committer | Patrick Tjin <pattjin@google.com> | 2014-07-21 22:03:41 -0700 |
| commit | d84f1cd0a72565031a7bbb1f245bc4718e7fc33f (patch) | |
| tree | cbd99130d5e6930061cda3001e5dc7e325c2daf9 /base | |
| parent | eb35431c93ec1d8457fb13fd76c980c72528504a (diff) | |
| download | wrs_omxil_core-d84f1cd0a72565031a7bbb1f245bc4718e7fc33f.tar.gz | |
Revert "[PORT FROM R4.1] Set state when TransState is completed."
BZ: 79676
This reverts commit Ied8f0ad5e7ce979f17f8feedb70dafc44213c2a1
This reverts patch http://android.intel.com:8080/#/c/90186/
Change-Id: I65868956740200a9be6d3f4da290ca068b268784
Signed-off-by: Gu, Wangyi <wangyi.gu@intel.com>
Reviewed-on: http://android.intel.com:8080/93184
Reviewed-by: Feng, Wei <wei.feng@intel.com>
Reviewed-by: Shi, PingX <pingx.shi@intel.com>
Tested-by: Shi, PingX <pingx.shi@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>
Diffstat (limited to 'base')
| -rw-r--r-- | base/src/componentbase.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/base/src/componentbase.cpp b/base/src/componentbase.cpp index e736a66..17e27b7 100644 --- a/base/src/componentbase.cpp +++ b/base/src/componentbase.cpp @@ -1232,7 +1232,6 @@ static inline const char *GetStateName(OMX_STATETYPE state) void ComponentBase::TransState(OMX_STATETYPE transition) { OMX_STATETYPE current = this->state; - OMX_STATETYPE dest = this->state; OMX_EVENTTYPE event; OMX_U32 data1, data2; OMX_ERRORTYPE ret; @@ -1278,7 +1277,7 @@ notify_event: data1 = OMX_CommandStateSet; data2 = transition; - dest = transition; + state = transition; LOGD("%s:%s: transition from %s to %s completed", GetName(), GetWorkingRole(), GetStateName(current), GetStateName(transition)); @@ -1289,7 +1288,7 @@ notify_event: data2 = 0; if (transition == OMX_StateInvalid || ret == OMX_ErrorInvalidState) { - dest = OMX_StateInvalid; + state = OMX_StateInvalid; LOGE("%s:%s: exit failure, transition from %s to %s, " "current state is %s\n", GetName(), GetWorkingRole(), GetStateName(current), @@ -1303,7 +1302,6 @@ notify_event: if (ret == OMX_ErrorNone && transition == OMX_StateWaitForResources) callbacks->EventHandler(handle, appdata, OMX_EventResourcesAcquired, 0, 0, NULL); - state = dest; } inline OMX_ERRORTYPE ComponentBase::TransStateToLoaded(OMX_STATETYPE current) |