From 1aeca47abb3fa62c1a387bfb910282de61fb1fae Mon Sep 17 00:00:00 2001
From: Bruno Martins <bgcngm@gmail.com>
Date: Sat, 4 Jan 2025 20:57:43 +0100
Subject: [PATCH] a71-common: Remove software OMX blobs

Default to C2 codecs from swcodec apex.

Change-Id: I32f0b0abe680c1f350268115a3cc5488a2a57ec3
---
 configs/media/media_codecs.xml             | 61 ----------------------
 configs/media/media_codecs_performance.xml | 19 -------
 proprietary-files.txt                      | 12 -----
 vendor.prop                                |  1 -
 4 files changed, 93 deletions(-)

diff --git a/configs/media/media_codecs.xml b/configs/media/media_codecs.xml
index c55e928..789ac0e 100755
--- a/configs/media/media_codecs.xml
+++ b/configs/media/media_codecs.xml
@@ -87,13 +87,11 @@ Only the three quirks included above are recognized at this point:
  |_____________|_________________________________________|
  | h264        | 4096    2160    30      100     1036800 |
  | hevc        | 4096    2160    30      100     1036800 |
- | mpeg4-sw    | 1920    1088    30      40      244800  |
  | vp8         | 1920    1088    60      100     489600  |
  | vp9         | 4096    2160    30      100     1036800 |
  |             | (4096)  (2304)  (30)    (120)           |
  | vc1         | 1920    1088    30      20      244800  |
  | div4/5/6-sw | 1920    1088    30      10      244800  |
- | h263-sw     | 864     480     30      16       48600  |
  | mpeg2       | 1920    1088    30      40      244800  |
  |_____________|_________________________________________|
 
@@ -113,9 +111,7 @@ Only the three quirks included above are recognized at this point:
  |__________|_________________________________________|
  | h264     | 4096    2160    30      100     1036800 |
  | hevc     | 4096    2160    30      100     1036800 |
- | mpeg4-sw | 1280     720    30      4       108000  |
  | vp8      | 1920    1088    60      40      489600  |
- | h263-sw  | 864     480     30      2       48600   |
  |__________|_________________________________________|
 -->
 
@@ -207,35 +203,6 @@ Only the three quirks included above are recognized at this point:
             <Feature name="bitrate-modes" value="CQ" />
         </MediaCodec>
 -->
-        <!-- Video Software -->
-        <MediaCodec name="OMX.qcom.video.encoder.h263sw" type="video/3gpp" >
-            <Quirk name="requires-allocate-on-input-ports" />
-            <Quirk name="requires-allocate-on-output-ports" />
-            <Quirk name="requires-loaded-to-idle-after-allocation" />
-            <Limit name="size" min="96x96" max="864x480" />
-            <Limit name="alignment" value="4x4" />
-            <Limit name="block-size" value="16x16" />
-            <Limit name="blocks-per-second" min="36" max="48600" />
-            <Limit name="bitrate" range="1-2000000" />
-            <Limit name="frame-rate" range="1-30" />
-            <Feature name="can-swap-width-height" required="true" />
-            <Limit name="concurrent-instances" max="16" />
-            <Limit name="performance-point-720x480" value="30" />
-        </MediaCodec>
-        <MediaCodec name="OMX.qcom.video.encoder.mpeg4sw" type="video/mp4v-es" >
-             <Quirk name="requires-allocate-on-input-ports" />
-             <Quirk name="requires-allocate-on-output-ports" />
-             <Quirk name="requires-loaded-to-idle-after-allocation" />
-             <Limit name="size" min="96x96" max="864x480" />
-             <Limit name="alignment" value="2x2" />
-             <Limit name="block-size" value="16x16" />
-             <Limit name="blocks-per-second" min="36" max="108000" />
-             <Limit name="bitrate" range="1-4000000" />
-             <Limit name="frame-rate" range="1-30" />
-             <Feature name="can-swap-width-height" required="true" />
-             <Limit name="concurrent-instances" max="16" />
-             <Limit name="performance-point-720x480" value="30" />
-        </MediaCodec>
     </Encoders>
     <Decoders>
        <!-- Video Hardware  -->
