Revert "venc: Disable building vqzip into the encoder for OSS"

A subsequent patch will add the required headers to OSS.

This reverts commit 4b1c56fc92171fce7cc860123c082bde743cd0b1.

RM-290

Change-Id: I8ef80233fec7b8ff075e82c829e2d8859f1350dc

3 files changed, 0 insertions, 14 deletions

diff --git a/mm-video-v4l2/vidc/venc/Android.mk b/mm-video-v4l2/vidc/venc/Android.mk
index 037672fb..fcacf02e 100644
--- a/mm-video-v4l2/vidc/venc/Android.mk
+++ b/mm-video-v4l2/vidc/venc/Android.mk
@@ -95,10 +95,6 @@ LOCAL_SRC_FILES   := src/omx_video_base.cpp
 LOCAL_SRC_FILES   += src/omx_video_encoder.cpp
 LOCAL_SRC_FILES   += src/video_encoder_device_v4l2.cpp
 
-ifneq ($(QCPATH),)
-LOCAL_CFLAGS += -D_VQZIP_
-endif
-
 include $(BUILD_SHARED_LIBRARY)
 
 ifeq ($(call is-board-platform-in-list, $(TARGETS_THAT_NEED_SW_VENC_MPEG4)),true)
diff --git a/mm-video-v4l2/vidc/venc/inc/video_encoder_device_v4l2.h b/mm-video-v4l2/vidc/venc/inc/video_encoder_device_v4l2.h
index bfdd7aa3..843b0c8d 100644
--- a/mm-video-v4l2/vidc/venc/inc/video_encoder_device_v4l2.h
+++ b/mm-video-v4l2/vidc/venc/inc/video_encoder_device_v4l2.h
@@ -34,9 +34,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "OMX_VideoExt.h"
 #include "OMX_QCOMExtns.h"
 #include "qc_omx_component.h"
-#ifdef _VQZIP_
 #include "VQZip.h"
-#endif
 #include "omx_video_common.h"
 #include "omx_video_base.h"
 #include "omx_video_encoder.h"
@@ -355,7 +353,6 @@ class venc_dev
         bool venc_set_bitrate_type(OMX_U32 type);
         int venc_roiqp_log_buffers(OMX_QTI_VIDEO_CONFIG_ROIINFO *roiInfo);
 
-#ifdef _VQZIP_
         class venc_dev_vqzip
         {
             public:
@@ -378,7 +375,6 @@ class venc_dev
                 vqzip_compute_stats_t mVQZIPComputeStats;
         };
         venc_dev_vqzip vqzip;
-#endif
         struct venc_debug_cap m_debug;
         OMX_U32 m_nDriver_fd;
         int m_poll_efd;
diff --git a/mm-video-v4l2/vidc/venc/src/video_encoder_device_v4l2.cpp b/mm-video-v4l2/vidc/venc/src/video_encoder_device_v4l2.cpp
index 2a3df1ed..67ac0029 100644
--- a/mm-video-v4l2/vidc/venc/src/video_encoder_device_v4l2.cpp
+++ b/mm-video-v4l2/vidc/venc/src/video_encoder_device_v4l2.cpp
@@ -679,14 +679,12 @@ bool venc_dev::handle_input_extradata(void *buffer, int fd)
             p_extra = (OMX_OTHER_EXTRADATATYPE *)((char *)p_extra + p_extra->nSize);
         }
 
-#ifdef _VQZIP_
         data->nSize = (sizeof(OMX_OTHER_EXTRADATATYPE) +  sizeof(struct VQZipStats) + 3)&(~3);
         data->nVersion.nVersion = OMX_SPEC_VERSION;
         data->nPortIndex = 0;
         data->eType = (OMX_EXTRADATATYPE)MSM_VIDC_EXTRADATA_YUVSTATS_INFO;
         data->nDataSize = sizeof(struct VQZipStats);
         vqzip.fill_stats_data((void*)pVirt, (void*) data->data);
-#endif
 
         data = (OMX_OTHER_EXTRADATATYPE *)((char *)data + data->nSize);
 
@@ -3615,12 +3613,10 @@ bool venc_dev::venc_set_vqzip_sei_type(OMX_BOOL enable)
     if (ioctl(m_nDriver_fd, VIDIOC_S_CTRL, &yuvstats_control) < 0) {
         DEBUG_PRINT_HIGH("Non-Fatal: Request to set YUVSTATS failed");
     }
-#ifdef _VQZIP_
     vqzip.pConfig.nWidth = ALIGN(m_sVenc_cfg.input_width, 16);
     vqzip.pConfig.nHeight = ALIGN(m_sVenc_cfg.input_height, 16);
     vqzip.init();
     vqzip_sei_info.enabled = true;
-#endif
 
     return true;
 }
@@ -6477,7 +6473,6 @@ int venc_dev::BatchInfo::getTimeStampAt(native_handle_t *hnd, int index) {
     return size;
 }
 
-#ifdef _VQZIP_
 venc_dev::venc_dev_vqzip::venc_dev_vqzip()
 {
     mLibHandle = NULL;
@@ -6559,7 +6554,6 @@ venc_dev::venc_dev_vqzip::~venc_dev_vqzip()
     mLibHandle = NULL;
     pthread_mutex_destroy(&lock);
 }
-#endif
 
 encExtradata::encExtradata(class omx_venc *venc_handle)
 {