From 20f4efad8f9e863139db8256337f833637329a16 Mon Sep 17 00:00:00 2001 From: Praneeth Paladugu Date: Tue, 5 Apr 2016 16:45:06 -0700 Subject: mm-video-v4l2: vidc: venc: Fix VQZIP issues - Featurize VQZIP SEI insertion. - Enable VQZIP feature on mainline. Change-Id: I4f32a108abc36f99734a46ad980615bc7a6591ed --- mm-video-v4l2/vidc/venc/Android.mk | 1 + mm-video-v4l2/vidc/venc/src/video_encoder_device_v4l2.cpp | 2 ++ 2 files changed, 3 insertions(+) diff --git a/mm-video-v4l2/vidc/venc/Android.mk b/mm-video-v4l2/vidc/venc/Android.mk index 9c98966b..6d4855d5 100644 --- a/mm-video-v4l2/vidc/venc/Android.mk +++ b/mm-video-v4l2/vidc/venc/Android.mk @@ -39,6 +39,7 @@ endif ifeq ($(TARGET_BOARD_PLATFORM),msm8996) libmm-venc-def += -D_UBWC_ +libmm-venc-def += -D_VQZIP_ endif ifeq ($(call is-board-platform-in-list, $(TARGETS_THAT_USE_FLAG_MSM8226)),true) 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 e0f979cc..d4c461a6 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 @@ -5626,6 +5626,7 @@ bool venc_dev::venc_set_ratectrl_cfg(OMX_VIDEO_CONTROLRATETYPE eControlRate) rate_ctrl.rcmode = control.value; } +#ifdef _VQZIP_ if (eControlRate == OMX_Video_ControlRateVariable && (supported_rc_modes & RC_VBR_CFR) && m_sVenc_cfg.codectype == V4L2_PIX_FMT_H264) { /* Enable VQZIP SEI by default for camcorder RC modes */ @@ -5637,6 +5638,7 @@ bool venc_dev::venc_set_ratectrl_cfg(OMX_VIDEO_CONTROLRATETYPE eControlRate) DEBUG_PRINT_HIGH("Non-Fatal: Request to set VQZIP failed"); } } +#endif return status; } -- cgit v1.2.3