From 8b97b422dfc27dfe535ac97de639fed92c6a8249 Mon Sep 17 00:00:00 2001 From: Marc Bourgoin Date: Sun, 16 Apr 2023 20:43:42 -0600 Subject: [PATCH] sm7325-common: media: Update from tundra 12_S3SJS32.1-86-1-4 Change-Id: Id10be491caee5ec690b15ea722a8ae15b83a120d --- common.mk | 19 +- media/lahaina/media_codecs_lahaina.xml | 111 + .../media_codecs_performance_lahaina.xml | 168 ++ media/lahaina/media_profiles_lahaina.xml | 1918 +++++++++++++++++ media/media_codecs_vendor_audio.xml | 23 + media/media_profiles.xml | 643 ------ media/media_profiles_V1_0.xml | 511 ----- .../media_codecs_performance_yupik_v0.xml | 0 .../media_codecs_performance_yupik_v1.xml | 28 +- media/{ => yupik}/media_codecs_yupik_v0.xml | 0 media/yupik/media_codecs_yupik_v1.xml | 294 +++ media/yupik/media_profiles_yupik_v0.xml | 1814 ++++++++++++++++ media/yupik/media_profiles_yupik_v1.xml | 1814 ++++++++++++++++ 13 files changed, 6169 insertions(+), 1174 deletions(-) create mode 100644 media/lahaina/media_codecs_lahaina.xml create mode 100644 media/lahaina/media_codecs_performance_lahaina.xml create mode 100644 media/lahaina/media_profiles_lahaina.xml create mode 100644 media/media_codecs_vendor_audio.xml delete mode 100644 media/media_profiles.xml delete mode 100644 media/media_profiles_V1_0.xml rename media/{ => yupik}/media_codecs_performance_yupik_v0.xml (100%) rename media/{ => yupik}/media_codecs_performance_yupik_v1.xml (88%) rename media/{ => yupik}/media_codecs_yupik_v0.xml (100%) create mode 100644 media/yupik/media_codecs_yupik_v1.xml create mode 100644 media/yupik/media_profiles_yupik_v0.xml create mode 100644 media/yupik/media_profiles_yupik_v1.xml diff --git a/common.mk b/common.mk index 99568af..e5095f2 100644 --- a/common.mk +++ b/common.mk @@ -264,11 +264,20 @@ PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/media/init.qti.media.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.qti.media.rc PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/media/media_codecs_yupik_v0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_yupik_v0.xml \ - $(LOCAL_PATH)/media/media_codecs_yupik_v0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_yupik_v1.xml \ - $(LOCAL_PATH)/media/media_codecs_performance_yupik_v0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance_yupik_v0.xml \ - $(LOCAL_PATH)/media/media_codecs_performance_yupik_v1.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance_yupik_v1.xml \ - $(LOCAL_PATH)/media/media_profiles_V1_0.xml:$(TARGET_COPY_OUT_ODM)/etc/media_profiles_V1_0.xml + $(LOCAL_PATH)/media/media_codecs_vendor_audio.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_vendor_audio.xml + +PRODUCT_COPY_FILES += \ + $(LOCAL_PATH)/media/lahaina/media_codecs_lahaina.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_lahaina.xml \ + $(LOCAL_PATH)/media/lahaina/media_codecs_performance_lahaina.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance_lahaina.xml \ + $(LOCAL_PATH)/media/lahaina/media_profiles_lahaina.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_lahaina.xml + +PRODUCT_COPY_FILES += \ + $(LOCAL_PATH)/media/yupik/media_codecs_performance_yupik_v0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance_yupik_v0.xml \ + $(LOCAL_PATH)/media/yupik/media_codecs_performance_yupik_v1.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance_yupik_v1.xml \ + $(LOCAL_PATH)/media/yupik/media_codecs_yupik_v0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_yupik_v0.xml \ + $(LOCAL_PATH)/media/yupik/media_codecs_yupik_v1.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_yupik_v1.xml \ + $(LOCAL_PATH)/media/yupik/media_profiles_yupik_v0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_yupik_v0.xml \ + $(LOCAL_PATH)/media/yupik/media_profiles_yupik_v1.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_yupik_v1.xml PRODUCT_COPY_FILES += \ frameworks/av/media/libstagefright/data/media_codecs_google_audio.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_audio.xml \ diff --git a/media/lahaina/media_codecs_lahaina.xml b/media/lahaina/media_codecs_lahaina.xml new file mode 100644 index 0000000..c6592ed --- /dev/null +++ b/media/lahaina/media_codecs_lahaina.xml @@ -0,0 +1,111 @@ + + + + + + + + + + + + + + diff --git a/media/lahaina/media_codecs_performance_lahaina.xml b/media/lahaina/media_codecs_performance_lahaina.xml new file mode 100644 index 0000000..f77e0d5 --- /dev/null +++ b/media/lahaina/media_codecs_performance_lahaina.xml @@ -0,0 +1,168 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/media/lahaina/media_profiles_lahaina.xml b/media/lahaina/media_profiles_lahaina.xml new file mode 100644 index 0000000..4d2c177 --- /dev/null +++ b/media/lahaina/media_profiles_lahaina.xml @@ -0,0 +1,1918 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/media/media_codecs_vendor_audio.xml b/media/media_codecs_vendor_audio.xml new file mode 100644 index 0000000..d9a1f6f --- /dev/null +++ b/media/media_codecs_vendor_audio.xml @@ -0,0 +1,23 @@ + + + + + + + + diff --git a/media/media_profiles.xml b/media/media_profiles.xml deleted file mode 100644 index 0fd1de9..0000000 --- a/media/media_profiles.xml +++ /dev/null @@ -1,643 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/media/media_profiles_V1_0.xml b/media/media_profiles_V1_0.xml deleted file mode 100644 index dc4a051..0000000 --- a/media/media_profiles_V1_0.xml +++ /dev/null @@ -1,511 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/media/media_codecs_performance_yupik_v0.xml b/media/yupik/media_codecs_performance_yupik_v0.xml similarity index 100% rename from media/media_codecs_performance_yupik_v0.xml rename to media/yupik/media_codecs_performance_yupik_v0.xml diff --git a/media/media_codecs_performance_yupik_v1.xml b/media/yupik/media_codecs_performance_yupik_v1.xml similarity index 88% rename from media/media_codecs_performance_yupik_v1.xml rename to media/yupik/media_codecs_performance_yupik_v1.xml index 5890fa8..8d2a830 100644 --- a/media/media_codecs_performance_yupik_v1.xml +++ b/media/yupik/media_codecs_performance_yupik_v1.xml @@ -29,7 +29,7 @@ - + @@ -39,15 +39,13 @@ - - + - - + @@ -57,22 +55,22 @@ - + - - + + - + - + - + @@ -83,17 +81,17 @@ - + - + - + - + diff --git a/media/media_codecs_yupik_v0.xml b/media/yupik/media_codecs_yupik_v0.xml similarity index 100% rename from media/media_codecs_yupik_v0.xml rename to media/yupik/media_codecs_yupik_v0.xml diff --git a/media/yupik/media_codecs_yupik_v1.xml b/media/yupik/media_codecs_yupik_v1.xml new file mode 100644 index 0000000..5896733 --- /dev/null +++ b/media/yupik/media_codecs_yupik_v1.xml @@ -0,0 +1,294 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/media/yupik/media_profiles_yupik_v0.xml b/media/yupik/media_profiles_yupik_v0.xml new file mode 100644 index 0000000..35dd969 --- /dev/null +++ b/media/yupik/media_profiles_yupik_v0.xml @@ -0,0 +1,1814 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/media/yupik/media_profiles_yupik_v1.xml b/media/yupik/media_profiles_yupik_v1.xml new file mode 100644 index 0000000..35dd969 --- /dev/null +++ b/media/yupik/media_profiles_yupik_v1.xml @@ -0,0 +1,1814 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +