From a4c1504118c7d30b45f112f7934d3a860fd85778 Mon Sep 17 00:00:00 2001 From: clarencelol Date: Mon, 21 Mar 2022 18:13:19 +0800 Subject: [PATCH] sdm660-common: media: Adapt S62Pro changes * Build libgui_vendor from source * Using CAF's way of media_{codecs, profiles} * Uprev media.c2 * Cleanup dead and unused target Signed-off-by: pix106 --- configs/media/media_codecs_performance.xml | 13 +- .../media_codecs_performance_sdm660_v1.xml | 44 +- configs/media/media_codecs_vendor_audio.xml | 2 +- configs/media/media_profiles.xml | 867 +++++++++++ configs/media/media_profiles_sdm660_v1.xml | 1225 +++++++++++++++ configs/media/media_profiles_vendor.xml | 1380 +++++++++++++++++ sdm660.mk | 26 +- 7 files changed, 3513 insertions(+), 44 deletions(-) create mode 100644 configs/media/media_profiles.xml create mode 100644 configs/media/media_profiles_sdm660_v1.xml create mode 100644 configs/media/media_profiles_vendor.xml diff --git a/configs/media/media_codecs_performance.xml b/configs/media/media_codecs_performance.xml index 56931408..58083543 100644 --- a/configs/media/media_codecs_performance.xml +++ b/configs/media/media_codecs_performance.xml @@ -44,7 +44,7 @@ - + @@ -157,21 +157,21 @@ - - + + - - + + - + @@ -201,4 +201,3 @@ - diff --git a/configs/media/media_codecs_performance_sdm660_v1.xml b/configs/media/media_codecs_performance_sdm660_v1.xml index 2d642731..9841735d 100644 --- a/configs/media/media_codecs_performance_sdm660_v1.xml +++ b/configs/media/media_codecs_performance_sdm660_v1.xml @@ -55,7 +55,7 @@ - + @@ -64,13 +64,13 @@ - + - + @@ -89,35 +89,35 @@ - + - - - + + + - - + + - - + + - - - + + + - - + + @@ -142,7 +142,7 @@ - + @@ -153,8 +153,8 @@ - - + + @@ -163,8 +163,8 @@ - - + + @@ -187,7 +187,7 @@ - + diff --git a/configs/media/media_codecs_vendor_audio.xml b/configs/media/media_codecs_vendor_audio.xml index 9ebb3982..2749bc6b 100644 --- a/configs/media/media_codecs_vendor_audio.xml +++ b/configs/media/media_codecs_vendor_audio.xml @@ -1,5 +1,5 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/configs/media/media_profiles_sdm660_v1.xml b/configs/media/media_profiles_sdm660_v1.xml new file mode 100644 index 00000000..535d4a7c --- /dev/null +++ b/configs/media/media_profiles_sdm660_v1.xml @@ -0,0 +1,1225 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/configs/media/media_profiles_vendor.xml b/configs/media/media_profiles_vendor.xml new file mode 100644 index 00000000..e29d1e04 --- /dev/null +++ b/configs/media/media_profiles_vendor.xml @@ -0,0 +1,1380 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sdm660.mk b/sdm660.mk index 6b04345f..9ed7f732 100644 --- a/sdm660.mk +++ b/sdm660.mk @@ -149,11 +149,6 @@ PRODUCT_PACKAGES += \ android.hardware.camera.provider@2.6 \ vendor.qti.hardware.camera.device@1.0 -# Codec2 modules -PRODUCT_PACKAGES += \ - com.android.media.swcodec \ - libsfplugin_ccodec - # Component overrides PRODUCT_COPY_FILES += \ $(COMMON_PATH)/configs/component-overrides.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sysconfig/component-overrides.xml @@ -326,14 +321,23 @@ PRODUCT_COPY_FILES += \ PRODUCT_PACKAGES += \ android.hardware.lights-service.xiaomi_sdm660 +# Media +PRODUCT_PACKAGES += \ + libgui_vendor + # Media PRODUCT_COPY_FILES += \ $(COMMON_PATH)/configs/media/media_codecs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs.xml \ + $(COMMON_PATH)/configs/media/media_codecs_vendor.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_vendor.xml \ $(COMMON_PATH)/configs/media/media_codecs_vendor_audio.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_vendor_audio.xml \ $(COMMON_PATH)/configs/media/media_codecs_sdm660_v1.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_sdm660_v1.xml \ - $(COMMON_PATH)/configs/media/media_codecs_vendor.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_vendor.xml \ $(COMMON_PATH)/configs/media/media_codecs_performance.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance.xml \ - $(COMMON_PATH)/configs/media/media_codecs_performance_sdm660_v1.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance_sdm660_v1.xml + $(COMMON_PATH)/configs/media/media_codecs_performance_sdm660_v1.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance_sdm660_v1.xml \ + $(COMMON_PATH)/configs/media/media_profiles_sdm660_v1.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/media_profiles_sdm660_v1.xml \ + $(COMMON_PATH)/configs/media/media_profiles_vendor.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/media_profiles.xml \ + $(COMMON_PATH)/configs/media/media_profiles.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles.xml \ + $(COMMON_PATH)/configs/media/media_profiles_sdm660_v1.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_sdm660_v1.xml \ + $(COMMON_PATH)/configs/media/media_profiles_vendor.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_vendor.xml \ # Media Google PRODUCT_COPY_FILES += \ @@ -345,15 +349,9 @@ PRODUCT_COPY_FILES += \ frameworks/av/media/libstagefright/data/media_codecs_google_c2_audio.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_c2_audio.xml \ frameworks/av/media/libstagefright/data/media_codecs_google_c2_video.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_c2_video.xml -# Media Extensions -PRODUCT_PACKAGES += \ - libavmediaserviceextensions \ - libmediametrics \ - libregistermsext \ - mediametrics - # OMX PRODUCT_PACKAGES += \ + android.hardware.media.c2@1.1.vendor \ libavservices_minijail \ libavservices_minijail.vendor \ libc2dcolorconvert \