diff options
| author | Xin Li <delphij@google.com> | 2019-02-21 09:25:03 -0800 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2019-02-21 09:25:03 -0800 |
| commit | 0a6a259067e2290a2bb1cdf0e7263796843af257 (patch) | |
| tree | f292941c1e64dd68a34ddf68314fba2ce09da706 | |
| parent | 69293e50d205e91a50521cb07f3b0925bc4b2abe (diff) | |
| parent | 18ea303efbc21e6edcabd9256c476122f1f750b1 (diff) | |
| download | media-0a6a259067e2290a2bb1cdf0e7263796843af257.tar.gz | |
DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master
Bug: 120848293
Change-Id: Iebc74b06a9dc67295a8ce7c4c801fbdb45a696e3
| -rw-r--r-- | mm-video-v4l2/vidc/venc/src/omx_video_base.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
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 016f5cb9..ca03063a 100644 --- a/mm-video-v4l2/vidc/venc/src/omx_video_base.cpp +++ b/mm-video-v4l2/vidc/venc/src/omx_video_base.cpp @@ -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 (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); |