diff options
| author | wenchangliu <wenchangliu@google.com> | 2019-10-14 12:17:03 +0800 |
|---|---|---|
| committer | wenchangliu <wenchangliu@google.com> | 2019-10-17 09:56:14 +0800 |
| commit | 1da75db0dad8512b058c6e2a6781bca3e1556de3 (patch) | |
| tree | a287a3661cf02f5cf747178d406278cf454f06db /msm8996/mm-video-v4l2/vidc/venc/src/omx_video_base.cpp | |
| parent | 5c3f5e0a919a1dade53a3b00e8ef79d8719d58bf (diff) | |
| download | media-1da75db0dad8512b058c6e2a6781bca3e1556de3.tar.gz | |
mm-video-v4l2: venc: revert add support for handling EOS buffer
This revert commit If5a974ce7d99632531045a57cf3a9e2ec68d15c5
Bug: 134527014
Test: run cts -m CtsMediaTestCases
Change-Id: I7c35a6b8b355f0687d4c48d1d116f89c77503afc
CRs-Fixed: 970975
Diffstat (limited to 'msm8996/mm-video-v4l2/vidc/venc/src/omx_video_base.cpp')
| -rw-r--r-- | msm8996/mm-video-v4l2/vidc/venc/src/omx_video_base.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
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); |