@@ -387,34 +354,6 @@ Only the three quirks included above are recognized at this point:
             <Limit name="performance-point-3840x2160" value="30" />
             <Limit name="performance-point-1920x1088" value="60" />
         </MediaCodec>
-        <!-- Video Software -->
-        <MediaCodec name="OMX.qti.video.decoder.h263sw" type="video/3gpp" >
-             <Quirk name="requires-allocate-on-input-ports" />
-             <Quirk name="requires-allocate-on-output-ports" />
-             <Limit name="size" min="96x96" max="864x480" />
-             <Limit name="alignment" value="4x4" />
-             <Limit name="block-size" value="16x16" />
-             <Limit name="blocks-per-second" min="36" max="48600" />
-             <Limit name="bitrate" range="1-16000000" />
-             <Limit name="frame-rate" range="1-30" />
-             <Feature name="adaptive-playback" />
-             <Feature name="can-swap-width-height" required="true" />
-             <Limit name="concurrent-instances" max="16" />
-             <Limit name="performance-point-720x480" value="30" />
-        </MediaCodec>
-        <MediaCodec name="OMX.qti.video.decoder.mpeg4sw" type="video/mp4v-es">
-            <Quirk name="requires-allocate-on-input-ports" />
-            <Quirk name="requires-allocate-on-output-ports" />
-            <Limit name="size" min="96x96" max="1920x1088" />
-            <Limit name="alignment" value="2x2" />
-            <Limit name="block-size" value="16x16" />
-            <Limit name="blocks-per-second" min="36" max="244800" />
-            <Limit name="bitrate" range="1-40000000" />
-            <Feature name="can-swap-width-height" required="true" />
-            <Limit name="frame-rate" range="1-30" />
-            <Limit name="concurrent-instances" max="16" />
-            <Limit name="performance-point-1920x1080" value="30" />
-        </MediaCodec>
         <!--
         <MediaCodec name="OMX.qti.video.decoder.divxsw" type="video/divx" >
             <Quirk name="requires-allocate-on-input-ports" />
diff --git a/configs/media/media_codecs_performance.xml b/configs/media/media_codecs_performance.xml
index 7c54b7b..b33a4ed 100755
--- a/configs/media/media_codecs_performance.xml
+++ b/configs/media/media_codecs_performance.xml
@@ -37,16 +37,6 @@ limitations under the License.
         <MediaCodec name="OMX.qcom.video.encoder.hevc.cq" type="video/hevc" update="true">
             <Limit name="measured-frame-rate-320x240" range="200-440" />
         </MediaCodec>
-        <MediaCodec name="OMX.qcom.video.encoder.h263sw" type="video/3gpp" update="true">
-            <Limit name="measured-frame-rate-176x144" range="150-330" />
-            <Limit name="measured-frame-rate-352x288" range="90-198" />
-        </MediaCodec>
-        <MediaCodec name="OMX.qcom.video.encoder.mpeg4sw" type="video/mp4v-es" update="true">
-            <Limit name="measured-frame-rate-176x144" range="90-198" />
-            <Limit name="measured-frame-rate-352x288" range="40-88" />
-            <Limit name="measured-frame-rate-640x480" range="15-33" />
-            <Limit name="measured-frame-rate-1280x720" range="9-20" />
-        </MediaCodec>
         <MediaCodec name="OMX.qcom.video.encoder.vp8" type="video/x-vnd.on2.vp8" update="true">
             <Limit name="measured-frame-rate-320x180" range="120-264" />
             <Limit name="measured-frame-rate-640x360" range="120-264" />
@@ -101,10 +91,6 @@ limitations under the License.
             <Limit name="measured-frame-rate-1280x720" range="220-440" />
             <Limit name="measured-frame-rate-1920x1088" range="120-240" />
         </MediaCodec>
