From 100a6d61d3744f5d7988f7e8dbecd758b57bae9d Mon Sep 17 00:00:00 2001
From: Alexander Martinz <amartinz@shiftphones.com>
Date: Wed, 25 Jan 2023 12:36:58 +0100
Subject: [PATCH] sm6225-common: media: drop OMX sw video codecs

These are already supported by c2.

3gpp:
  - c2.android.h263.decoder
  - c2.android.h263.encoder

mp4v-es:
  - c2.android.mpeg4.decoder
  - c2.android.mpeg4.encoder

Test: run cts -m CtsMediaDecoderTestCases
Test: run cts -m CtsMediaEncoderTestCases

Change-Id: I6929ec570642255ea04f19c479d494ad4d1aec20
Signed-off-by: Alexander Martinz <amartinz@shiftphones.com>
---
 media/media_codecs_vendor.xml    | 77 ++++--------------------------
 media/media_codecs_vendor_v3.xml | 81 ++++----------------------------
 2 files changed, 20 insertions(+), 138 deletions(-)

diff --git a/media/media_codecs_vendor.xml b/media/media_codecs_vendor.xml
index 6c756a8..66938d7 100644
--- a/media/media_codecs_vendor.xml
+++ b/media/media_codecs_vendor.xml
@@ -89,8 +89,6 @@ Only the three quirks included above are recognized at this point:
  | h264        | 1920    1088    60      60     489600   |
  | hevc        | 1920    1080    60      60     489600   |
  | vp9         | 1920    1088    60      60     489600   |
- | mpeg4-sw    | 1920    1088    30      40     244800   |
- | h263-sw     | 864     480     30      16      48600   |
  |_____________|_________________________________________|
 
  Secure decoder capabilities
@@ -113,8 +111,6 @@ Only the three quirks included above are recognized at this point:
  |__________|_________________________________________|
  | h264     | 1920    1088    60      60     489600   |
  | hevc     | 1920    1088    60      60     489600   |
- | mpeg4-sw | 864     480     30      8       48600   |
- | h263-sw  | 864     480     30      2       48600   |
  |__________|_________________________________________|
 -->
 
@@ -156,16 +152,16 @@ Only the three quirks included above are recognized at this point:
             <Limit name="performance-point-1280x720" value="120" />
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.encoder.hevc.cq" type="video/hevc" >
-                <Quirk name="requires-allocate-on-input-ports" />
-                <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="128x128" max="512x512" />
-                <Limit name="frame-rate" range="1-20" />
-                <Limit name="concurrent-instances" max="16" />
-                <Limit name="quality" range="0-100" default="80" />
-                <Feature name="bitrate-modes" value="CQ" />
-                <Limit name="performance-point-512x512" value="2025" />
+            <Quirk name="requires-allocate-on-input-ports" />
+            <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="128x128" max="512x512" />
+            <Limit name="frame-rate" range="1-20" />
+            <Limit name="concurrent-instances" max="16" />
+            <Limit name="quality" range="0-100" default="80" />
+            <Feature name="bitrate-modes" value="CQ" />
+            <Limit name="performance-point-512x512" value="2025" />
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.encoder.heic" type="image/vnd.android.heic" >
             <Quirk name="requires-allocate-on-input-ports" />
@@ -180,33 +176,6 @@ Only the three quirks included above are recognized at this point:
             <Limit name="performance-point-8192x4320" value="3" />
             <Limit name="performance-point-1920x1080" value="6" />
         </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" />
-            <Limit name="concurrent-instances" max="3" />
-            <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="48600" />
-             <Limit name="bitrate" range="1-8000000" />
-             <Limit name="frame-rate" range="1-30" />
-             <Limit name="concurrent-instances" max="3" />
-             <Limit name="performance-point-720x480" value="30" />
-        </MediaCodec>
     </Encoders>
     <Decoders>
        <!-- Video Hardware  -->
@@ -294,32 +263,6 @@ Only the three quirks included above are recognized at this point:
             <Limit name="concurrent-instances" max="3" />
             <Limit name="performance-point-1920x1080" value="30" />
         </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" />
