diff --git a/configs/media/media_codecs_c2.xml b/configs/media/media_codecs_c2.xml
index 5a1f2a6..73a761c 100644
--- a/configs/media/media_codecs_c2.xml
+++ b/configs/media/media_codecs_c2.xml
@@ -119,15 +119,14 @@
             <Limit name="size" min="16x16" max="2048x1088" />
             <Feature name="adaptive-playback"/>
             <Limit name="concurrent-instances" max="32" />
-            <Limit name="performance-point-1280x720" value="120" />
-            <Limit name="performance-point-1920x1088" value="60" />
+            <Limit name="performance-point-1920x1088" value="30" />
         </MediaCodec>
         <MediaCodec name="c2.mtk.h263.decoder" type="video/3gpp" >
             <Alias name="OMX.MTK.VIDEO.DECODER.H263" />
             <Limit name="size" min="128x96" max="1408x1152" />
             <Feature name="adaptive-playback"/>
             <Limit name="concurrent-instances" max="32" />
-            <Limit name="performance-point-1280x720" value="60" />
+            <Limit name="performance-point-1280x720" value="30" />
         </MediaCodec>
         <MediaCodec name="c2.mtk.avc.decoder" type="video/avc" >
             <Alias name="OMX.MTK.VIDEO.DECODER.AVC" />
@@ -135,9 +134,7 @@
             <Quirk name="wants-NAL-fragments" />
             <Feature name="adaptive-playback"/>
             <Limit name="concurrent-instances" max="32" />
-            <Limit name="performance-point-1280x720" value="120" />
-            <Limit name="performance-point-1920x1088" value="60" />
-            <Limit name="performance-point-2560x1440" value="30" />
+            <Limit name="performance-point-1920x1088" value="30" />
         </MediaCodec>
         <MediaCodec name="c2.mtk.avc.decoder.secure" type="video/avc" >
             <Alias name="OMX.MTK.VIDEO.DECODER.AVC.secure" />
@@ -145,7 +142,7 @@
             <Quirk name="wants-NAL-fragments" />
             <Feature name="secure-playback" required="true" />
             <Feature name="adaptive-playback"/>
-            <Limit name="concurrent-instances" max="1" />
+            <Limit name="concurrent-instances" max="32" />
             <Limit name="performance-point-1920x1088" value="30" />
         </MediaCodec>
         <MediaCodec name="c2.mtk.hevc.decoder" type="video/hevc" >
@@ -153,9 +150,7 @@
             <Limit name="size" min="16x16" max="2560x1440" />
             <Feature name="adaptive-playback"/>
             <Limit name="concurrent-instances" max="32" />
-            <Limit name="performance-point-1280x720" value="120" />
-            <Limit name="performance-point-1920x1088" value="60" />
-            <Limit name="performance-point-2560x1440" value="30" />
+            <Limit name="performance-point-1920x1088" value="30" />
         </MediaCodec>
         <MediaCodec name="c2.mtk.hevc.decoder.secure" type="video/hevc" >
             <Alias name="OMX.MTK.VIDEO.DECODER.HEVC.secure" />
@@ -163,7 +158,7 @@
             <Quirk name="wants-NAL-fragments" />
             <Feature name="secure-playback" required="true" />
             <Feature name="adaptive-playback"/>
-            <Limit name="concurrent-instances" max="1" />
+            <Limit name="concurrent-instances" max="32" />
             <Limit name="performance-point-1920x1088" value="30" />
         </MediaCodec>
         <MediaCodec name="c2.mtk.heif.decoder" type="image/vnd.android.heic" >
@@ -185,9 +180,7 @@
             <Limit name="size" min="16x16" max="2560x1440" />
             <Feature name="adaptive-playback"/>
             <Limit name="concurrent-instances" max="32" />
-            <Limit name="performance-point-1280x720" value="120" />
-            <Limit name="performance-point-1920x1088" value="60" />
-            <Limit name="performance-point-2560x1440" value="30" />
+            <Limit name="performance-point-1920x1088" value="30" />
         </MediaCodec>
         <MediaCodec name="c2.mtk.vp9.decoder.secure" type="video/x-vnd.on2.vp9" >
             <Alias name="OMX.MTK.VIDEO.DECODER.VP9.secure" />
@@ -195,7 +188,7 @@
             <Quirk name="wants-NAL-fragments" />
             <Feature name="secure-playback" required="true" />
             <Feature name="adaptive-playback"/>
-            <Limit name="concurrent-instances" max="1" />
+            <Limit name="concurrent-instances" max="32" />
             <Limit name="performance-point-1920x1088" value="30" />
         </MediaCodec>
         <MediaCodec name="c2.mtk.mpeg2.decoder" type="video/mpeg2" >
@@ -203,8 +196,7 @@
             <Limit name="size" min="16x16" max="2048x1088" />
             <Feature name="adaptive-playback"/>
             <Limit name="concurrent-instances" max="32" />
-            <Limit name="performance-point-1280x720" value="120" />
-            <Limit name="performance-point-1920x1088" value="60" />
+            <Limit name="performance-point-1920x1088" value="30" />
         </MediaCodec>
         <MediaCodec name="c2.android.mpeg4.decoder" type="video/mp4v-es" update="true">
             <Alias name="OMX.google.mpeg4.decoder" />
diff --git a/configs/media/media_codecs_performance.xml b/configs/media/media_codecs_performance.xml
index 382260e..773bf2c 100644
--- a/configs/media/media_codecs_performance.xml
+++ b/configs/media/media_codecs_performance.xml
@@ -66,16 +66,20 @@ Only the three quirks included above are recognized at this point:
     <Encoders>
         <!-- MTK codec -->
         <MediaCodec name="c2.mtk.avc.encoder" type="video/avc" update="true">
