diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-02-12 08:44:57 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-02-12 08:44:57 -0800 |
| commit | 8aa40000e3584836af29a5763dff114583036be5 (patch) | |
| tree | 1fbe525458598115e49b10cbdf2d3426b2611574 | |
| parent | 862b0f489a4510386075c9d3161046e9cc2e98a7 (diff) | |
| parent | 1fd6df00beb50fb77e5cf9189adecd5eba62d82e (diff) | |
| download | android_hardware_qcom_media-8aa40000e3584836af29a5763dff114583036be5.tar.gz android_hardware_qcom_media-8aa40000e3584836af29a5763dff114583036be5.tar.bz2 android_hardware_qcom_media-8aa40000e3584836af29a5763dff114583036be5.zip | |
Merge "mm-video-v4l2: vidc: vdec: handle ftbs during reconfig and port disable"
| -rw-r--r-- | mm-video-v4l2/vidc/vdec/src/omx_vdec_msm8974.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/mm-video-v4l2/vidc/vdec/src/omx_vdec_msm8974.cpp b/mm-video-v4l2/vidc/vdec/src/omx_vdec_msm8974.cpp index dba60a0b..e296f16f 100644 --- a/mm-video-v4l2/vidc/vdec/src/omx_vdec_msm8974.cpp +++ b/mm-video-v4l2/vidc/vdec/src/omx_vdec_msm8974.cpp @@ -6672,11 +6672,6 @@ OMX_ERRORTYPE omx_vdec::fill_this_buffer(OMX_IN OMX_HANDLETYPE hComp, return OMX_ErrorInvalidState; } - if (!m_out_bEnabled) { - DEBUG_PRINT_ERROR("ERROR:FTB incorrect state operation, output port is disabled."); - return OMX_ErrorIncorrectStateOperation; - } - nPortIndex = buffer - client_buffers.get_il_buf_hdr(); if (buffer == NULL || (nPortIndex >= drv_ctx.op_buf.actualcount)) { @@ -6731,7 +6726,7 @@ OMX_ERRORTYPE omx_vdec::fill_this_buffer_proxy( DEBUG_PRINT_LOW("FTBProxy: bufhdr = %p, bufhdr->pBuffer = %p", bufferAdd, bufferAdd->pBuffer); /*Return back the output buffer to client*/ - if (m_out_bEnabled != OMX_TRUE || output_flush_progress == true) { + if (m_out_bEnabled != OMX_TRUE || output_flush_progress == true || in_reconfig) { DEBUG_PRINT_LOW("Output Buffers return flush/disable condition"); buffer->nFilledLen = 0; m_cb.FillBufferDone (hComp,m_app_data,buffer); |