summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPraneeth Paladugu <ppaladug@codeaurora.org>2016-04-05 16:45:06 -0700
committerPraneeth Paladugu <ppaladug@codeaurora.org>2016-04-06 16:43:54 -0700
commit20f4efad8f9e863139db8256337f833637329a16 (patch)
tree76631fa3bf42382ad80d82144e51d08d75033d43
parentccce87dee6d412f25e209478b9c47d62197cbcac (diff)
downloadandroid_hardware_qcom_media-20f4efad8f9e863139db8256337f833637329a16.tar.gz
android_hardware_qcom_media-20f4efad8f9e863139db8256337f833637329a16.tar.bz2
android_hardware_qcom_media-20f4efad8f9e863139db8256337f833637329a16.zip
mm-video-v4l2: vidc: venc: Fix VQZIP issues
- Featurize VQZIP SEI insertion. - Enable VQZIP feature on mainline. Change-Id: I4f32a108abc36f99734a46ad980615bc7a6591ed
-rw-r--r--mm-video-v4l2/vidc/venc/Android.mk1
-rw-r--r--mm-video-v4l2/vidc/venc/src/video_encoder_device_v4l2.cpp2
2 files changed, 3 insertions, 0 deletions
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;
}