From aabcfe6549a3c154800f641ea00604edb5ff30ed Mon Sep 17 00:00:00 2001
From: hmz007 <hmz007@gmail.com>
Date: Wed, 12 Jun 2024 21:33:36 +0800
Subject: [PATCH] rockchip: vpu: minor update mediacodec xmls for rk35xx

Signed-off-by: hmz007 <hmz007@gmail.com>
---
 .../common/vpu/etc/media_codecs_c2_rk356x.xml | 15 +++++++++---
 .../common/vpu/etc/media_codecs_c2_rk3588.xml | 23 +++++++++++++++----
 2 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/vendor/rockchip/common/vpu/etc/media_codecs_c2_rk356x.xml b/vendor/rockchip/common/vpu/etc/media_codecs_c2_rk356x.xml
index 78019eec11e..09390af63fe 100644
--- a/vendor/rockchip/common/vpu/etc/media_codecs_c2_rk356x.xml
+++ b/vendor/rockchip/common/vpu/etc/media_codecs_c2_rk356x.xml
@@ -17,7 +17,8 @@
 <Included>
     <Decoders>
         <MediaCodec name="c2.rk.avc.decoder" type="video/avc">
-            <Limit name="size" min="2x2" max="4096x2160" />
+            <Alias name="OMX.rk.video_decoder.avc" />
+            <Limit name="size" min="64x64" max="4096x2160" />
             <Limit name="alignment" value="2x2" />
             <Limit name="block-size" value="16x16" />
             <Limit name="block-count" range="1-32768" /> <!-- max 4096x2160 -->
@@ -29,7 +30,8 @@
             <Limit name="performance-point-3840x2160" value="60" />
         </MediaCodec>
         <MediaCodec name="c2.rk.hevc.decoder" type="video/hevc">
-            <Limit name="size" min="2x2" max="4096x2160" />
+            <Alias name="OMX.rk.video_decoder.hevc" />
+            <Limit name="size" min="64x64" max="4096x2160" />
             <Limit name="alignment" value="2x2" />
             <Limit name="block-size" value="16x16" />
             <Limit name="block-count" range="1-32768" /> <!-- max 4096x2160 -->
@@ -41,18 +43,20 @@
             <Limit name="performance-point-3840x2160" value="60" />
         </MediaCodec>
         <MediaCodec name="c2.rk.vp9.decoder" type="video/x-vnd.on2.vp9">
+            <Alias name="OMX.rk.video_decoder.vp9" />
             <Limit name="size" min="320x182" max="4096x2160" />
             <Limit name="alignment" value="2x2" />
             <Limit name="block-size" value="16x16" />
             <Limit name="block-count" range="1-32768" /> <!-- max 4096x2160 -->
             <Limit name="blocks-per-second" range="1-1966080" />
             <Limit name="frame-rate" range="1-60" />
-            <Limit name="bitrate" range="1-20000000" />
+            <Limit name="bitrate" range="1-40000000" />
             <Feature name="adaptive-playback" />
             <Limit name="concurrent-instances" max="32" />
             <Limit name="performance-point-3840x2160" value="60" />
         </MediaCodec>
         <MediaCodec name="c2.rk.vp8.decoder" type="video/x-vnd.on2.vp8">
+            <Alias name="OMX.rk.video_decoder.vp8" />
             <Limit name="size" min="2x2" max="1920x1088" />
             <Limit name="alignment" value="2x2" />
             <Limit name="block-size" value="16x16" />
@@ -65,6 +69,7 @@
             <Limit name="performance-point-1920x1088" value="60" />
         </MediaCodec>
         <MediaCodec name="c2.rk.mpeg2.decoder" type="video/mpeg2">
+            <Alias name="OMX.rk.video_decoder.m2v" />
             <Limit name="size" min="2x2" max="1920x1088" />
             <Limit name="alignment" value="2x2" />
             <Limit name="block-size" value="16x16" />
