From adae1ea6613aedacf8c80a783c0ad4164f35972c Mon Sep 17 00:00:00 2001 From: dianlujitao Date: Sun, 8 Sep 2024 21:26:39 +0800 Subject: [PATCH] sm6150-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 Signed-off-by: therealmharc --- configs/hidl/manifest.xml | 13 - .../media_codecs_performance_sdmmagpie_v1.xml | 139 ------- configs/media/media_codecs_vendor_audio.xml | 24 -- .../media_codecs_vendor_sdmmagpie_v1.xml | 355 ------------------ extract-files.py | 1 - proprietary-files.txt | 12 - sm6150.mk | 17 - 7 files changed, 561 deletions(-) delete mode 100644 configs/media/media_codecs_performance_sdmmagpie_v1.xml delete mode 100644 configs/media/media_codecs_vendor_audio.xml delete mode 100644 configs/media/media_codecs_vendor_sdmmagpie_v1.xml diff --git a/configs/hidl/manifest.xml b/configs/hidl/manifest.xml index 42be720..b45c0bb 100644 --- a/configs/hidl/manifest.xml +++ b/configs/hidl/manifest.xml @@ -63,19 +63,6 @@ default - - android.hardware.media.omx - hwbinder - 1.0 - - IOmx - default - - - IOmxStore - default - - android.hardware.radio hwbinder diff --git a/configs/media/media_codecs_performance_sdmmagpie_v1.xml b/configs/media/media_codecs_performance_sdmmagpie_v1.xml deleted file mode 100644 index 608777e..0000000 --- a/configs/media/media_codecs_performance_sdmmagpie_v1.xml +++ /dev/null @@ -1,139 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/configs/media/media_codecs_vendor_audio.xml b/configs/media/media_codecs_vendor_audio.xml deleted file mode 100644 index 2164a65..0000000 --- a/configs/media/media_codecs_vendor_audio.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - diff --git a/configs/media/media_codecs_vendor_sdmmagpie_v1.xml b/configs/media/media_codecs_vendor_sdmmagpie_v1.xml deleted file mode 100644 index 8048539..0000000 --- a/configs/media/media_codecs_vendor_sdmmagpie_v1.xml +++ /dev/null @@ -1,355 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/extract-files.py b/extract-files.py index 512fc7b..e1ad6f6 100755 --- a/extract-files.py +++ b/extract-files.py @@ -44,7 +44,6 @@ lib_fixups: lib_fixups_user_type = { 'vendor.qti.hardware.wifidisplaysession@1.0', ): lib_fixup_vendor_suffix, ( - 'libOmxCore', 'libwpa_client', ): lib_fixup_remove, } diff --git a/proprietary-files.txt b/proprietary-files.txt index 72a6103..2ff024e 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -2,7 +2,6 @@ # Current blobs with ELF checks disabled: # imsdatadaemon, libcne, libwqe, lowi-server depend on libwpa_client, which is a gnu makefile target -# libOmxVpp depends on libOmxCore, which is a gnu makefile target # ADSP vendor/bin/adsprpcd @@ -359,17 +358,6 @@ vendor/etc/init/vendor.qti.media.c2@1.0-service.rc vendor/etc/init/vppservice.rc vendor/etc/seccomp_policy/codec2.vendor.base.policy vendor/etc/seccomp_policy/codec2.vendor.ext.policy -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/libOmxQcelp13Dec.so -vendor/lib/libOmxVpp.so;DISABLE_CHECKELF -vendor/lib/libOmxWmaDec.so -vendor/lib/libdsd2pcm.so vendor/lib/libmmosal.so;MODULE_SUFFIX=_vendor vendor/lib/libqcodec2.so vendor/lib/libvppclient.so diff --git a/sm6150.mk b/sm6150.mk index 711cbaa..4e491d0 100644 --- a/sm6150.mk +++ b/sm6150.mk @@ -212,26 +212,9 @@ PRODUCT_PACKAGES += \ vendor.lineage.livedisplay@2.1-service.xiaomi_sm6150 # Media -PRODUCT_PACKAGES += \ - libOmxAacEnc \ - libOmxAmrEnc \ - libOmxCore \ - libOmxEvrcEnc \ - libOmxQcelp13Enc \ - libOmxVdec \ - libOmxVenc \ - libstagefrighthw - -PRODUCT_COPY_FILES += \ - 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 - PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/configs/media/media_codecs_c2.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_c2.xml \ $(LOCAL_PATH)/configs/media/media_codecs_performance_c2.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance_c2.xml \ - $(LOCAL_PATH)/configs/media/media_codecs_performance_sdmmagpie_v1.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance.xml \ - $(LOCAL_PATH)/configs/media/media_codecs_vendor_audio.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_vendor_audio.xml \ - $(LOCAL_PATH)/configs/media/media_codecs_vendor_sdmmagpie_v1.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs.xml \ $(LOCAL_PATH)/configs/media/media_profiles.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_V1_0.xml # Network