diff options
| author | Hangyu Kuang <hkuang@google.com> | 2019-03-28 15:30:59 -0700 |
|---|---|---|
| committer | Weikai Kong <pig.priv@gmail.com> | 2020-04-05 15:17:13 +0200 |
| commit | 43135520b41d6bb644232577f3bd107141f21d1d (patch) | |
| tree | c9868a052973c1bf37b6e6b1235aef203284377e | |
| parent | a03cbc4f1e4c5d74543061670261efda6b68459a (diff) | |
| download | android_hardware_qcom_media-lineage-17.1-caf-sm8150.tar.gz android_hardware_qcom_media-lineage-17.1-caf-sm8150.tar.bz2 android_hardware_qcom_media-lineage-17.1-caf-sm8150.zip | |
mm-video-v412: Enable UBWC conditionally.lineage-17.1-caf-sm8150
Bug: 129353499
Test: Camera recording.
Fixes: Camera recording with API V2 enabled on davinci.
Change-Id: Iffd91a5217a6c74e378ee5cc6b70a8e3dec7b21e
| -rw-r--r-- | mm-video-v4l2/vidc/venc/Android.mk | 4 | ||||
| -rwxr-xr-x | mm-video-v4l2/vidc/venc/src/video_encoder_device_v4l2.cpp | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/mm-video-v4l2/vidc/venc/Android.mk b/mm-video-v4l2/vidc/venc/Android.mk index 2ddd99c8..7ce14d01 100644 --- a/mm-video-v4l2/vidc/venc/Android.mk +++ b/mm-video-v4l2/vidc/venc/Android.mk @@ -38,6 +38,10 @@ endif libmm-venc-def += -D_UBWC_ +ifeq ($(TARGET_DISABLED_UBWC),true) +libmm-venc-def += -DDISABLE_UBWC +endif + ifeq ($(call is-board-platform-in-list, $(TARGETS_THAT_SUPPORT_VQZIP)),true) libmm-venc-def += -D_VQZIP_ endif 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 0d2c09aa..1a4da836 100755 --- a/mm-video-v4l2/vidc/venc/src/video_encoder_device_v4l2.cpp +++ b/mm-video-v4l2/vidc/venc/src/video_encoder_device_v4l2.cpp @@ -7250,8 +7250,10 @@ void venc_dev::venc_get_consumer_usage(OMX_U32* usage) { /* Initialize to zero & update as per required color format */ *usage = 0; +#ifndef DISABLE_UBWC /* Configure UBWC as default */ *usage |= GRALLOC_USAGE_PRIVATE_ALLOC_UBWC; +#endif if (hevc && eProfile == (OMX_U32)OMX_VIDEO_HEVCProfileMain10HDR10) { DEBUG_PRINT_INFO("Setting 10-bit consumer usage bits"); |