diff options
| author | Santhosh Behara <santhoshbehara@codeaurora.org> | 2019-01-17 13:01:50 +0530 |
|---|---|---|
| committer | Santhosh Behara <santhoshbehara@codeaurora.org> | 2019-01-23 16:46:57 +0530 |
| commit | 8b0642806dcb96b590603590118d4c3fee40fe9a (patch) | |
| tree | 45e57c697de073b01c2dca3c1c26da73f6273e71 /mm-video-v4l2 | |
| parent | a1d24bf1bbd86015b6b427622bdeffcb62653089 (diff) | |
| download | media-8b0642806dcb96b590603590118d4c3fee40fe9a.tar.gz | |
media: Fix compilation error with logical OR operand
Fix compilation error with logical OR operand usage
Change-Id: I4db58aecb8bea18c03262d60c75983e024b29fad
Diffstat (limited to 'mm-video-v4l2')
| -rw-r--r-- | mm-video-v4l2/vidc/vdec/src/omx_vdec_v4l2.cpp | 8 | ||||
| -rw-r--r-- | mm-video-v4l2/vidc/venc/src/omx_video_base.cpp | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/mm-video-v4l2/vidc/vdec/src/omx_vdec_v4l2.cpp b/mm-video-v4l2/vidc/vdec/src/omx_vdec_v4l2.cpp index e3f88929..638cfec9 100644 --- a/mm-video-v4l2/vidc/vdec/src/omx_vdec_v4l2.cpp +++ b/mm-video-v4l2/vidc/vdec/src/omx_vdec_v4l2.cpp @@ -1,5 +1,5 @@ /*-------------------------------------------------------------------------- -Copyright (c) 2010 - 2018, The Linux Foundation. All rights reserved. +Copyright (c) 2010 - 2019, The Linux Foundation. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -2983,9 +2983,9 @@ 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)) { + if (OMX_StateLoaded == eState || OMX_StateWaitForResources == eState + || OMX_StateIdle == eState || OMX_StateExecuting == eState + || OMX_StatePause == eState || OMX_StateInvalid == eState) { DEBUG_PRINT_ERROR("ERROR::send_command_proxy(): Invalid -->Loaded"); post_event(OMX_EventError,OMX_ErrorInvalidState,\ OMX_COMPONENT_GENERATE_EVENT); diff --git a/mm-video-v4l2/vidc/venc/src/omx_video_base.cpp b/mm-video-v4l2/vidc/venc/src/omx_video_base.cpp index 7fe1c977..4018164d 100644 --- a/mm-video-v4l2/vidc/venc/src/omx_video_base.cpp +++ b/mm-video-v4l2/vidc/venc/src/omx_video_base.cpp @@ -1,5 +1,5 @@ /*-------------------------------------------------------------------------- -Copyright (c) 2010-2018, Linux Foundation. All rights reserved. +Copyright (c) 2010-2019, Linux Foundation. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -1094,9 +1094,9 @@ OMX_ERRORTYPE omx_video::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)) { + if (OMX_StateLoaded == eState || OMX_StateWaitForResources == eState + || OMX_StateIdle == eState || OMX_StateExecuting == eState + || OMX_StatePause == eState || OMX_StateInvalid == eState) { DEBUG_PRINT_ERROR("ERROR: OMXCORE-SM: Invalid -->Loaded"); post_event(OMX_EventError,OMX_ErrorInvalidState,\ OMX_COMPONENT_GENERATE_EVENT); |