diff options
author | Linux Build Service Account <lnxbuild@localhost> | 2013-11-19 22:08:08 -0800 |
---|---|---|
committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2013-11-19 22:08:08 -0800 |
commit | 3574d8963bf62d6b6cc2f07b0e161f2e1848de4c (patch) | |
tree | a4beb7ec62d643fa1e042d0f6b0447711c872e81 /mm-video-v4l2/vidc/vdec/src/omx_vdec_hevc_swvdec.cpp | |
parent | a747cca605b9e9223d14e4b0a7362431c9141a69 (diff) | |
parent | 65f4ffe6b2f8cc0604889f73fbd8923018b7d5f9 (diff) | |
download | android_hardware_qcom_media-3574d8963bf62d6b6cc2f07b0e161f2e1848de4c.tar.gz android_hardware_qcom_media-3574d8963bf62d6b6cc2f07b0e161f2e1848de4c.tar.bz2 android_hardware_qcom_media-3574d8963bf62d6b6cc2f07b0e161f2e1848de4c.zip |
Merge "mm-video: vidc: hevc: fix termination issue"
Diffstat (limited to 'mm-video-v4l2/vidc/vdec/src/omx_vdec_hevc_swvdec.cpp')
-rw-r--r-- | mm-video-v4l2/vidc/vdec/src/omx_vdec_hevc_swvdec.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mm-video-v4l2/vidc/vdec/src/omx_vdec_hevc_swvdec.cpp b/mm-video-v4l2/vidc/vdec/src/omx_vdec_hevc_swvdec.cpp index 181254a2..73ac9985 100644 --- a/mm-video-v4l2/vidc/vdec/src/omx_vdec_hevc_swvdec.cpp +++ b/mm-video-v4l2/vidc/vdec/src/omx_vdec_hevc_swvdec.cpp @@ -1805,6 +1805,7 @@ OMX_ERRORTYPE omx_vdec::component_init(OMX_STRING role) DEBUG_PRINT_ERROR("Failed to create async_message_thread"); return OMX_ErrorInsufficientResources; } + async_thread_created = true; capture_capability= V4L2_PIX_FMT_NV12; ret = subscribe_to_events(drv_ctx.video_driver_fd); @@ -1950,8 +1951,9 @@ OMX_ERRORTYPE omx_vdec::component_init(OMX_STRING role) if(r < 0) { DEBUG_PRINT_ERROR("component_init(): message_thread creation failed"); - eRet = OMX_ErrorInsufficientResources; + return OMX_ErrorInsufficientResources; } + msg_thread_created = true; } if (eRet != OMX_ErrorNone && ( (!m_pSwVdec) || (m_swvdec_mode == SWVDEC_MODE_DECODE_ONLY) )) |