From cefc28f8bd0af20fea1231205404652641cd304e Mon Sep 17 00:00:00 2001 From: dianlujitao Date: Sun, 8 Sep 2024 21:26:39 +0800 Subject: [PATCH] sm8150-common: remove OMX * OMX HW video codecs are no longer used after enabling Codec2 * OMX HW audio codecs won't work without QCOM A/V enhancements, which we don't have on Lineage. Change-Id: I65852151c8fb6387add5fc4402ba3f13c97b5f64 --- manifest.xml | 6 - media/Android.bp | 10 +- media/media_codecs.xml | 380 ------------------ ...ce.xml => media_codecs_performance_c2.xml} | 49 --- msmnile.mk | 15 +- proprietary-files.txt | 17 - setup-makefiles.sh | 3 +- vendor.prop | 3 + 8 files changed, 7 insertions(+), 476 deletions(-) delete mode 100644 media/media_codecs.xml rename media/{media_codecs_performance.xml => media_codecs_performance_c2.xml} (62%) diff --git a/manifest.xml b/manifest.xml index 6e234b5..3992f8b 100644 --- a/manifest.xml +++ b/manifest.xml @@ -34,12 +34,6 @@ hwbinder @1.0::IComponentStore/default - - android.hardware.media.omx - hwbinder - @1.0::IOmx/default - @1.0::IOmxStore/default - android.hardware.nfc diff --git a/media/Android.bp b/media/Android.bp index 19fc006..dca590a 100644 --- a/media/Android.bp +++ b/media/Android.bp @@ -4,12 +4,6 @@ // SPDX-License-Identifier: Apache-2.0 // -prebuilt_etc { - name: "media_codecs.xml", - src: "media_codecs.xml", - vendor: true, -} - prebuilt_etc { name: "media_codecs_c2.xml", src: "media_codecs_c2.xml", @@ -17,7 +11,7 @@ prebuilt_etc { } prebuilt_etc { - name: "media_codecs_performance.xml", - src: "media_codecs_performance.xml", + name: "media_codecs_performance_c2.xml", + src: "media_codecs_performance_c2.xml", vendor: true, } diff --git a/media/media_codecs.xml b/media/media_codecs.xml deleted file mode 100644 index 8f03d71..0000000 --- a/media/media_codecs.xml +++ /dev/null @@ -1,380 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/media/media_codecs_performance.xml b/media/media_codecs_performance_c2.xml similarity index 62% rename from media/media_codecs_performance.xml rename to media/media_codecs_performance_c2.xml index d6d5c37..d9409ea 100644 --- a/media/media_codecs_performance.xml +++ b/media/media_codecs_performance_c2.xml @@ -21,28 +21,6 @@ limitations under the License. - - - - - - - - - - - - - - - - - - - - - - @@ -77,33 +55,6 @@ limitations under the License. - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/msmnile.mk b/msmnile.mk index 05edde5..5dd239b 100644 --- a/msmnile.mk +++ b/msmnile.mk @@ -234,9 +234,8 @@ PRODUCT_PACKAGES += \ # Media configs PRODUCT_PACKAGES += \ - media_codecs.xml \ media_codecs_c2.xml \ - media_codecs_performance.xml + media_codecs_performance_c2.xml # NFC PRODUCT_PACKAGES += \ @@ -252,18 +251,6 @@ PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.se.omapi.uicc.xml:$(TARGET_COPY_OUT_ODM)/etc/permissions/sku_nfc/android.hardware.se.omapi.uicc.xml \ frameworks/native/data/etc/com.android.nfc_extras.xml:$(TARGET_COPY_OUT_ODM)/etc/permissions/sku_nfc/com.android.nfc_extras.xml -# OMX -PRODUCT_PACKAGES += \ - libOmxAacEnc \ - libOmxAmrEnc \ - libOmxCore \ - libOmxEvrcEnc \ - libOmxG711Enc \ - libOmxQcelp13Enc \ - libOmxVdec \ - libOmxVenc \ - libstagefrighthw - # Overlays DEVICE_PACKAGE_OVERLAYS += \ $(LOCAL_PATH)/overlay \ diff --git a/proprietary-files.txt b/proprietary-files.txt index 3561611..0f319b2 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -462,23 +462,6 @@ vendor/lib64/unnhal-acc-common.so vendor/lib64/unnhal-acc-hta.so vendor/lib64/unnhal-acc-hvx.so -# OMX -vendor/etc/seccomp_policy/mediacodec.policy -vendor/etc/system_properties.xml -vendor/lib/libOmxAacDec.so -vendor/lib/libOmxAlacDec.so -vendor/lib/libOmxAmrDec.so -vendor/lib/libOmxAmrwbplusDec.so -vendor/lib/libOmxApeDec.so -vendor/lib/libOmxDsdDec.so -vendor/lib/libOmxEvrcDec.so -vendor/lib/libOmxG711Dec.so -vendor/lib/libOmxQcelp13Dec.so -vendor/lib/libOmxVideoDSMode.so;DISABLE_CHECKELF -vendor/lib/libOmxVpp.so;DISABLE_CHECKELF -vendor/lib/libOmxWmaDec.so -vendor/lib/libdsd2pcm.so - # Peripheral manager vendor/bin/pm-proxy vendor/bin/pm-service diff --git a/setup-makefiles.sh b/setup-makefiles.sh index d58d41b..eecea2c 100755 --- a/setup-makefiles.sh +++ b/setup-makefiles.sh @@ -48,8 +48,7 @@ function lib_to_package_fixup_vendor_variants() { vendor.qti.imsrtpservice@3.0) echo "${1}_vendor" ;; - libOmxCore | \ - libgrallocutils) ;; + libgrallocutils) ;; *) return 1 ;; diff --git a/vendor.prop b/vendor.prop index 4576ae0..692e84f 100644 --- a/vendor.prop +++ b/vendor.prop @@ -210,6 +210,9 @@ ro.hardware.vulkan=adreno ro.opengles.version=196610 vendor.gralloc.disable_ubwc=0 +# Media +vendor.media.omx=0 + # OTG persist.sys.oem.otg_support=true