@@ -76,6 +81,7 @@
             <Limit name="performance-point-1920x1088" value="60" />
         </MediaCodec>
         <MediaCodec name="c2.rk.m4v.decoder" type="video/mp4v-es">
+            <Alias name="OMX.rk.video_decoder.m4v" />
             <Limit name="size" min="2x2" max="1920x1088" />
             <Limit name="alignment" value="2x2" />
             <Limit name="block-size" value="16x16" />
@@ -88,6 +94,7 @@
             <Limit name="performance-point-1920x1088" value="60" />
         </MediaCodec>
         <MediaCodec name="c2.rk.h263.decoder" type="video/3gpp">
+            <Alias name="OMX.rk.video_decoder.h263" />
             <Limit name="size" min="2x2" max="1920x1088" />
             <Limit name="alignment" value="2x2" />
             <Limit name="block-size" value="16x16" />
@@ -103,6 +110,7 @@
 
     <Encoders>
         <MediaCodec name="c2.rk.avc.encoder" type="video/avc">
+            <Alias name="OMX.rk.video_encoder.avc" />
             <Limit name="size" min="176x144" max="1920x1088" />
             <Limit name="alignment" value="2x2" />
             <Limit name="block-size" value="16x16" />
@@ -114,6 +122,7 @@
             <Limit name="performance-point-1920x1088" value="60" />
         </MediaCodec>
         <MediaCodec name="c2.rk.hevc.encoder" type="video/hevc">
+            <Alias name="OMX.rk.video_encoder.hevc" />
             <Limit name="size" min="176x144" max="1920x1088" />
             <Limit name="alignment" value="4x4" />
             <Limit name="block-size" value="16x16" />
diff --git a/vendor/rockchip/common/vpu/etc/media_codecs_c2_rk3588.xml b/vendor/rockchip/common/vpu/etc/media_codecs_c2_rk3588.xml
index 621063a3ad1..3e403545152 100644
--- a/vendor/rockchip/common/vpu/etc/media_codecs_c2_rk3588.xml
+++ b/vendor/rockchip/common/vpu/etc/media_codecs_c2_rk3588.xml
@@ -17,7 +17,8 @@
 <Included>
     <Decoders>
         <MediaCodec name="c2.rk.avc.decoder" type="video/avc">
-            <Limit name="size" min="2x2" max="7680x4320" />
+            <Alias name="OMX.rk.video_decoder.avc" />
+            <Limit name="size" min="64x64" max="7680x4320" />
             <Limit name="alignment" value="2x2" />
             <Limit name="block-size" value="16x16" />
             <Limit name="block-count" range="1-129600" />
@@ -28,7 +29,8 @@
             <Limit name="performance-point-7680x4320" value="30" />
         </MediaCodec>
         <MediaCodec name="c2.rk.hevc.decoder" type="video/hevc">
-            <Limit name="size" min="2x2" max="7680x4320" />
+            <Alias name="OMX.rk.video_decoder.hevc" />
+            <Limit name="size" min="64x64" max="7680x4320" />
             <Limit name="alignment" value="2x2" />
             <Limit name="block-size" value="16x16" />
             <Limit name="block-count" range="1-129600" /> <!-- max 7680x4320 -->
@@ -39,6 +41,7 @@
             <Limit name="performance-point-7680x4320" value="60" />
         </MediaCodec>
         <MediaCodec name="c2.rk.vp9.decoder" type="video/x-vnd.on2.vp9">
+            <Alias name="OMX.rk.video_decoder.vp9" />
             <Limit name="size" min="320x182" max="4096x2160" />
             <Limit name="alignment" value="2x2" />
             <Limit name="block-size" value="16x16" />
@@ -47,9 +50,11 @@
             <Limit name="frame-rate" range="1-60" />
             <Limit name="bitrate" range="1-80000000" />
             <Feature name="adaptive-playback" />
