Merge "zuma: video: change to use c2 "default" AIDL service" into main

This commit is contained in:
Jerry Huang 2024-07-18 07:08:55 +00:00 committed by Android (Google) Code Review
commit 8715f4e919

View file

@ -334,6 +334,7 @@ PRODUCT_VENDOR_PROPERTIES += ro.surface_flinger.prime_shader_cache.ultrahdr=1
DEVICE_MANIFEST_FILE := \ DEVICE_MANIFEST_FILE := \
device/google/zuma/manifest.xml device/google/zuma/manifest.xml
BOARD_USE_CODEC2_AIDL := V1
ifneq (,$(filter aosp_%,$(TARGET_PRODUCT))) ifneq (,$(filter aosp_%,$(TARGET_PRODUCT)))
DEVICE_MANIFEST_FILE += \ DEVICE_MANIFEST_FILE += \
device/google/zuma/manifest_media_aosp.xml device/google/zuma/manifest_media_aosp.xml
@ -825,12 +826,19 @@ PRODUCT_COPY_FILES += \
device/google/zuma/media_codecs_performance_c2.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance_c2.xml \ device/google/zuma/media_codecs_performance_c2.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance_c2.xml \
PRODUCT_PROPERTY_OVERRIDES += \ PRODUCT_PROPERTY_OVERRIDES += \
debug.stagefright.c2-poolmask=458752 \
debug.c2.use_dmabufheaps=1 \ debug.c2.use_dmabufheaps=1 \
media.c2.dmabuf.padding=512 \ media.c2.dmabuf.padding=512 \
debug.stagefright.ccodec_delayed_params=1 \ debug.stagefright.ccodec_delayed_params=1 \
ro.vendor.gpu.dataspace=1 ro.vendor.gpu.dataspace=1
ifneq ($(BOARD_USE_CODEC2_AIDL), )
PRODUCT_PROPERTY_OVERRIDES += \
debug.stagefright.c2-poolmask=1507328
else
PRODUCT_PROPERTY_OVERRIDES += \
debug.stagefright.c2-poolmask=458752
endif
# Create input surface on the framework side # Create input surface on the framework side
PRODUCT_PROPERTY_OVERRIDES += \ PRODUCT_PROPERTY_OVERRIDES += \
debug.stagefright.c2inputsurface=-1 \ debug.stagefright.c2inputsurface=-1 \