commit 1da75db0dad8512b058c6e2a6781bca3e1556de3
author wenchangliu <wenchangliu@google.com> Mon Oct 14 12:17:03 2019 +0800
committer wenchangliu <wenchangliu@google.com> Thu Oct 17 09:56:14 2019 +0800
tree a287a3661cf02f5cf747178d406278cf454f06db
parent 5c3f5e0a919a1dade53a3b00e8ef79d8719d58bf

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

msm8996/mm-video-v4l2/vidc/venc/inc/omx_video_base.h

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 @@
         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__

msm8996/mm-video-v4l2/vidc/venc/src/omx_video_base.cpp

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 @@
     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 @@
             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 @@
         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);