diff options
| author | Stephen Hines <srhines@google.com> | 2018-09-20 23:14:35 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-09-20 23:14:35 -0700 |
| commit | 56096a1aa4507d028a93d75182af4d1761f82d66 (patch) | |
| tree | a0968ea8f3df526f8763095b6348f10addae9563 /msm8974/mm-video-v4l2 | |
| parent | ff44b444b4ef5f60088ead0d0bcbbd4a66312bee (diff) | |
| parent | fab1ad1153a3941c92f458caa4626ea66f009b22 (diff) | |
| download | media-56096a1aa4507d028a93d75182af4d1761f82d66.tar.gz | |
Merge "Fix invalid logical constant creation."pie-temp
am: fab1ad1153
Change-Id: I7bc88ed81f050271900817d4fe533adfaee3fa07
Diffstat (limited to 'msm8974/mm-video-v4l2')
5 files changed, 20 insertions, 20 deletions
diff --git a/msm8974/mm-video-v4l2/vidc/vdec/src/omx_vdec.cpp b/msm8974/mm-video-v4l2/vidc/vdec/src/omx_vdec.cpp index 2b2c156..2ed41bb 100755 --- a/msm8974/mm-video-v4l2/vidc/vdec/src/omx_vdec.cpp +++ b/msm8974/mm-video-v4l2/vidc/vdec/src/omx_vdec.cpp @@ -2034,10 +2034,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/msm8974/mm-video-v4l2/vidc/vdec/src/omx_vdec_hevc.cpp b/msm8974/mm-video-v4l2/vidc/vdec/src/omx_vdec_hevc.cpp index b82d066..dae6b4b 100644 --- a/msm8974/mm-video-v4l2/vidc/vdec/src/omx_vdec_hevc.cpp +++ b/msm8974/mm-video-v4l2/vidc/vdec/src/omx_vdec_hevc.cpp @@ -2005,10 +2005,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/msm8974/mm-video-v4l2/vidc/vdec/src/omx_vdec_hevc_swvdec.cpp b/msm8974/mm-video-v4l2/vidc/vdec/src/omx_vdec_hevc_swvdec.cpp index fa27f7b..d9755f7 100644 --- a/msm8974/mm-video-v4l2/vidc/vdec/src/omx_vdec_hevc_swvdec.cpp +++ b/msm8974/mm-video-v4l2/vidc/vdec/src/omx_vdec_hevc_swvdec.cpp @@ -2521,10 +2521,10 @@ OMX_ERRORTYPE omx_vdec::send_command_proxy(OMX_IN OMX_HANDLETYPE hComp, /*******************************/ 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,\ diff --git a/msm8974/mm-video-v4l2/vidc/vdec/src/omx_vdec_msm8974.cpp b/msm8974/mm-video-v4l2/vidc/vdec/src/omx_vdec_msm8974.cpp index 811f9d7..a6bf271 100644 --- a/msm8974/mm-video-v4l2/vidc/vdec/src/omx_vdec_msm8974.cpp +++ b/msm8974/mm-video-v4l2/vidc/vdec/src/omx_vdec_msm8974.cpp @@ -2472,10 +2472,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/msm8974/mm-video-v4l2/vidc/venc/src/omx_video_base.cpp b/msm8974/mm-video-v4l2/vidc/venc/src/omx_video_base.cpp index 94046a1..c0a8e52 100644 --- a/msm8974/mm-video-v4l2/vidc/venc/src/omx_video_base.cpp +++ b/msm8974/mm-video-v4l2/vidc/venc/src/omx_video_base.cpp @@ -1050,10 +1050,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); |