From eded8aab132287d6265c835641b6ea71582e4694 Mon Sep 17 00:00:00 2001 From: Arian Date: Tue, 8 Sep 2020 17:57:47 +0200 Subject: [PATCH] davinci: Copy all media configs from the media HAL Change-Id: Id46c5ca254aef4c9823bc5a5be87681bf2844699 --- configs/media/media_codecs.xml | 401 ----- configs/media/media_profiles_vendor.xml | 1791 ----------------------- device.mk | 6 +- system.prop | 1 - 4 files changed, 2 insertions(+), 2197 deletions(-) delete mode 100644 configs/media/media_codecs.xml delete mode 100644 configs/media/media_profiles_vendor.xml diff --git a/configs/media/media_codecs.xml b/configs/media/media_codecs.xml deleted file mode 100644 index 38aec85..0000000 --- a/configs/media/media_codecs.xml +++ /dev/null @@ -1,401 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/configs/media/media_profiles_vendor.xml b/configs/media/media_profiles_vendor.xml deleted file mode 100644 index 388e2ba..0000000 --- a/configs/media/media_profiles_vendor.xml +++ /dev/null @@ -1,1791 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/device.mk b/device.mk index 6183ed0..c98ab66 100644 --- a/device.mk +++ b/device.mk @@ -231,12 +231,10 @@ PRODUCT_PACKAGES += \ libstagefrighthw PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/configs/media/media_codecs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs.xml \ - $(LOCAL_PATH)/configs/media/media_profiles_vendor.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_vendor.xml - -PRODUCT_COPY_FILES += \ + hardware/qcom-caf/sm8150/media/conf_files/sm6150/media_codecs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs.xml \ hardware/qcom-caf/sm8150/media/conf_files/sm6150/media_codecs_performance.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance.xml \ hardware/qcom-caf/sm8150/media/conf_files/sm6150/media_codecs_vendor_audio.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_vendor_audio.xml \ + hardware/qcom-caf/sm8150/media/conf_files/sm6150/media_profiles.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_V1_0.xml \ hardware/qcom-caf/sm8150/media/conf_files/sm6150/mediacodec-seccomp.policy:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/mediacodec.policy \ hardware/qcom-caf/sm8150/media/conf_files/sm6150/system_properties.xml:$(TARGET_COPY_OUT_VENDOR)/etc/system_properties.xml diff --git a/system.prop b/system.prop index e6cd1b8..efad7e3 100644 --- a/system.prop +++ b/system.prop @@ -15,7 +15,6 @@ persist.vendor.dpm.nsrm.bkg.evt=3955 # Media media.aac_51_output_enabled=true -media.settings.xml=/vendor/etc/media_profiles_vendor.xml media.stagefright.enable-aac=true media.stagefright.enable-fma2dp=true media.stagefright.enable-http=true