gs101: uses Codec2 HIDL 1.2 service
- Include mediacodec_samsung setting from gs-common
- Enable Codec2 HIDL 1.2 from BoardConfig and update
manifest hidl version for samsung.hardware.media.c2
Bug: 318793681
Test: run cts -m CtsMediaDecoderTestCases
Test: run cts -m CtsMediaPlayerTestCases
Test: run vts -m vts_treble_vintf_vendor_test
Change-Id: I5679bee76ca0ff7f430797ed261069e0f7fc3937
diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index d94a619..6fd0c2a 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -163,6 +163,7 @@
# Video Codec
########################
# 1. Exynos C2
+BOARD_USE_CODEC2_HIDL_1_2 := true
BOARD_USE_CSC_FILTER := false
BOARD_USE_DEC_SW_CSC := true
BOARD_USE_ENC_SW_CSC := true
diff --git a/device.mk b/device.mk
index 555b012..efc2b0d 100644
--- a/device.mk
+++ b/device.mk
@@ -730,30 +730,14 @@
$(call soong_config_set,bigo,soc,gs101)
# 1. Codec 2.0
-# exynos service
-PRODUCT_SOONG_NAMESPACES += vendor/samsung_slsi/codec2
+# for settings used by different C2 hal
+include device/google/gs-common/mediacodec/common/mediacodec_common.mk
+# for Exynos C2 Hal
+include device/google/gs-common/mediacodec/samsung/mediacodec_samsung.mk
PRODUCT_COPY_FILES += \
device/google/gs101/media_codecs_performance_c2.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance_c2.xml \
-PRODUCT_PACKAGES += \
- samsung.hardware.media.c2@1.0-service \
- codec2.vendor.base.policy \
- codec2.vendor.ext.policy \
- libExynosC2ComponentStore \
- libExynosC2H264Dec \
- libExynosC2H264Enc \
- libExynosC2HevcDec \
- libExynosC2HevcEnc \
- libExynosC2Mpeg4Dec \
- libExynosC2Mpeg4Enc \
- libExynosC2H263Dec \
- libExynosC2H263Enc \
- libExynosC2Vp8Dec \
- libExynosC2Vp8Enc \
- libExynosC2Vp9Dec \
- libExynosC2Vp9Enc
-
PRODUCT_PROPERTY_OVERRIDES += \
debug.stagefright.c2-poolmask=458752 \
debug.c2.use_dmabufheaps=1 \
diff --git a/manifest_media.xml b/manifest_media.xml
index 3ed9e24..38e56ba 100644
--- a/manifest_media.xml
+++ b/manifest_media.xml
@@ -5,8 +5,16 @@
<version>1.0</version>
<interface>
<name>IComponentStore</name>
- <instance>default</instance>
<instance>default1</instance>
</interface>
</hal>
+ <hal format="hidl">
+ <name>android.hardware.media.c2</name>
+ <transport>hwbinder</transport>
+ <version>1.2</version>
+ <interface>
+ <name>IComponentStore</name>
+ <instance>default</instance>
+ </interface>
+ </hal>
</manifest>
diff --git a/manifest_media_aosp.xml b/manifest_media_aosp.xml
index 3bc347c..9a1a3db 100644
--- a/manifest_media_aosp.xml
+++ b/manifest_media_aosp.xml
@@ -2,7 +2,7 @@
<hal format="hidl">
<name>android.hardware.media.c2</name>
<transport>hwbinder</transport>
- <version>1.0</version>
+ <version>1.2</version>
<interface>
<name>IComponentStore</name>
<instance>default</instance>