+            <Limit name="concurrent-instances" max="32" />
             <Limit name="performance-point-7680x4320" value="60" />
         </MediaCodec>
         <MediaCodec name="c2.rk.vp8.decoder" type="video/x-vnd.on2.vp8">
+            <Alias name="OMX.rk.video_decoder.vp8" />
             <Limit name="size" min="2x2" max="1920x1088" />
             <Limit name="alignment" value="2x2" />
             <Limit name="block-size" value="16x16" />
@@ -61,6 +66,7 @@
             <Limit name="performance-point-1920x1088" value="60" />
         </MediaCodec>
         <MediaCodec name="c2.rk.mpeg2.decoder" type="video/mpeg2">
+            <Alias name="OMX.rk.video_decoder.m2v" />
             <Limit name="size" min="2x2" max="1920x1088" />
             <Limit name="alignment" value="2x2" />
             <Limit name="block-size" value="16x16" />
@@ -71,6 +77,7 @@
             <Limit name="performance-point-1920x1088" value="60" />
         </MediaCodec>
         <MediaCodec name="c2.rk.m4v.decoder" type="video/mp4v-es">
+            <Alias name="OMX.rk.video_decoder.m4v" />
             <Limit name="size" min="2x2" max="1920x1088" />
             <Limit name="alignment" value="2x2" />
             <Limit name="block-size" value="16x16" />
@@ -82,6 +89,7 @@
             <Limit name="performance-point-1920x1088" value="60" />
         </MediaCodec>
         <MediaCodec name="c2.rk.h263.decoder" type="video/3gpp">
+            <Alias name="OMX.rk.video_decoder.h263" />
             <Limit name="size" min="2x2" max="1920x1088" />
             <Limit name="alignment" value="2x2" />
             <Limit name="block-size" value="16x16" />
@@ -93,20 +101,23 @@
             <Limit name="performance-point-1920x1088" value="60" />
         </MediaCodec>
         <MediaCodec name="c2.rk.av1.decoder" type="video/av01">
-            <Limit name="size" min="2x2" max="7680x4320" />
+            <Alias name="OMX.rk.video_decoder.av1" />
+            <Limit name="size" min="320x182" max="7680x4320" />
             <Limit name="alignment" value="2x2" />
             <Limit name="block-size" value="16x16" />
             <Limit name="block-count" range="1-129600" />
             <Limit name="blocks-per-second" range="1-4000000" />
-            <Limit name="frame-rate" range="1-60" />
+            <Limit name="frame-rate" range="1-120" />
             <Limit name="bitrate" range="1-80000000" />
             <Feature name="adaptive-playback" />
-            <Limit name="performance-point-7680x4320" value="30" />
+            <Limit name="concurrent-instances" max="32" />
+            <Limit name="performance-point-7680x4320" value="60" />
         </MediaCodec>
     </Decoders>
 
     <Encoders>
         <MediaCodec name="c2.rk.avc.encoder" type="video/avc">
+            <Alias name="OMX.rk.video_encoder.avc" />
             <Limit name="size" min="176x144" max="7680x4320" />
             <Limit name="alignment" value="2x2" />
             <Limit name="block-size" value="16x16" />
@@ -117,6 +128,7 @@
             <Limit name="performance-point-7680x4320" value="30" />
         </MediaCodec>
         <MediaCodec name="c2.rk.hevc.encoder" type="video/hevc">
+            <Alias name="OMX.rk.video_encoder.hevc" />
             <Limit name="size" min="176x144" max="7680x4320" />
             <Limit name="alignment" value="2x2" />
             <Limit name="block-size" value="16x16" />
@@ -127,6 +139,7 @@
             <Limit name="performance-point-7680x4320" value="30" />
         </MediaCodec>
         <MediaCodec name="c2.rk.vp8.encoder" type="video/x-vnd.on2.vp8">
+            <Alias name="OMX.rk.video_encoder.vp8" />
             <Limit name="size" min="176x144" max="1920x1088" />
             <Limit name="alignment" value="2x2" />
             <Limit name="block-size" value="16x16" />