From 8f8e83aab302f367d8ec2f1107a87826ce5de19b Mon Sep 17 00:00:00 2001
From: Aaron Kling <webgeek1234@gmail.com>
Date: Fri, 28 Jun 2024 22:09:34 -0500
Subject: [PATCH] sm8450-common: Remove software omx codec references

---
 proprietary/vendor/etc/media_codecs_cape.xml  |  3 ---
 .../vendor/etc/media_codecs_diwali_v0.xml     |  3 ---
 .../vendor/etc/media_codecs_diwali_v1.xml     |  3 ---
 .../vendor/etc/media_codecs_diwali_v2.xml     |  3 ---
 proprietary/vendor/etc/media_codecs_taro.xml  |  3 ---
 proprietary/vendor/etc/media_codecs_ukee.xml  |  3 ---
 .../vendor/etc/media_codecs_vendor_audio.xml  | 23 -------------------
 sm8450-common-vendor.mk                       |  1 -
 8 files changed, 42 deletions(-)
 delete mode 100644 proprietary/vendor/etc/media_codecs_vendor_audio.xml

diff --git a/proprietary/vendor/etc/media_codecs_cape.xml b/proprietary/vendor/etc/media_codecs_cape.xml
index 57bd8a1..fc127a7 100644
--- a/proprietary/vendor/etc/media_codecs_cape.xml
+++ b/proprietary/vendor/etc/media_codecs_cape.xml
@@ -83,9 +83,6 @@
 -->
 
 <MediaCodecs>
-    <Include href="media_codecs_google_audio.xml" />
-    <Include href="media_codecs_vendor_audio.xml" />
-    <Include href="media_codecs_google_telephony.xml" />
     <Include href="media_codecs_c2_audio.xml" />
     <Settings>
         <Setting name="max-video-encoder-input-buffers" value="11" />
diff --git a/proprietary/vendor/etc/media_codecs_diwali_v0.xml b/proprietary/vendor/etc/media_codecs_diwali_v0.xml
index bc22ff0..873a226 100644
--- a/proprietary/vendor/etc/media_codecs_diwali_v0.xml
+++ b/proprietary/vendor/etc/media_codecs_diwali_v0.xml
@@ -89,9 +89,6 @@
 -->
 
 <MediaCodecs>
-    <Include href="media_codecs_google_audio.xml" />
-    <Include href="media_codecs_vendor_audio.xml" />
-    <Include href="media_codecs_google_telephony.xml" />
     <Include href="media_codecs_c2_audio.xml" />
     <Settings>
         <Setting name="max-video-encoder-input-buffers" value="11" />
diff --git a/proprietary/vendor/etc/media_codecs_diwali_v1.xml b/proprietary/vendor/etc/media_codecs_diwali_v1.xml
index 97f0198..367cfa6 100644
--- a/proprietary/vendor/etc/media_codecs_diwali_v1.xml
+++ b/proprietary/vendor/etc/media_codecs_diwali_v1.xml
@@ -80,9 +80,6 @@
 -->
 
 <MediaCodecs>
-    <Include href="media_codecs_google_audio.xml" />
-    <Include href="media_codecs_vendor_audio.xml" />
-    <Include href="media_codecs_google_telephony.xml" />
     <Include href="media_codecs_c2_audio.xml" />
     <Settings>
         <Setting name="max-video-encoder-input-buffers" value="11" />
diff --git a/proprietary/vendor/etc/media_codecs_diwali_v2.xml b/proprietary/vendor/etc/media_codecs_diwali_v2.xml
index 9942f5b..f4aadad 100644
--- a/proprietary/vendor/etc/media_codecs_diwali_v2.xml
+++ b/proprietary/vendor/etc/media_codecs_diwali_v2.xml
@@ -83,9 +83,6 @@
 -->
 
 <MediaCodecs>
