diff options
| author | Steve Kondik <steve@cyngn.com> | 2015-12-07 21:22:02 -0800 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2015-12-07 21:22:02 -0800 |
| commit | 216986d4d7f4763495bc293a2f932427f121c872 (patch) | |
| tree | 04633c31296937acd8c451c82f4ab229796cabb2 | |
| parent | f191436178c86ac491f062ac195ae2f539da0e68 (diff) | |
| parent | a99ddd922157a1312cb901f2b8a6ba1d338b4e25 (diff) | |
| download | android_hardware_qcom_media-216986d4d7f4763495bc293a2f932427f121c872.tar.gz android_hardware_qcom_media-216986d4d7f4763495bc293a2f932427f121c872.tar.bz2 android_hardware_qcom_media-216986d4d7f4763495bc293a2f932427f121c872.zip | |
Merge branch 'LA.BF.1.1.3_rb1.4' of git://codeaurora.org/platform/hardware/qcom/media into HEAD
Change-Id: Ic5c4345e35c19ccd8e2a576b1053652123f41df5
| -rw-r--r-- | mm-video-v4l2/vidc/venc/src/omx_video_base.cpp | 19 |
1 files changed, 14 insertions, 5 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 51d73112..5432e7b7 100644 --- a/mm-video-v4l2/vidc/venc/src/omx_video_base.cpp +++ b/mm-video-v4l2/vidc/venc/src/omx_video_base.cpp @@ -2494,7 +2494,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) { @@ -2828,7 +2828,12 @@ OMX_ERRORTYPE omx_video::allocate_output_buffer( #ifdef _MSM8974_ int align_size; #endif - DEBUG_PRINT_HIGH("allocate_output_buffer()for %lu bytes", bytes); + if (!secure_session) { + DEBUG_PRINT_HIGH("allocate_output_buffer()for %lu bytes", bytes); + } else { + DEBUG_PRINT_HIGH("secure session: allocate_output_buffer()for %lu bytes", m_sOutPortDef.nBufferSize); + } + if (!m_out_mem_ptr) { int nBufHdrSize = 0; DEBUG_PRINT_HIGH("%s: size = %lu, actual cnt %lu", __FUNCTION__, @@ -2863,7 +2868,11 @@ OMX_ERRORTYPE omx_video::allocate_output_buffer( bufHdr->nSize = sizeof(OMX_BUFFERHEADERTYPE); bufHdr->nVersion.nVersion = OMX_SPEC_VERSION; // Set the values when we determine the right HxW param - bufHdr->nAllocLen = bytes; + if (!secure_session) { + bufHdr->nAllocLen = bytes; + } else { + bufHdr->nAllocLen = m_sOutPortDef.nBufferSize; + } bufHdr->nFilledLen = 0; bufHdr->pAppPrivate = appData; bufHdr->nOutputPortIndex = PORT_INDEX_OUT; @@ -3097,7 +3106,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); @@ -3262,7 +3271,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); |