diff options
| author | Stephen Hines <srhines@google.com> | 2018-09-20 23:56:46 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-09-20 23:56:46 -0700 |
| commit | 948e27d9b220cf80e6bbc6bf663692f92685f938 (patch) | |
| tree | 94be052c6ce564b2aa475095f662991a7b15a5d2 /msm8998 | |
| parent | 92493c7f78e86ee61124066d92f9ceda739fbfc9 (diff) | |
| parent | 56096a1aa4507d028a93d75182af4d1761f82d66 (diff) | |
| download | media-948e27d9b220cf80e6bbc6bf663692f92685f938.tar.gz | |
Merge "Fix invalid logical constant creation." am: fab1ad1153
am: 56096a1aa4
Change-Id: Ibf3b9f742ee527aede2065dc122215044084edb2
Diffstat (limited to 'msm8998')
| -rw-r--r-- | msm8998/mm-video-v4l2/vidc/vdec/src/omx_vdec_v4l2.cpp | 8 | ||||
| -rw-r--r-- | msm8998/mm-video-v4l2/vidc/venc/src/omx_video_base.cpp | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/msm8998/mm-video-v4l2/vidc/vdec/src/omx_vdec_v4l2.cpp b/msm8998/mm-video-v4l2/vidc/vdec/src/omx_vdec_v4l2.cpp index 419d9f5..a24c4c7 100644 --- a/msm8998/mm-video-v4l2/vidc/vdec/src/omx_vdec_v4l2.cpp +++ b/msm8998/mm-video-v4l2/vidc/vdec/src/omx_vdec_v4l2.cpp @@ -3156,10 +3156,10 @@ OMX_ERRORTYPE omx_vdec::send_command_proxy(OMX_IN OMX_HANDLETYPE hComp, /* Current State is Invalid */ /*******************************/ else if (m_state == OMX_StateInvalid) { - /* State Transition from Inavlid to any state */ - if (eState == (OMX_StateLoaded || OMX_StateWaitForResources - || OMX_StateIdle || OMX_StateExecuting - || OMX_StatePause || OMX_StateInvalid)) { + /* State Transition from Invalid to any state */ + if (eState == OMX_StateLoaded || eState == OMX_StateWaitForResources || + eState == OMX_StateIdle || eState == OMX_StateExecuting || + eState == OMX_StatePause || eState == OMX_StateInvalid) { DEBUG_PRINT_ERROR("ERROR::send_command_proxy(): Invalid -->Loaded"); post_event(OMX_EventError,OMX_ErrorInvalidState,\ OMX_COMPONENT_GENERATE_EVENT); diff --git a/msm8998/mm-video-v4l2/vidc/venc/src/omx_video_base.cpp b/msm8998/mm-video-v4l2/vidc/venc/src/omx_video_base.cpp index ae640a7..d1c8d97 100644 --- a/msm8998/mm-video-v4l2/vidc/venc/src/omx_video_base.cpp +++ b/msm8998/mm-video-v4l2/vidc/venc/src/omx_video_base.cpp @@ -1137,10 +1137,10 @@ OMX_ERRORTYPE omx_video::send_command_proxy(OMX_IN OMX_HANDLETYPE hComp, /* Current State is Invalid */ /*******************************/ else if (m_state == OMX_StateInvalid) { - /* State Transition from Inavlid to any state */ - if (eState == (OMX_StateLoaded || OMX_StateWaitForResources - || OMX_StateIdle || OMX_StateExecuting - || OMX_StatePause || OMX_StateInvalid)) { + /* State Transition from Invalid to any state */ + if (eState == OMX_StateLoaded || eState == OMX_StateWaitForResources || + eState == OMX_StateIdle || eState == OMX_StateExecuting || + eState == OMX_StatePause || eState == OMX_StateInvalid) { DEBUG_PRINT_ERROR("ERROR: OMXCORE-SM: Invalid -->Loaded"); post_event(OMX_EventError,OMX_ErrorInvalidState,\ OMX_COMPONENT_GENERATE_EVENT); |