diff options
| author | Leena Winterrowd <lenhardw@codeaurora.org> | 2014-09-30 12:58:54 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-10-29 04:15:32 -0700 |
| commit | a8e0e002b5db7cc4647c96d881ba31385fe05be8 (patch) | |
| tree | ae8f99f2eef2ce1ff0f2e5bb56e618637e3aeff8 | |
| parent | afb64b32f1669628da8cb08f210181dc7b052249 (diff) | |
| download | android_hardware_qcom_media-a8e0e002b5db7cc4647c96d881ba31385fe05be8.tar.gz android_hardware_qcom_media-a8e0e002b5db7cc4647c96d881ba31385fe05be8.tar.bz2 android_hardware_qcom_media-a8e0e002b5db7cc4647c96d881ba31385fe05be8.zip | |
mm-video-v4l2: venc: Use correct flag for buffer index selection
meta_mode_enable reflects whether the component is using meta
buffers or the input mem pointer. Use this flag (instead of
mUseProxyColorFormat) when computing the buffer index to ensure a
valid buffer index.
Change-Id: I0722edbb739140415b49e183be910730f450766c
| -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 35109441..85e79b4c 100644 --- a/mm-video-v4l2/vidc/venc/src/omx_video_base.cpp +++ b/mm-video-v4l2/vidc/venc/src/omx_video_base.cpp @@ -2499,7 +2499,7 @@ OMX_ERRORTYPE omx_video::free_input_buffer(OMX_BUFFERHEADERTYPE *bufferHdr) return OMX_ErrorBadParameter; } - index = bufferHdr - ((!mUseProxyColorFormat)?m_inp_mem_ptr:meta_buffer_hdr); + index = bufferHdr - ((!meta_mode_enable)?m_inp_mem_ptr:meta_buffer_hdr); #ifdef _ANDROID_ICS_ if (meta_mode_enable) { if (index < m_sInPortDef.nBufferCountActual) { @@ -3102,7 +3102,7 @@ OMX_ERRORTYPE omx_video::free_buffer(OMX_IN OMX_HANDLETYPE hComp, if (port == PORT_INDEX_IN) { // check if the buffer is valid - nPortIndex = buffer - ((!mUseProxyColorFormat)?m_inp_mem_ptr:meta_buffer_hdr); + nPortIndex = buffer - ((!meta_mode_enable)?m_inp_mem_ptr:meta_buffer_hdr); DEBUG_PRINT_LOW("free_buffer on i/p port - Port idx %u, actual cnt %lu", nPortIndex, m_sInPortDef.nBufferCountActual); @@ -3267,7 +3267,7 @@ OMX_ERRORTYPE omx_video::empty_this_buffer(OMX_IN OMX_HANDLETYPE hComp, return OMX_ErrorIncorrectStateOperation; } - nBufferIndex = buffer - ((!mUseProxyColorFormat)?m_inp_mem_ptr:meta_buffer_hdr); + nBufferIndex = buffer - ((!meta_mode_enable)?m_inp_mem_ptr:meta_buffer_hdr); if (nBufferIndex > m_sInPortDef.nBufferCountActual ) { DEBUG_PRINT_ERROR("ERROR: ETB: Invalid buffer index[%d]", nBufferIndex); |