-    <Include href="media_codecs_google_audio.xml" />
-    <Include href="media_codecs_vendor_audio.xml" />
-    <Include href="media_codecs_google_telephony.xml" />
     <Include href="media_codecs_c2_audio.xml" />
     <Settings>
         <Setting name="max-video-encoder-input-buffers" value="11" />
diff --git a/proprietary/vendor/etc/media_codecs_taro.xml b/proprietary/vendor/etc/media_codecs_taro.xml
index 72acce1..4b8237b 100644
--- a/proprietary/vendor/etc/media_codecs_taro.xml
+++ b/proprietary/vendor/etc/media_codecs_taro.xml
@@ -83,9 +83,6 @@
 -->
 
 <MediaCodecs>
-    <Include href="media_codecs_google_audio.xml" />
-    <Include href="media_codecs_vendor_audio.xml" />
-    <Include href="media_codecs_google_telephony.xml" />
     <Include href="media_codecs_c2_audio.xml" />
     <Settings>
         <Setting name="max-video-encoder-input-buffers" value="11" />
diff --git a/proprietary/vendor/etc/media_codecs_ukee.xml b/proprietary/vendor/etc/media_codecs_ukee.xml
index 612c279..4958538 100644
--- a/proprietary/vendor/etc/media_codecs_ukee.xml
+++ b/proprietary/vendor/etc/media_codecs_ukee.xml
@@ -97,9 +97,6 @@
 -->
 
 <MediaCodecs>
-    <Include href="media_codecs_google_audio.xml" />
-    <Include href="media_codecs_vendor_audio.xml" />
-    <Include href="media_codecs_google_telephony.xml" />
     <Include href="media_codecs_c2_audio.xml" />
     <Settings>
         <Setting name="max-video-encoder-input-buffers" value="11" />
diff --git a/proprietary/vendor/etc/media_codecs_vendor_audio.xml b/proprietary/vendor/etc/media_codecs_vendor_audio.xml
deleted file mode 100644
index aa8fd9b..0000000
--- a/proprietary/vendor/etc/media_codecs_vendor_audio.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!-- Copyright (C) 2015-2021 The Linux Foundation. All rights reserved.
-     Not a contribution.
-     Copyright (C) 2012 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<Included>
-    <Decoders>
-        <MediaCodec name="OMX.google.opus.decoder" type="audio/opus" update="true" rank="100"/>
-        <!-- SimpleOMXComponet based software decoder-->
-    </Decoders>
-</Included>
diff --git a/sm8450-common-vendor.mk b/sm8450-common-vendor.mk
index f4c4108..a0d4909 100644
--- a/sm8450-common-vendor.mk
+++ b/sm8450-common-vendor.mk
@@ -334,7 +334,6 @@ PRODUCT_COPY_FILES += \
     vendor/xiaomi/sm8450-common/proprietary/vendor/etc/media_codecs_performance_ukee.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance_ukee.xml \
     vendor/xiaomi/sm8450-common/proprietary/vendor/etc/media_codecs_taro.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_taro.xml \
     vendor/xiaomi/sm8450-common/proprietary/vendor/etc/media_codecs_ukee.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_ukee.xml \
-    vendor/xiaomi/sm8450-common/proprietary/vendor/etc/media_codecs_vendor_audio.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_vendor_audio.xml \
     vendor/xiaomi/sm8450-common/proprietary/vendor/etc/media_diwali_v0/video_system_specs.json:$(TARGET_COPY_OUT_VENDOR)/etc/media_diwali_v0/video_system_specs.json \
     vendor/xiaomi/sm8450-common/proprietary/vendor/etc/media_diwali_v1/video_system_specs.json:$(TARGET_COPY_OUT_VENDOR)/etc/media_diwali_v1/video_system_specs.json \
     vendor/xiaomi/sm8450-common/proprietary/vendor/etc/media_diwali_v2/video_system_specs.json:$(TARGET_COPY_OUT_VENDOR)/etc/media_diwali_v2/video_system_specs.json \