diff options
| author | wenchangliu <wenchangliu@google.com> | 2019-10-28 22:17:27 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-10-28 22:17:27 -0700 |
| commit | 35ec4113a311fd9d3f378b7145c9a4e4197517ce (patch) | |
| tree | 2e3991bd3b981c5824c3bf7b807488194a1d63ad | |
| parent | a3a968209a0cfe78ba792dbfb7582ed3235fac91 (diff) | |
| parent | 1da75db0dad8512b058c6e2a6781bca3e1556de3 (diff) | |
| download | media-35ec4113a311fd9d3f378b7145c9a4e4197517ce.tar.gz | |
mm-video-v4l2: venc: revert add support for handling EOS buffer
am: 1da75db0da
Change-Id: I8225162b990d22820d96e326d85dd3af622c9e70
| -rw-r--r-- | msm8996/mm-video-v4l2/vidc/venc/inc/omx_video_base.h | 1 | ||||
| -rw-r--r-- | msm8996/mm-video-v4l2/vidc/venc/src/omx_video_base.cpp | 9 |
2 files changed, 3 insertions, 7 deletions
diff --git a/msm8996/mm-video-v4l2/vidc/venc/inc/omx_video_base.h b/msm8996/mm-video-v4l2/vidc/venc/inc/omx_video_base.h index 58f1ba4..faa14e8 100644 --- a/msm8996/mm-video-v4l2/vidc/venc/inc/omx_video_base.h +++ b/msm8996/mm-video-v4l2/vidc/venc/inc/omx_video_base.h @@ -694,7 +694,6 @@ class omx_video: public qc_omx_component OMX_U8 m_cRole[OMX_MAX_STRINGNAME_SIZE]; extra_data_handler extra_data_handle; bool hw_overload; - OMX_U32 m_graphicBufferSize; }; #endif // __OMX_VIDEO_BASE_H__ diff --git a/msm8996/mm-video-v4l2/vidc/venc/src/omx_video_base.cpp b/msm8996/mm-video-v4l2/vidc/venc/src/omx_video_base.cpp index 8cffada..b9a90c4 100644 --- a/msm8996/mm-video-v4l2/vidc/venc/src/omx_video_base.cpp +++ b/msm8996/mm-video-v4l2/vidc/venc/src/omx_video_base.cpp @@ -302,8 +302,7 @@ omx_video::omx_video(): m_etb_count(0), m_fbd_count(0), m_event_port_settings_sent(false), - hw_overload(false), - m_graphicBufferSize(0) + hw_overload(false) { DEBUG_PRINT_HIGH("omx_video(): Inside Constructor()"); memset(&m_cmp,0,sizeof(m_cmp)); @@ -5262,7 +5261,6 @@ OMX_ERRORTYPE omx_video::push_input_buffer(OMX_HANDLETYPE hComp) Input_pmem_info.fd = handle->fd; Input_pmem_info.offset = 0; Input_pmem_info.size = handle->size; - m_graphicBufferSize = handle->size; if (is_conv_needed(handle->format)) ret = convert_queue_buffer(hComp,Input_pmem_info,index); else if (handle->format == HAL_PIXEL_FORMAT_NV12_ENCODEABLE || @@ -5331,10 +5329,9 @@ OMX_ERRORTYPE omx_video::push_empty_eos_buffer(OMX_HANDLETYPE hComp, emptyEosBufHdr.nTimeStamp = buffer->nTimeStamp; emptyEosBufHdr.nFlags = buffer->nFlags; emptyEosBufHdr.pBuffer = NULL; - if (!mUsesColorConversion && !mUseProxyColorFormat) + if (!mUsesColorConversion) emptyEosBufHdr.nAllocLen = m_sInPortDef.nBufferSize; - else if (mUseProxyColorFormat) - 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); |