diff options
| -rw-r--r-- | gralloc/Android.mk | 4 | ||||
| -rw-r--r-- | gralloc/gr_utils.cpp | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/gralloc/Android.mk b/gralloc/Android.mk index 4dffadea..c3f41337 100644 --- a/gralloc/Android.mk +++ b/gralloc/Android.mk @@ -46,6 +46,10 @@ else ifeq ($(TARGET_USES_YCRCB_VENUS_CAMERA_PREVIEW),true) LOCAL_CFLAGS += -DUSE_YCRCB_CAMERA_PREVIEW_VENUS endif +ifeq ($(TARGET_USES_UNALIGNED_NV21_ZSL),true) + LOCAL_CFLAGS += -DUSE_UNALIGNED_NV21_ZSL +endif + LOCAL_ADDITIONAL_DEPENDENCIES := $(common_deps) LOCAL_SRC_FILES := gr_utils.cpp gr_adreno_info.cpp include $(BUILD_SHARED_LIBRARY) diff --git a/gralloc/gr_utils.cpp b/gralloc/gr_utils.cpp index 20508344..d157ad61 100644 --- a/gralloc/gr_utils.cpp +++ b/gralloc/gr_utils.cpp @@ -1064,8 +1064,10 @@ void GetAlignedWidthAndHeight(const BufferInfo &info, unsigned int *alignedw, case HAL_PIXEL_FORMAT_RAW_OPAQUE: break; case HAL_PIXEL_FORMAT_NV21_ZSL: +#ifndef USE_UNALIGNED_NV21_ZSL aligned_w = ALIGN(width, 64); aligned_h = ALIGN(height, 64); +#endif break; case HAL_PIXEL_FORMAT_NV12_HEIF: aligned_w = INT(VENUS_Y_STRIDE(COLOR_FMT_NV12_512, width)); |