-        <MediaCodec name="OMX.qti.video.decoder.h263sw" type="video/3gpp" update="true">
-            <Limit name="measured-frame-rate-176x144" range="300-600" />
-            <Limit name="measured-frame-rate-352x288" range="200-400" />
-        </MediaCodec>
         <MediaCodec name="OMX.qcom.video.decoder.hevc" type="video/hevc" update="true">
             <Limit name="measured-frame-rate-352x288" range="350-700" />
             <Limit name="measured-frame-rate-720x480" range="350-700" />
@@ -112,11 +98,6 @@ limitations under the License.
             <Limit name="measured-frame-rate-1920x1080" range="110-220" />
             <Limit name="measured-frame-rate-3840x2160" range="30-60" />
         </MediaCodec>
-        <MediaCodec name="OMX.qti.video.decoder.mpeg4sw" type="video/mp4v-es" update="true">
-            <Limit name="measured-frame-rate-176x144" range="330-660" />
-            <Limit name="measured-frame-rate-480x360" range="200-400" />
-            <Limit name="measured-frame-rate-1280x720" range="130-260" />
-        </MediaCodec>
         <MediaCodec name="OMX.qcom.video.decoder.vp8" type="video/x-vnd.on2.vp8" update="true">
             <Limit name="measured-frame-rate-320x180" range="350-700" />
             <Limit name="measured-frame-rate-640x360" range="350-700" />
diff --git a/proprietary-files.txt b/proprietary-files.txt
index 55c89bb..e01b82e 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -550,17 +550,11 @@ vendor/lib64/unnhal-acc-hta.so
 vendor/lib64/unnhal-acc-hvx.so
 
 # OMX
-vendor/lib/libAlacSwDec.so
-vendor/lib/libApeSwDec.so
-vendor/lib/libFlacSwDec.so
-vendor/lib/libMpeg4SwEncoder.so
 vendor/lib/libOmxAacDec.so
 vendor/lib/libOmxAlacDec.so
-vendor/lib/libOmxAlacDecSw.so
 vendor/lib/libOmxAmrDec.so
 vendor/lib/libOmxAmrwbplusDec.so
 vendor/lib/libOmxApeDec.so
-vendor/lib/libOmxApeDecSw.so
 vendor/lib/libOmxDsdDec.so
 vendor/lib/libOmxEvrcDec.so
 vendor/lib/libOmxG711Dec.so
@@ -569,17 +563,11 @@ vendor/lib/libOmxVpp.so;DISABLE_CHECKELF
 vendor/lib/libOmxWmaDec.so
 vendor/lib/libdsd2pcm.so
 vendor/lib/libmmosal.so;MODULE_SUFFIX=_vendor
-vendor/lib64/libAlacSwDec.so
-vendor/lib64/libApeSwDec.so
-vendor/lib64/libFlacSwDec.so
-vendor/lib64/libMpeg4SwEncoder.so
 vendor/lib64/libOmxAacDec.so
 vendor/lib64/libOmxAlacDec.so
-vendor/lib64/libOmxAlacDecSw.so
 vendor/lib64/libOmxAmrDec.so
 vendor/lib64/libOmxAmrwbplusDec.so
 vendor/lib64/libOmxApeDec.so
-vendor/lib64/libOmxApeDecSw.so
 vendor/lib64/libOmxEvrcDec.so
 vendor/lib64/libOmxG711Dec.so
 vendor/lib64/libOmxQcelp13Dec.so
diff --git a/vendor.prop b/vendor.prop
index ffba2d5..f8d2b9c 100644
--- a/vendor.prop
+++ b/vendor.prop
@@ -38,7 +38,6 @@ vendor.audio.feature.multi_voice_session.enable=false
 vendor.audio.feature.snd_mon.enable=true
 vendor.audio.feature.spkr_prot.enable=true
 vendor.audio.feature.usb_offload.enable=true
-vendor.audio.flac.sw.decoder.24bit=true
 vendor.audio.hal.boot.timeout.ms=20000
 vendor.audio_hal.in_period_size=144
 vendor.audio_hal.period_multiplier=3