cupid: Commonize audio related media_codecs

cupid-vendor.mk

@@ -366,8 +366,6 @@ PRODUCT_COPY_FILES += \
     vendor/xiaomi/cupid/proprietary/vendor/etc/libnfc-nxp.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-nxp.conf \
     vendor/xiaomi/cupid/proprietary/vendor/libnfc-nxp_RF.conf:$(TARGET_COPY_OUT_VENDOR)/libnfc-nxp_RF.conf \
     vendor/xiaomi/cupid/proprietary/vendor/etc/mdss_dsi_l3_42_02_0a_dsc_cmd_mi.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mdss_dsi_l3_42_02_0a_dsc_cmd_mi.xml \
-    vendor/xiaomi/cupid/proprietary/vendor/etc/media_codecs_c2_audio.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_c2_audio.xml \
-    vendor/xiaomi/cupid/proprietary/vendor/etc/media_codecs_vendor_audio.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_vendor_audio.xml \
     vendor/xiaomi/cupid/proprietary/vendor/etc/microphone_characteristics.xml:$(TARGET_COPY_OUT_VENDOR)/etc/microphone_characteristics.xml \
     vendor/xiaomi/cupid/proprietary/vendor/etc/models/acd/event.eai:$(TARGET_COPY_OUT_VENDOR)/etc/models/acd/event.eai \
     vendor/xiaomi/cupid/proprietary/vendor/etc/models/acd/music.eai:$(TARGET_COPY_OUT_VENDOR)/etc/models/acd/music.eai \

proprietary/vendor/etc/media_codecs_c2_audio.xml

