From 2e429556a1c2a567755a9c28f3d3b55ccb4740be Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Fri, 3 Jan 2025 21:50:33 +0200 Subject: [PATCH] dre: Import media_codecs*.xml from vendor Change-Id: Ic874270d8bc50e854109556b663cffae22025324 --- device.mk | 10 +- extract-files.py | 2 - media/media_codecs.xml | 300 +++++++++++++++++ media/media_codecs_blair.xml | 311 ++++++++++++++++++ media/media_codecs_blair_lite.xml | 300 +++++++++++++++++ media/media_codecs_holi.xml | 300 +++++++++++++++++ media/media_codecs_performance.xml | 168 ++++++++++ media/media_codecs_performance_blair.xml | 207 ++++++++++++ media/media_codecs_performance_blair_lite.xml | 133 ++++++++ media/media_codecs_performance_holi.xml | 146 ++++++++ {configs => media}/media_profiles_holi.xml | 0 proprietary-files.txt | 8 - 12 files changed, 1874 insertions(+), 11 deletions(-) create mode 100644 media/media_codecs.xml create mode 100644 media/media_codecs_blair.xml create mode 100644 media/media_codecs_blair_lite.xml create mode 100644 media/media_codecs_holi.xml create mode 100644 media/media_codecs_performance.xml create mode 100644 media/media_codecs_performance_blair.xml create mode 100644 media/media_codecs_performance_blair_lite.xml create mode 100644 media/media_codecs_performance_holi.xml rename {configs => media}/media_profiles_holi.xml (100%) diff --git a/device.mk b/device.mk index e1d8637..c523da3 100644 --- a/device.mk +++ b/device.mk @@ -217,7 +217,15 @@ $(call soong_config_set,OPLUS_LINEAGE_LIVEDISPLAY_HAL,ENABLE_SE,false) # Media PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/configs/media_profiles_holi.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_vendor.xml + $(LOCAL_PATH)/media/media_codecs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs.xml \ + $(LOCAL_PATH)/media/media_codecs_blair.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_blair.xml \ + $(LOCAL_PATH)/media/media_codecs_blair_lite.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_blair_lite.xml \ + $(LOCAL_PATH)/media/media_codecs_holi.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_holi.xml \ + $(LOCAL_PATH)/media/media_codecs_performance.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance.xml \ + $(LOCAL_PATH)/media/media_codecs_performance_blair.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance_blair.xml \ + $(LOCAL_PATH)/media/media_codecs_performance_blair_lite.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance_blair_lite.xml \ + $(LOCAL_PATH)/media/media_codecs_performance_holi.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance_holi.xml \ + $(LOCAL_PATH)/media/media_profiles_holi.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_vendor.xml # NFC PRODUCT_PACKAGES += \ diff --git a/extract-files.py b/extract-files.py index 511bf9c..56ba2a0 100755 --- a/extract-files.py +++ b/extract-files.py @@ -94,8 +94,6 @@ blob_fixups: blob_fixups_user_type = { .regex_replace('NFC_DEBUG_ENABLED=1', 'NFC_DEBUG_ENABLED=0'), 'vendor/etc/media_holi/video_system_specs.json': blob_fixup() .regex_replace('"max_retry_alloc_output_timeout": 2000,', '"max_retry_alloc_output_timeout": 0,'), - ('vendor/etc/media_codecs.xml', 'vendor/etc/media_codecs_blair.xml', 'vendor/etc/media_codecs_blair_lite.xml', 'vendor/etc/media_codecs_holi.xml'): blob_fixup() - .regex_replace('.*media_codecs_(google_audio|google_c2|google_telephony|vendor_audio).*\n', ''), 'vendor/etc/msm_irqbalance.conf': blob_fixup() .regex_replace('IGNORED_IRQ=19,21,38$', 'IGNORED_IRQ=19,21,38,209,218'), 'vendor/etc/qdcm_calib_data_nt36672c_tm_fhd_plus_video_mode_dsi_panel.xml': blob_fixup() diff --git a/media/media_codecs.xml b/media/media_codecs.xml new file mode 100644 index 0000000..e523d48 --- /dev/null +++ b/media/media_codecs.xml @@ -0,0 +1,300 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/media/media_codecs_blair.xml b/media/media_codecs_blair.xml new file mode 100644 index 0000000..8482e02 --- /dev/null +++ b/media/media_codecs_blair.xml @@ -0,0 +1,311 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/media/media_codecs_blair_lite.xml b/media/media_codecs_blair_lite.xml new file mode 100644 index 0000000..75f0baa --- /dev/null +++ b/media/media_codecs_blair_lite.xml @@ -0,0 +1,300 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/media/media_codecs_holi.xml b/media/media_codecs_holi.xml new file mode 100644 index 0000000..d661211 --- /dev/null +++ b/media/media_codecs_holi.xml @@ -0,0 +1,300 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/media/media_codecs_performance.xml b/media/media_codecs_performance.xml new file mode 100644 index 0000000..f77e0d5 --- /dev/null +++ b/media/media_codecs_performance.xml @@ -0,0 +1,168 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/media/media_codecs_performance_blair.xml b/media/media_codecs_performance_blair.xml new file mode 100644 index 0000000..30ccb9d --- /dev/null +++ b/media/media_codecs_performance_blair.xml @@ -0,0 +1,207 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/media/media_codecs_performance_blair_lite.xml b/media/media_codecs_performance_blair_lite.xml new file mode 100644 index 0000000..750529e --- /dev/null +++ b/media/media_codecs_performance_blair_lite.xml @@ -0,0 +1,133 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/media/media_codecs_performance_holi.xml b/media/media_codecs_performance_holi.xml new file mode 100644 index 0000000..42d651b --- /dev/null +++ b/media/media_codecs_performance_holi.xml @@ -0,0 +1,146 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/configs/media_profiles_holi.xml b/media/media_profiles_holi.xml similarity index 100% rename from configs/media_profiles_holi.xml rename to media/media_profiles_holi.xml diff --git a/proprietary-files.txt b/proprietary-files.txt index 293de78..79e23aa 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -1325,14 +1325,6 @@ vendor/etc/init/vendor.qti.media.c2@1.0-service.rc vendor/etc/media_blair/video_system_specs.json vendor/etc/media_blair_lite/video_system_specs.json vendor/etc/media_holi/video_system_specs.json -vendor/etc/media_codecs.xml -vendor/etc/media_codecs_blair.xml -vendor/etc/media_codecs_blair_lite.xml -vendor/etc/media_codecs_holi.xml -vendor/etc/media_codecs_performance.xml -vendor/etc/media_codecs_performance_blair.xml -vendor/etc/media_codecs_performance_blair_lite.xml -vendor/etc/media_codecs_performance_holi.xml vendor/etc/media_profiles.xml vendor/etc/media_profiles_V1_0.xml vendor/etc/media_profiles_blair.xml