-             <Limit name="concurrent-instances" max="4" />
-             <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" />
-             <Limit name="frame-rate" range="1-30" />
-             <Limit name="concurrent-instances" max="4" />
-             <Limit name="performance-point-1920x1080" value="30" />
-        </MediaCodec>
         <MediaCodec name="c2.android.hevc.decoder" type="video/hevc" update="true">
             <!-- profiles and levels:  ProfileMain : MainTierLevel51 -->
             <Limit name="size" min="2x2" max="1280x720" />
diff --git a/media/media_codecs_vendor_v3.xml b/media/media_codecs_vendor_v3.xml
index 07f79c9..d1f04ce 100644
--- a/media/media_codecs_vendor_v3.xml
+++ b/media/media_codecs_vendor_v3.xml
@@ -89,8 +89,6 @@ Only the three quirks included above are recognized at this point:
  | h264        | 1920    1088    60      60     489600   |
  | hevc        | 1920    1080    60      60     489600   |
  | vp9         | 1920    1088    60      60     489600   |
- | mpeg4-sw    | 1920    1088    30      40     244800   |
- | h263-sw     | 864     480     30      16      48600   |
  |_____________|_________________________________________|
 
  Secure decoder capabilities
@@ -113,8 +111,6 @@ Only the three quirks included above are recognized at this point:
  |__________|_________________________________________|
  | h264     | 1920    1088    60      60     489600   |
  | hevc     | 1920    1088    60      60     489600   |
- | mpeg4-sw | 864     480     30      8       48600   |
- | h263-sw  | 864     480     30      2       48600   |
  |__________|_________________________________________|
 -->
 
@@ -158,16 +154,16 @@ Only the three quirks included above are recognized at this point:
             <Limit name="performance-point-1280x720" value="120" />
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.encoder.hevc.cq" type="video/hevc" >
-                <Quirk name="requires-allocate-on-input-ports" />
-                <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="128x128" max="512x512" />
-                <Limit name="frame-rate" range="1-20" />
-                <Limit name="concurrent-instances" max="16" />
-                <Limit name="quality" range="0-100" default="80" />
-                <Feature name="bitrate-modes" value="CQ" />
-                <Limit name="performance-point-512x512" value="2025" />
+            <Quirk name="requires-allocate-on-input-ports" />
+            <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="128x128" max="512x512" />
+            <Limit name="frame-rate" range="1-20" />
+            <Limit name="concurrent-instances" max="16" />
+            <Limit name="quality" range="0-100" default="80" />
+            <Feature name="bitrate-modes" value="CQ" />
+            <Limit name="performance-point-512x512" value="2025" />
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.encoder.heic" type="image/vnd.android.heic" >
             <Quirk name="requires-allocate-on-input-ports" />
@@ -182,35 +178,6 @@ Only the three quirks included above are recognized at this point:
             <Limit name="performance-point-8192x4320" value="3" />
             <Limit name="performance-point-1920x1080" value="6" />
         </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" />
-            <Limit name="concurrent-instances" max="3" />
-            <Feature name="can-swap-width-height" required="true" />
-            <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="48600" />
-             <Limit name="bitrate" range="1-8000000" />
-             <Limit name="frame-rate" range="1-30" />
-             <Limit name="concurrent-instances" max="3" />
-             <Feature name="can-swap-width-height" required="true" />
-             <Limit name="performance-point-720x480" value="30" />
-        </MediaCodec>
     </Encoders>
     <Decoders>
        <!-- Video Hardware  -->
@@ -304,34 +271,6 @@ Only the three quirks included above are recognized at this point:
             <Limit name="concurrent-instances" max="3" />
             <Limit name="performance-point-1920x1080" value="30" />
         </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="4" />
-             <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" />
-             <Limit name="frame-rate" range="1-30" />
-             <Feature name="can-swap-width-height" required="true" />
-             <Limit name="concurrent-instances" max="4" />
-             <Limit name="performance-point-1920x1080" value="30" />
-        </MediaCodec>
         <MediaCodec name="c2.android.hevc.decoder" type="video/hevc" update="true">
             <!-- profiles and levels:  ProfileMain : MainTierLevel51 -->
             <Limit name="size" min="2x2" max="1280x720" />