@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!--
-     Copyright (C) 2021 The Linux Foundation. All rights reserved
-	 Not a Contribution
-
-     Copyright (C) 2014 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>
-    <Include href="media_codecs_dolby_audio.xml" />
-    <Decoders>
-        <!-- C2 audio decoders -->
-        <MediaCodec name="c2.qti.alac.sw.decoder" type="audio/alac" rank="0">
-            <Limit name="channel-count" max="8" />
-            <Limit name="sample-rate" ranges="8000-192000" />
-            <Limit name="bitrate" range="1-100000000" />
-            <Limit name="concurrent-instances" max="2" />
-        </MediaCodec>
-        <MediaCodec name="c2.qti.ape.sw.decoder" type="audio/x-ape" rank="0">
-            <Limit name="channel-count" max="2" />
-            <Limit name="sample-rate" ranges="8000-192000" />
-            <Limit name="bitrate" range="1-100000000" />
-            <Limit name="concurrent-instances" max="2" />
-        </MediaCodec>
-        <MediaCodec name="c2.qti.evrc.sw.decoder" type="audio/evrc" rank="0">
-            <Limit name="channel-count" max="1" />
-            <Limit name="sample-rate" ranges="8000" />
-            <Limit name="bitrate" range="1-9600" />
-            <Limit name="concurrent-instances" max="2" />
-        </MediaCodec>
-        <MediaCodec name="c2.qti.qcelp.sw.decoder" type="audio/qcelp" rank="0">
-            <Limit name="channel-count" max="1" />
-            <Limit name="sample-rate" ranges="8000" />
-            <Limit name="bitrate" range="1-9600" />
-            <Limit name="concurrent-instances" max="2" />
-        </MediaCodec>
-        <MediaCodec name="c2.qti.flac.sw.decoder" type="audio/flac">
-            <Limit name="channel-count" max="8" />
-            <Limit name="sample-rate" ranges="8000-192000" />
-            <Limit name="bitrate" range="1-9216000" />
-            <Limit name="concurrent-instances" max="2" />
-        </MediaCodec>
-        <MediaCodec name="c2.qti.dsd.sw.decoder" type="audio/dsd" rank="0">
-            <Limit name="channel-count" max="6" />
-            <Limit name="sample-rate" ranges="8000-22579200" />
-            <Limit name="concurrent-instances" max="2" />
-        </MediaCodec>
-        <MediaCodec name="c2.qti.aac.hw.decoder" type="audio/mp4a-latm">
-            <Limit name="channel-count" max="6" />
-            <Limit name="sample-rate" ranges="8000-96000" />
-            <Limit name="bitrate" range="8000-1536000" />
-            <Limit name="concurrent-instances" max="2" />
-        </MediaCodec>
-        <MediaCodec name="c2.qti.alac.hw.decoder" type="audio/alac" rank="1">
-            <Limit name="channel-count" max="8" />
-            <Limit name="sample-rate" ranges="8000-192000" />
-            <Limit name="bitrate" range="1-100000000" />
-            <Limit name="concurrent-instances" max="2" />
-        </MediaCodec>
-        <MediaCodec name="c2.qti.wma.hw.decoder" type="audio/x-ms-wma" rank="0">
-            <Limit name="channel-count" max="8" />
-            <Limit name="sample-rate" ranges="8000-96000" />
-            <Limit name="bitrate" range="8000-1536000" />
-            <Limit name="concurrent-instances" max="2" />
-        </MediaCodec>
-        <MediaCodec name="c2.qti.ape.hw.decoder" type="audio/x-ape" rank="1">
-            <Limit name="channel-count" max="2" />
-            <Limit name="sample-rate" ranges="8000-192000" />
-            <Limit name="bitrate" range="1-100000000" />
-            <Limit name="concurrent-instances" max="2" />
-        </MediaCodec>
-        <MediaCodec name="c2.qti.amrwbplus.hw.decoder" type="audio/amr-wb-plus" rank="0">
-            <Limit name="channel-count" max="2" />
-            <Limit name="sample-rate" ranges="8000-48000" />
-            <Limit name="bitrate" range="5200-48000" />
-            <Limit name="concurrent-instances" max="2" />
-        </MediaCodec>
-    </Decoders>
-    <Encoders>
-        <!-- C2 audio encoders -->
-        <MediaCodec name="c2.qti.amrnb.hw.encoder" type="audio/3gpp">
-            <Limit name="channel-count" max="1" />
-            <Limit name="sample-rate" ranges="8000" />
-            <Limit name="bitrate" range="4750-12200" />
-            <Limit name="concurrent-instances" max="2" />
-            <Feature name="special-codec" required="true" />
-        </MediaCodec>
-        <MediaCodec name="c2.qti.amrwb.hw.encoder" type="audio/amr-wb">
-            <Limit name="channel-count" max="1" />
-            <Limit name="sample-rate" ranges="16000" />
-            <Limit name="bitrate" range="6600-23850" />
-            <Limit name="concurrent-instances" max="2" />
-            <Feature name="special-codec" required="true" />
-        </MediaCodec>
-        <MediaCodec name="c2.qti.aac.hw.encoder" type="audio/mp4a-latm">
-            <Limit name="channel-count" max="2" />
-            <Limit name="sample-rate" ranges="8000-48000" />
-            <Limit name="bitrate" range="4000-192000" />
-            <Limit name="concurrent-instances" max="2" />
-            <Feature name="special-codec" required="true" />
-        </MediaCodec>
-        <MediaCodec name="c2.qti.evrc.hw.encoder" type="audio/evrc" rank="0">
-            <Limit name="channel-count" max="1" />
-            <Limit name="sample-rate" ranges="8000" />
-            <Limit name="bitrate" range="1-9600" />
-            <Limit name="concurrent-instances" max="2" />
-            <Feature name="special-codec" required="true" />
-        </MediaCodec>
-        <MediaCodec name="c2.qti.qcelp.hw.encoder" type="audio/qcelp" rank="0">
-            <Limit name="channel-count" max="1" />
-            <Limit name="sample-rate" ranges="8000" />
-            <Limit name="bitrate" range="1-13600" />
-            <Limit name="concurrent-instances" max="2" />
-            <Feature name="special-codec" required="true" />
-        </MediaCodec>
-    </Encoders>
-</Included>

proprietary/vendor/etc/media_codecs_vendor_audio.xml

@@ -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>