From bde8edee86eadb73adc8751ea196a5dfc6a602e4 Mon Sep 17 00:00:00 2001 From: Aaron Kling Date: Fri, 28 Jun 2024 22:09:34 -0500 Subject: [PATCH] beast: Remove software omx codec references These are no longer available as of Android 14 QPR3. The C2 codecs available by default in the swcodec apex will be used instead. Change-Id: I8cdf3e700823779a7382c66c3df8410d41209b7c --- device.mk | 10 ++-- media/media_codecs.xml | 85 ------------------------------ media/media_codecs_performance.xml | 41 -------------- 3 files changed, 3 insertions(+), 133 deletions(-) diff --git a/device.mk b/device.mk index 058f821..a6e230c 100644 --- a/device.mk +++ b/device.mk @@ -1,5 +1,5 @@ # -# Copyright (C) 2022-2023 The LineageOS Project +# Copyright (C) 2022-2024 The LineageOS Project # # SPDX-License-Identifier: Apache-2.0 # @@ -30,14 +30,10 @@ PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/keylayout/Vendor_0001_Product_0001.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/Vendor_0001_Product_0001.kl ## Media -PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/media/media_profiles_V1_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_V1_0.xml - -ifneq ($(PRODUCT_USE_SW_OMX),true) 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 -endif + $(LOCAL_PATH)/media/media_codecs_performance.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance.xml \ + $(LOCAL_PATH)/media/media_profiles_V1_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_V1_0.xml ## Platform TARGET_AMLOGIC_SOC := gxl diff --git a/media/media_codecs.xml b/media/media_codecs.xml index ff47ae4..d64e140 100644 --- a/media/media_codecs.xml +++ b/media/media_codecs.xml @@ -225,34 +225,6 @@ Only the three quirks included above are recognized at this point: - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -262,40 +234,6 @@ Only the three quirks included above are recognized at this point: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -305,11 +243,6 @@ Only the three quirks included above are recognized at this point: - - - - - @@ -318,23 +251,5 @@ Only the three quirks included above are recognized at this point: - - - - - - - - - - - - - - - - - - diff --git a/media/media_codecs_performance.xml b/media/media_codecs_performance.xml index dbf161f..31516ff 100644 --- a/media/media_codecs_performance.xml +++ b/media/media_codecs_performance.xml @@ -20,16 +20,6 @@ - - - - - - - - - - @@ -61,36 +51,5 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -- 2.20.1