diff options
| author | qctecmdr <qctecmdr@localhost> | 2019-11-19 17:48:00 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2019-11-19 17:48:00 -0800 |
| commit | 3a292c498d01e657e1599471eb7da3e23f083a31 (patch) | |
| tree | 67f57bfa04e697d6c06f4bd647190d7a58a902ea | |
| parent | 5925608ab4d4306741cbacf0e26b6680bf5fa366 (diff) | |
| parent | 1eade5f8443032bda9f47f0f88a16eccabe96c31 (diff) | |
Merge "mm-video-v4l2: Disable UBWC in bengal"
| -rw-r--r-- | mm-video-v4l2/vidc/vdec/Android.mk | 4 | ||||
| -rw-r--r-- | mm-video-v4l2/vidc/vdec/src/omx_vdec_v4l2_params.cpp | 9 | ||||
| -rw-r--r-- | mm-video-v4l2/vidc/venc/Android.mk | 4 | ||||
| -rw-r--r-- | mm-video-v4l2/vidc/venc/src/video_encoder_device_v4l2_params.cpp | 4 |
4 files changed, 18 insertions, 3 deletions
diff --git a/mm-video-v4l2/vidc/vdec/Android.mk b/mm-video-v4l2/vidc/vdec/Android.mk index 08d34906..892046cd 100644 --- a/mm-video-v4l2/vidc/vdec/Android.mk +++ b/mm-video-v4l2/vidc/vdec/Android.mk @@ -37,6 +37,10 @@ endif libmm-vdec-def += -D_UBWC_ +ifeq ($(TARGET_BOARD_PLATFORM),bengal) +libmm-vdec-def += -U_UBWC_ +endif + ifeq ($(TARGET_USES_ION),true) libmm-vdec-def += -DUSE_ION endif diff --git a/mm-video-v4l2/vidc/vdec/src/omx_vdec_v4l2_params.cpp b/mm-video-v4l2/vidc/vdec/src/omx_vdec_v4l2_params.cpp index 23138616..0266d62c 100644 --- a/mm-video-v4l2/vidc/vdec/src/omx_vdec_v4l2_params.cpp +++ b/mm-video-v4l2/vidc/vdec/src/omx_vdec_v4l2_params.cpp @@ -732,8 +732,13 @@ OMX_ERRORTYPE omx_vdec::set_parameter(OMX_IN OMX_HANDLETYPE hComp, portFmt->eColorFormat == OMX_COLOR_FormatYUV420Planar || portFmt->eColorFormat == OMX_COLOR_FormatYUV420SemiPlanar || portFmt->eColorFormat == OMX_COLOR_Format16bitRGB565) { - op_format = (enum vdec_output_format)VDEC_YUV_FORMAT_NV12_UBWC; - fmt.fmt.pix_mp.pixelformat = capture_capability = V4L2_PIX_FMT_NV12_UBWC; + if (!m_disable_ubwc_mode) { + op_format = (enum vdec_output_format)VDEC_YUV_FORMAT_NV12_UBWC; + fmt.fmt.pix_mp.pixelformat = capture_capability = V4L2_PIX_FMT_NV12_UBWC; + } else { + op_format = (enum vdec_output_format)VDEC_YUV_FORMAT_NV12; + fmt.fmt.pix_mp.pixelformat = capture_capability = V4L2_PIX_FMT_NV12; + } //check if the required color format is a supported flexible format is_flexible_format = check_supported_flexible_formats(portFmt->eColorFormat); } else { diff --git a/mm-video-v4l2/vidc/venc/Android.mk b/mm-video-v4l2/vidc/venc/Android.mk index adf9aed5..d20a800a 100644 --- a/mm-video-v4l2/vidc/venc/Android.mk +++ b/mm-video-v4l2/vidc/venc/Android.mk @@ -33,6 +33,10 @@ endif libmm-venc-def += -D_UBWC_ +ifeq ($(TARGET_BOARD_PLATFORM),bengal) +libmm-venc-def += -U_UBWC_ +endif + ifeq ($(call is-board-platform-in-list, $(TARGETS_THAT_USE_FLAG_MSM8226)),true) libmm-venc-def += -D_MSM8226_ endif diff --git a/mm-video-v4l2/vidc/venc/src/video_encoder_device_v4l2_params.cpp b/mm-video-v4l2/vidc/venc/src/video_encoder_device_v4l2_params.cpp index 1b892f27..aafd4a8d 100644 --- a/mm-video-v4l2/vidc/venc/src/video_encoder_device_v4l2_params.cpp +++ b/mm-video-v4l2/vidc/venc/src/video_encoder_device_v4l2_params.cpp @@ -42,8 +42,10 @@ void venc_dev::venc_get_consumer_usage(OMX_U32* usage) /* Initialize to zero & update as per required color format */ *usage = 0; - /* Configure UBWC as default */ + /* Configure UBWC as default if target supports */ +#ifdef _UBWC_ *usage |= GRALLOC_USAGE_PRIVATE_ALLOC_UBWC; +#endif if (hevc && (eProfile == (OMX_U32)OMX_VIDEO_HEVCProfileMain10HDR10 || |