diff --git a/device.mk b/device.mk index 9749084..efeb4b7 100644 --- a/device.mk +++ b/device.mk @@ -203,13 +203,14 @@ PRODUCT_PACKAGES += \ libcodec2_vndk.vendor PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/media/media_codecs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs.xml \ $(LOCAL_PATH)/media/media_codecs_performance.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance.xml \ - $(LOCAL_PATH)/media/media_codecs_vendor.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_vendor.xml \ + $(LOCAL_PATH)/media/media_codecs_vendor.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs.xml \ $(LOCAL_PATH)/media/media_codecs_vendor_audio.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_vendor_audio.xml \ - $(LOCAL_PATH)/media/media_profiles.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles.xml \ - $(LOCAL_PATH)/media/media_profiles_V1_0.xml:$(TARGET_COPY_OUT_ODM)/etc/media_profiles_V1_0.xml \ - $(LOCAL_PATH)/media/media_profiles_vendor.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_vendor.xml + $(LOCAL_PATH)/media/media_profiles.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_V1_0.xml + +PRODUCT_COPY_FILES += \ + hardware/qcom-caf/sm8150/media/conf_files/atoll/mediacodec-seccomp.policy:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/mediacodec.policy \ + hardware/qcom-caf/sm8150/media/conf_files/atoll/system_properties.xml:$(TARGET_COPY_OUT_VENDOR)/etc/system_properties.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/media_codecs.xml b/media/media_codecs.xml deleted file mode 100644 index dd758c9..0000000 --- a/media/media_codecs.xml +++ /dev/null @@ -1,390 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/media/media_codecs_performance.xml b/media/media_codecs_performance.xml index 3f0fd51..8f7a0d7 100644 --- a/media/media_codecs_performance.xml +++ b/media/media_codecs_performance.xml @@ -22,7 +22,7 @@ limitations under the License. - + @@ -97,7 +97,8 @@ limitations under the License. - + + @@ -122,8 +123,10 @@ limitations under the License. - - + + + + @@ -178,6 +181,8 @@ limitations under the License. + + diff --git a/media/media_codecs_vendor.xml b/media/media_codecs_vendor.xml index 49234b0..d82aeb9 100644 --- a/media/media_codecs_vendor.xml +++ b/media/media_codecs_vendor.xml @@ -137,6 +137,7 @@ Only the three quirks included above are recognized at this point: + @@ -153,6 +154,7 @@ Only the three quirks included above are recognized at this point: + @@ -166,6 +168,7 @@ Only the three quirks included above are recognized at this point: + @@ -211,6 +214,7 @@ Only the three quirks included above are recognized at this point: + @@ -225,7 +229,9 @@ Only the three quirks included above are recognized at this point: + + @@ -243,6 +249,7 @@ Only the three quirks included above are recognized at this point: + @@ -259,6 +266,7 @@ Only the three quirks included above are recognized at this point: + @@ -273,6 +281,7 @@ Only the three quirks included above are recognized at this point: + @@ -286,6 +295,7 @@ Only the three quirks included above are recognized at this point: + @@ -300,6 +310,7 @@ Only the three quirks included above are recognized at this point: + @@ -315,6 +326,7 @@ Only the three quirks included above are recognized at this point: + @@ -331,6 +343,7 @@ Only the three quirks included above are recognized at this point: + @@ -345,6 +358,7 @@ Only the three quirks included above are recognized at this point: + @@ -361,6 +375,7 @@ Only the three quirks included above are recognized at this point: + @@ -376,6 +391,7 @@ Only the three quirks included above are recognized at this point: + @@ -391,6 +407,7 @@ Only the three quirks included above are recognized at this point: + diff --git a/media/media_codecs_vendor_audio.xml b/media/media_codecs_vendor_audio.xml index e102b80..e334641 100644 --- a/media/media_codecs_vendor_audio.xml +++ b/media/media_codecs_vendor_audio.xml @@ -18,7 +18,6 @@ - diff --git a/media/media_profiles.xml b/media/media_profiles.xml index 66128d6..4c8c2a0 100644 --- a/media/media_profiles.xml +++ b/media/media_profiles.xml @@ -1,5 +1,7 @@ - + - - + + - - + + - - + + - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -210,108 +397,296 @@ - + - - + + - - + + - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -319,132 +694,253 @@ + + - - + + - - + + - - + + - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -452,350 +948,304 @@ - + - - + + - - + + - - + + - - + + - - - - + + - + + diff --git a/media/media_profiles_V1_0.xml b/media/media_profiles_V1_0.xml deleted file mode 100644 index 66128d6..0000000 --- a/media/media_profiles_V1_0.xml +++ /dev/null @@ -1,867 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/media/media_profiles_vendor.xml b/media/media_profiles_vendor.xml deleted file mode 100644 index c5859d6..0000000 --- a/media/media_profiles_vendor.xml +++ /dev/null @@ -1,1329 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/proprietary-files.txt b/proprietary-files.txt index d92a3c2..b3c1383 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -792,8 +792,6 @@ vendor/lib/liblistensoundmodel2.so vendor/lib/libmulawdec.so # Media -vendor/etc/seccomp_policy/mediacodec.policy -vendor/etc/system_properties.xml vendor/lib/libAlacSwDec.so vendor/lib/libApeSwDec.so vendor/lib/libFlacSwDec.so diff --git a/system.prop b/system.prop index 04a17a4..7103d21 100644 --- a/system.prop +++ b/system.prop @@ -25,7 +25,6 @@ persist.dbg.vt_avail_ovr=1 persist.dbg.wfc_avail_ovr=1 # Media -media.settings.xml=/vendor/etc/media_profiles_vendor.xml vendor.mm.enable.qcom_parser=16777215 # WFD