-            <Limit name="measured-frame-rate-320x240" range="130-286" />
-            <Limit name="measured-frame-rate-720x480" range="75-166" />
-            <Limit name="measured-frame-rate-1280x720" range="50-111" />
-            <Limit name="measured-frame-rate-1920x1080" range="36-80" />
+            <!--BSP: modify XLQLBH-1277 by junhong.cai 20220601 start-->
+            <Limit name="measured-frame-rate-320x240" range="81-179" />
+            <!--BSP: modify XLQLBH-1277 by junhong.cai 20220601 end-->
+            <Limit name="measured-frame-rate-720x480" range="32-70" />
+            <Limit name="measured-frame-rate-1280x720" range="62-141" />
+            <Limit name="measured-frame-rate-1920x1080" range="55-122" />
         </MediaCodec>
         <MediaCodec name="c2.mtk.hevc.encoder" type="video/hevc" update="true">
-            <Limit name="measured-frame-rate-320x240" range="129-283" />
-            <Limit name="measured-frame-rate-720x480" range="75-166" />
-            <Limit name="measured-frame-rate-1280x720" range="51-113" />
-            <Limit name="measured-frame-rate-1920x1080" range="44-96" />
+            <Limit name="measured-frame-rate-320x240" range="139-305" />
+            <Limit name="measured-frame-rate-640x480" range="267-540" />
+            <Limit name="measured-frame-rate-720x480" range="68-149" />
+            <Limit name="measured-frame-rate-1280x720" range="45-170" />
+            <Limit name="measured-frame-rate-1920x1080" range="39-140" />
+            <Limit name="measured-frame-rate-3840x2160" range="20-76" />
         </MediaCodec>
         <!-- Google codec -->
         <MediaCodec name="c2.android.avc.encoder" type="video/avc" update="true">
@@ -88,10 +92,10 @@ Only the three quirks included above are recognized at this point:
             <Limit name="measured-frame-rate-320x240" range="20-43" />
         </MediaCodec>
         <MediaCodec name="c2.android.h263.encoder" type="video/3gpp" update="true">
-            <Limit name="measured-frame-rate-176x144" range="265-584" />
+            <Limit name="measured-frame-rate-176x144" range="52-115" />
         </MediaCodec>
         <MediaCodec name="c2.android.mpeg4.encoder" type="video/mp4v-es" update="true">
-            <Limit name="measured-frame-rate-176x144" range="243-536" />
+            <Limit name="measured-frame-rate-176x144" range="52-115" />
         </MediaCodec>
         <MediaCodec name="c2.android.vp8.encoder" type="video/x-vnd.on2.vp8" update="true">
             <Limit name="measured-frame-rate-320x180" range="128-281" />
@@ -112,21 +116,21 @@ Only the three quirks included above are recognized at this point:
             <Limit name="measured-frame-rate-352x288" range="233-513" />
         </MediaCodec>
         <MediaCodec name="c2.mtk.avc.decoder" type="video/avc" update="true">
-            <Limit name="measured-frame-rate-320x240" range="426-938" />
-            <Limit name="measured-frame-rate-720x480" range="193-424" />
-            <Limit name="measured-frame-rate-1280x720" range="138-304" />
+            <Limit name="measured-frame-rate-320x240" range="186-1036" />
+            <Limit name="measured-frame-rate-720x480" range="124-743" />
+            <Limit name="measured-frame-rate-1280x720" range="74-402" />
             <Limit name="measured-frame-rate-1920x1080" range="55-122" />
         </MediaCodec>
         <MediaCodec name="c2.mtk.hevc.decoder" type="video/hevc" update="true">
-            <Limit name="measured-frame-rate-352x288" range="484-1065" />
-            <Limit name="measured-frame-rate-640x360" range="362-796" />
-            <Limit name="measured-frame-rate-720x480" range="241-530" />
-            <Limit name="measured-frame-rate-1280x720" range="184-405" />
+            <Limit name="measured-frame-rate-352x288" range="177-1050" />
+            <Limit name="measured-frame-rate-720x480" range="142-803" />
+            <Limit name="measured-frame-rate-1280x720" range="75-569" />
             <Limit name="measured-frame-rate-1920x1080" range="69-354" />
+            <Limit name="measured-frame-rate-3840x2160" range="55-120" />
         </MediaCodec>
         <MediaCodec name="c2.mtk.vpx.decoder" type="video/x-vnd.on2.vp8" update="true">
-            <Limit name="measured-frame-rate-320x180" range="161-355" />
-            <Limit name="measured-frame-rate-640x360" range="132-292" />
+            <Limit name="measured-frame-rate-320x180" range="158-549" />
+            <Limit name="measured-frame-rate-640x360" range="91-315" />
             <Limit name="measured-frame-rate-1280x720" range="65-142" />
             <Limit name="measured-frame-rate-1920x1080" range="23-79" />
         </MediaCodec>
@@ -135,6 +139,7 @@ Only the three quirks included above are recognized at this point:
             <Limit name="measured-frame-rate-640x360" range="170-373" />
             <Limit name="measured-frame-rate-1280x720" range="89-196" />
             <Limit name="measured-frame-rate-1920x1080" range="55-121" />
+            <Limit name="measured-frame-rate-3840x2160" range="18-40" />
         </MediaCodec>
         <!-- Google codec -->
         <MediaCodec name="c2.android.mpeg4.decoder" type="video/mp4v-es" update="true">
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"