diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2015-12-10 11:34:24 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-12-10 11:34:24 -0800 |
| commit | 544aaed3028421adc298a6da9504a9f2f1b909d7 (patch) | |
| tree | 4cbe6ca286ed03f7526d5888ff3f1f28984a76f7 | |
| parent | b72747ebadd8273a54b5f2cf4121a141dd5da31f (diff) | |
| parent | a725170b0eb610fca91ea0769cdff7c42163a5cb (diff) | |
| download | android_hardware_qcom_media-544aaed3028421adc298a6da9504a9f2f1b909d7.tar.gz android_hardware_qcom_media-544aaed3028421adc298a6da9504a9f2f1b909d7.tar.bz2 android_hardware_qcom_media-544aaed3028421adc298a6da9504a9f2f1b909d7.zip | |
Merge "mm-video: venc: Initialize m_graphicBufferSize"
| -rw-r--r-- | mm-video-v4l2/vidc/venc/src/omx_video_base.cpp | 5 |
1 files changed, 3 insertions, 2 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 dd496b31..9e5b3e04 100644 --- a/mm-video-v4l2/vidc/venc/src/omx_video_base.cpp +++ b/mm-video-v4l2/vidc/venc/src/omx_video_base.cpp @@ -277,7 +277,8 @@ omx_video::omx_video(): m_etb_count(0), m_fbd_count(0), m_event_port_settings_sent(false), - hw_overload(false) + hw_overload(false), + m_graphicBufferSize(0) { DEBUG_PRINT_HIGH("omx_video(): Inside Constructor()"); memset(&m_cmp,0,sizeof(m_cmp)); @@ -5120,7 +5121,7 @@ OMX_ERRORTYPE omx_video::push_empty_eos_buffer(OMX_HANDLETYPE hComp, if (!mUsesColorConversion && !mUseProxyColorFormat) emptyEosBufHdr.nAllocLen = m_sInPortDef.nBufferSize; else if (mUseProxyColorFormat) - emptyEosBufHdr.nAllocLen = m_graphicBufferSize; + emptyEosBufHdr.nAllocLen = m_graphicBufferSize > 0 ? m_graphicBufferSize : m_sInPortDef.nBufferSize; if (dev_empty_buf(&emptyEosBufHdr, 0, index, m_pInput_pmem[index].fd) != true) { DEBUG_PRINT_ERROR("ERROR: in dev_empty_buf for empty eos buffer"); dev_free_buf(&Input_pmem_info, PORT_INDEX_IN); |