From 5abd04f064cd2ddb9cf2c670aec3366cb22991c0 Mon Sep 17 00:00:00 2001
From: Shirayuki39 <lorddemecrius83@proton.me>
Date: Thu, 18 Jul 2024 15:57:08 +0800
Subject: [PATCH] LG8n: Reconfigure Media Stack

Signed-off-by: Shirayuki39 <lorddemecrius83@proton.me>
---
 configs/media/media_codecs_c2.xml            | 17 +++++++++++++++++
 configs/media/media_codecs_performance.xml   | 14 ++++++++++++++
 configs/media/mtk_platform_codecs_config.xml |  6 +++---
 3 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/configs/media/media_codecs_c2.xml b/configs/media/media_codecs_c2.xml
index 73a761c..605e367 100644
--- a/configs/media/media_codecs_c2.xml
+++ b/configs/media/media_codecs_c2.xml
@@ -324,6 +324,9 @@
             <Limit name="concurrent-instances" max="16" />
             <Feature name="can-swap-width-height" value="1"/>
             <Limit name="performance-point-1920x1088" value="30" />
+            <!-- modify CH6IH6921T-651 by liming.bai 20230607 start -->
+            <!-- Feature name="bitrate-modes" value="VBR,CBR,CQ" / -->
+            <!-- modify CH6IH6921T-651 by liming.bai 20230607 end -->
         </MediaCodec>
         <MediaCodec name="c2.mtk.avc.encoder.secure" type="video/avc" >
             <Limit name="size" min="160x128" max="1920x1088" />
@@ -332,6 +335,7 @@
             <Limit name="concurrent-instances" max="16" />
             <Limit name="performance-point-1920x1088" value="30" />
             <Feature name="special-codec" required="true" />
+            <Feature name="bitrate-modes" value="VBR,CBR,CQ" />
         </MediaCodec>
         <MediaCodec name="c2.mtk.hevc.encoder" type="video/hevc" >
             <Alias name="OMX.MTK.VIDEO.ENCODER.HEVC" />
@@ -353,6 +357,19 @@
             <Feature name="bitrate-modes" value="VBR,CBR,CQ" />
             <Limit name="performance-point-1920x1088" value="30" />
         </MediaCodec>
+        <!-- TCD:revert c2.android.av1.encoder X6837H897-1608 by mengmeng.zhang5 20230829 start -->
+        <!--<MediaCodec name="c2.android.av1.encoder" type="video/av01" update="true" enabled="false" minsdk="34">
+            <Limit name="alignment" value="2x2" />
+            <Limit name="block-size" value="16x16" />
+            <Limit name="size" min="2x2" max="720x720" />
+            <Limit name="block-count" range="1-1350" />--> <!-- max 720x480 -->
+            <!--<Limit name="bitrate" range="1-5000000" />
+            <Limit name="quality" range="0-100"  default="80" />
+            <Limit name="complexity" range="0-5"  default="0" />
+            <Feature name="bitrate-modes" value="VBR,CBR,CQ" />
+            <Attribute name="software-codec" />
+        </MediaCodec>-->
+        <!-- TCD:revert c2.android.av1.encoder X6837H897-1608 by mengmeng.zhang5 20230829 end -->
         <MediaCodec name="c2.android.h263.encoder" type="video/3gpp" update="true">
             <Alias name="OMX.google.h263.encoder" />
             <!-- profiles and levels:  ProfileBaseline : Level45 -->
diff --git a/configs/media/media_codecs_performance.xml b/configs/media/media_codecs_performance.xml
index 773bf2c..7deb235 100644
--- a/configs/media/media_codecs_performance.xml
+++ b/configs/media/media_codecs_performance.xml
@@ -103,6 +103,12 @@ Only the three quirks included above are recognized at this point:
             <Limit name="measured-frame-rate-1280x720" range="13-29" />
             <Limit name="measured-frame-rate-1920x1080" range="9-20" />
         </MediaCodec>
+        <!-- TCD:revert c2.android.av1.encoder X6837H897-1608 by mengmeng.zhang5 20230829 start -->
+        <!--<MediaCodec name="c2.android.av1.encoder" type="video/av01" update="true">
+            <Limit name="measured-frame-rate-320x240" range="100-219" />
+            <Limit name="measured-frame-rate-720x480" range="59-129" />
+        </MediaCodec>-->
+        <!-- TCD:revert c2.android.av1.encoder X6837H897-1608 by mengmeng.zhang5 20230829 end -->
     </Encoders>
     <Decoders>
         <!-- MTK codec -->
@@ -173,5 +179,13 @@ Only the three quirks included above are recognized at this point:
             <Limit name="measured-frame-rate-1280x720" range="52-115" />
             <Limit name="measured-frame-rate-1920x1080" range="29-64" />
         </MediaCodec>
+        <!-- TCD:revert c2.android.av1.encoder X6837H897-1608 by mengmeng.zhang5 20230829 start -->
+        <!--<MediaCodec name="c2.android.av1.decoder" type="video/av01" update="true">
+            <Limit name="measured-frame-rate-352x288" range="284-626" />
+            <Limit name="measured-frame-rate-640x360" range="188-415" />
+            <Limit name="measured-frame-rate-720x480" range="135-298" />
+            <Limit name="measured-frame-rate-1280x720" range="64-142" />
+        </MediaCodec>-->
+        <!-- TCD:revert c2.android.av1.encoder X6837H897-1608 by mengmeng.zhang5 20230829 end -->
     </Decoders>
 </MediaCodecs>
diff --git a/configs/media/mtk_platform_codecs_config.xml b/configs/media/mtk_platform_codecs_config.xml
index 4ae2a7b..2a5aa97 100644
--- a/configs/media/mtk_platform_codecs_config.xml
+++ b/configs/media/mtk_platform_codecs_config.xml
@@ -28,7 +28,7 @@
         <Video name="c2.mtk.avc.decoder.secure"
                type="video/avc"
                driverIntf="v4l2"
-               maxConcurrentInstances="1" />
+               maxConcurrentInstances="32" />
         <Video name="c2.mtk.hevc.decoder"
                type="video/hevc"
                driverIntf="v4l2"
@@ -37,7 +37,7 @@
         <Video name="c2.mtk.hevc.decoder.secure"
                type="video/hevc"
                driverIntf="v4l2"
-               maxConcurrentInstances="1"
+               maxConcurrentInstances="32"
                metaBufferSize="4096" />
         <Video name="c2.mtk.heif.decoder"
                type="image/vnd.android.heic"
@@ -54,7 +54,7 @@
         <Video name="c2.mtk.vp9.decoder.secure"
                type="video/x-vnd.on2.vp9"
                driverIntf="v4l2"
-               maxConcurrentInstances="1" />
+               maxConcurrentInstances="32" />
         <Video name="c2.mtk.mpeg2.decoder"
                type="video/mpeg2"
                driverIntf="v4l2"