diff options
| author | Xin Li <delphij@google.com> | 2019-05-09 09:27:04 -0700 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2019-05-09 09:27:04 -0700 |
| commit | bafb1705ac94a73840f12ab9a36e26ea12495d78 (patch) | |
| tree | f292941c1e64dd68a34ddf68314fba2ce09da706 | |
| parent | 71119cc899c771288214c5bdea9760747909f121 (diff) | |
| parent | b56ec379142e1f5dfe494a858c79c149d0277870 (diff) | |
| download | media-bafb1705ac94a73840f12ab9a36e26ea12495d78.tar.gz | |
DO NOT MERGE - Merge Pie Bonito/Sargo into master.
Bug: 131756210
Change-Id: Ibeff0ea6ad07f8daa406fd7e532d3ad7527cf1fc
| -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); |