diff --git a/media_codecs_aosp_c2.xml b/media_codecs_aosp_c2.xml
index c2e37a7..c1d4a89 100644
--- a/media_codecs_aosp_c2.xml
+++ b/media_codecs_aosp_c2.xml
@@ -26,7 +26,7 @@
             <Limit name="block-count" range="1-129600" />
             <Limit name="blocks-per-second" min="1" max="3888000" />
             <Limit name="bitrate" range="1-240000000" />
-            <Limit name="performance-point-1280x720" range="240" />
+            <Limit name="performance-point-1920x1080" range="240" />
             <Limit name="performance-point-3840x2160" range="120" />
             <Limit name="performance-point-7680x4320" range="30" />
             <Limit name="concurrent-instances" max="16" />
@@ -41,7 +41,7 @@
             <Limit name="block-count" range="1-32400" />
             <Limit name="blocks-per-second" min="1" max="3888000" />
             <Limit name="bitrate" range="1-240000000" />
-            <Limit name="performance-point-1280x720" range="240" />
+            <Limit name="performance-point-1920x1080" range="240" />
             <Limit name="performance-point-3840x2160" range="120" />
             <Limit name="concurrent-instances" max="2" />
             <Feature name="adaptive-playback" />
@@ -56,7 +56,7 @@
             <Limit name="block-count" range="1-129600" />
             <Limit name="blocks-per-second" min="1" max="3888000" />
             <Limit name="bitrate" range="1-240000000" />
-            <Limit name="performance-point-1280x720" range="240" />
+            <Limit name="performance-point-1920x1080" range="240" />
             <Limit name="performance-point-3840x2160" range="120" />
             <Limit name="performance-point-7680x4320" range="30" />
             <Limit name="concurrent-instances" max="16" />
@@ -71,7 +71,7 @@
             <Limit name="block-count" range="1-32400" />
             <Limit name="blocks-per-second" min="1" max="3888000" />
             <Limit name="bitrate" range="1-240000000" />
-            <Limit name="performance-point-1280x720" range="240" />
+            <Limit name="performance-point-1920x1080" range="240" />
             <Limit name="performance-point-3840x2160" range="120" />
             <Limit name="concurrent-instances" max="2" />
             <Feature name="adaptive-playback" />
@@ -113,7 +113,7 @@
             <Limit name="block-count" range="1-32400" />
             <Limit name="blocks-per-second" min="1" max="3888000" />
             <Limit name="bitrate" range="1-80000000" />
-            <Limit name="performance-point-1280x720" range="240" />
+            <Limit name="performance-point-1920x1080" range="240" />
             <Limit name="performance-point-3840x2160" range="120" />
             <Limit name="concurrent-instances" max="16" />
             <Feature name="adaptive-playback" />
@@ -127,7 +127,7 @@
             <Limit name="block-count" range="1-8160" />
             <Limit name="blocks-per-second" min="1" max="3888000" />
             <Limit name="bitrate" range="1-80000000" />
-            <Limit name="performance-point-1280x720" range="240" />
+            <Limit name="performance-point-1920x1080" range="240" />
             <Limit name="performance-point-3840x2160" range="120" />
             <Limit name="performance-point-7680x4320" range="30" />
             <Limit name="concurrent-instances" max="16" />
@@ -142,7 +142,7 @@
             <Limit name="block-count" range="1-2040" />
             <Limit name="blocks-per-second" min="1" max="3888000" />
             <Limit name="bitrate" range="1-80000000" />
-            <Limit name="performance-point-1280x720" range="240" />
+            <Limit name="performance-point-1920x1080" range="240" />
             <Limit name="performance-point-3840x2160" range="120" />
             <Limit name="concurrent-instances" max="2" />
             <Feature name="adaptive-playback" />
@@ -160,7 +160,7 @@
             <Limit name="block-count" range="1-129600" />
             <Limit name="blocks-per-second" min="1" max="3888000" />
             <Limit name="bitrate" range="1-240000000" />
-            <Limit name="performance-point-1280x720" range="240" />
+            <Limit name="performance-point-1920x1080" range="240" />
             <Limit name="performance-point-3840x2160" range="120" />
             <Limit name="performance-point-7680x4320" range="30" />
             <Limit name="concurrent-instances" max="16" />
@@ -177,7 +177,7 @@
             <Limit name="block-count" range="1-32400" />
             <Limit name="blocks-per-second" min="1" max="972000" />
             <Limit name="bitrate" range="1-240000000" />
-            <Limit name="performance-point-1280x720" range="240" />
+            <Limit name="performance-point-1920x1080" range="240" />
             <Limit name="performance-point-3840x2160" range="120" />
             <Limit name="performance-point-7680x4320" range="30" />
             <Limit name="concurrent-instances" max="16" />
@@ -227,7 +227,7 @@
             <Limit name="block-count" range="1-32400" />
             <Limit name="blocks-per-second" min="1" max="3888000" />
             <Limit name="bitrate" range="1-80000000" />
-            <Limit name="performance-point-1280x720" range="240" />
+            <Limit name="performance-point-1920x1080" range="240" />
             <Limit name="performance-point-3840x2160" range="120" />
             <Limit name="concurrent-instances" max="16" />
             <Feature name="can-swap-width-height" value="1" />
@@ -243,7 +243,7 @@
             <Limit name="block-count" range="1-2040" />
             <Limit name="blocks-per-second" min="1" max="243000" />
             <Limit name="bitrate" range="1-80000000" />
-            <Limit name="performance-point-1280x720" range="240" />
+            <Limit name="performance-point-1920x1080" range="240" />
             <Limit name="performance-point-3840x2160" range="120" />
             <Limit name="concurrent-instances" max="16" />
             <Feature name="can-swap-width-height" value="1" />
diff --git a/media_codecs_bo_c2.xml b/media_codecs_bo_c2.xml
index 9ada728..4c8c575 100644
--- a/media_codecs_bo_c2.xml
+++ b/media_codecs_bo_c2.xml
@@ -15,6 +15,7 @@
 -->
 <MediaCodecs>
     <Include href="media_codecs_aosp_c2.xml" />
+    <Include href="media_codecs_dolby_c2.xml" />
     <Decoders>
         <MediaCodec name="c2.google.av1.decoder" type="video/av01">
           <Limit name="size" min="96x96" max="3840x2160" />
@@ -29,6 +30,7 @@
           <Limit name="performance-point-1920x1079" value="120" />
           <Limit name="performance-point-3840x2160" value="60" />
           <!--Feature name="adaptive-playback" /-->
+          <Feature name="can-swap-width-height" value="1" />
         </MediaCodec>
         <MediaCodec name="c2.google.av1.decoder.secure" type="video/av01">
           <Limit name="size" min="96x96" max="3840x2160" />
@@ -44,6 +46,7 @@
           <Limit name="performance-point-3840x2160" value="60" />
           <!--Feature name="adaptive-playback" /-->
           <Feature name="secure-playback" required="true" />
+          <Feature name="can-swap-width-height" value="1" />
         </MediaCodec>
     </Decoders>
     <Encoders>
@@ -55,7 +58,9 @@
             <Limit name="blocks-per-second" min="1" max="61200" />
             <Limit name="bitrate" range="1-120000000" />
             <Limit name="performance-point-1280x720" range="240" />
-            <Limit name="performance-point-3840x2160" range="30" />
+            <Limit name="performance-point-1920x1080" value="180" />
+            <Limit name="performance-point-1920x1079" value="120" />
+            <Limit name="performance-point-3840x2160" range="60" />
             <Limit name="concurrent-instances" max="16" />
             <Feature name="can-swap-width-height" value="1" />
             <Feature name="vq-minimum-quality"/>
diff --git a/media_codecs_performance_c2.xml b/media_codecs_performance_c2.xml
index 2c6663e..df54bb4 100644
--- a/media_codecs_performance_c2.xml
+++ b/media_codecs_performance_c2.xml
@@ -71,10 +71,8 @@
             <Limit name="measured-frame-rate-480x360" range="387-389" /> <!-- v90%=1.0 -->
         </MediaCodec>
         <MediaCodec name="c2.exynos.h263.decoder" type="video/3gpp" update="true">
-            <!-- measured 90%:521-541 med:521 N=2 -->
-            <Limit name="measured-frame-rate-176x144" range="1300-1400" /> <!-- v90%=1.0 -->
-            <!-- measured 90%:528-540 med:528 N=2 -->
-            <Limit name="measured-frame-rate-352x288" range="528-534" /> <!-- v90%=1.0 -->
+            <Limit name="measured-frame-rate-176x144" range="507-1012" />
+            <Limit name="measured-frame-rate-352x288" range="380-612" />
         </MediaCodec>
         <MediaCodec name="c2.exynos.vp8.decoder" type="video/x-vnd.on2.vp8" update="true">
             <!-- measured 90%:451-555 med:452 SLOW N=2 -->
@@ -112,8 +110,8 @@
         </MediaCodec>
 
         <MediaCodec name="c2.android.h263.decoder" type="video/3gpp" update="true">
-            <!-- measured 90%:261-267 med:261 N=2 -->
-            <Limit name="measured-frame-rate-176x144" range="261-264" /> <!-- v90%=1.0 -->
+            <Limit name="measured-frame-rate-176x144" range="993-1037" />
+            <Limit name="measured-frame-rate-352x288" range="847-906" />
         </MediaCodec>
         <MediaCodec name="c2.android.avc.decoder" type="video/avc" update="true">
             <!-- measured 90%:342-360 med:343 N=2 -->
@@ -138,73 +136,56 @@
             <Limit name="measured-frame-rate-1920x1080" range="45-46" /> <!-- v90%=1.0 -->
         </MediaCodec>
         <MediaCodec name="c2.android.mpeg4.decoder" type="video/mp4v-es" update="true">
-            <!-- measured 90%:234-241 med:234 N=2 -->
-            <Limit name="measured-frame-rate-176x144" range="234-237" /> <!-- v90%=1.0 -->
+            <Limit name="measured-frame-rate-176x144" range="1111-1176" />
+            <Limit name="measured-frame-rate-480x360" range="964-1042" />
+            <Limit name="measured-frame-rate-1280x720" range="294-300" />
         </MediaCodec>
         <MediaCodec name="c2.android.vp8.decoder" type="video/x-vnd.on2.vp8" update="true">
-            <!-- measured 90%:445-623 med:445 SLOW N=2 -->
-            <Limit name="measured-frame-rate-320x180" range="445-526" /> <!-- v90%=1.2 -->
-            <!-- measured 90%:198-199 med:198 N=2 -->
-            <Limit name="measured-frame-rate-640x360" range="198-199" /> <!-- v90%=1.0 -->
-            <!-- measured 90%:18-19 med:18 N=2 -->
-            <Limit name="measured-frame-rate-1920x1080" range="18-18" /> <!-- v90%=1.0 -->
+            <Limit name="measured-frame-rate-320x180" range="445-630" />
+            <Limit name="measured-frame-rate-640x360" range="270-537" />
+            <Limit name="measured-frame-rate-1280x720" range="75-147" />
+            <Limit name="measured-frame-rate-1920x1080" range="28-55" />
         </MediaCodec>
         <MediaCodec name="c2.android.vp9.decoder" type="video/x-vnd.on2.vp9" update="true">
-            <!-- measured 90%:440-463 med:441 N=2 -->
-            <Limit name="measured-frame-rate-320x180" range="440-452" /> <!-- v90%=1.0 -->
-            <!-- measured 90%:232-234 med:233 N=2 -->
-            <Limit name="measured-frame-rate-640x360" range="232-233" /> <!-- v90%=1.0 -->
-            <!-- measured 90%:63-64 med:63 N=2 -->
-            <Limit name="measured-frame-rate-1280x720" range="63-63" /> <!-- v90%=1.0 -->
-            <!-- measured 90%:39-40 med:39 N=2 -->
-            <Limit name="measured-frame-rate-1920x1080" range="39-40" /> <!-- v90%=1.0 -->
+            <Limit name="measured-frame-rate-320x180" range="440-630" />
+            <Limit name="measured-frame-rate-640x360" range="276-550" />
+            <Limit name="measured-frame-rate-1280x720" range="100-194" />
+            <Limit name="measured-frame-rate-1920x1080" range="64-124" />
         </MediaCodec>
         <MediaCodec name="c2.google.av1.decoder" type="video/av01" update="true">
-            <!-- measured 90%:295-301 med:296 N=2 -->
-            <Limit name="measured-frame-rate-352x288" range="295-298" /> <!-- v90%=1.0 -->
-            <!-- measured 90%:196-207 med:196 N=2 -->
-            <Limit name="measured-frame-rate-640x360" range="196-201" /> <!-- v90%=1.0 -->
-            <!-- measured 90%:177-180 med:178 N=2 -->
-            <Limit name="measured-frame-rate-720x480" range="177-178" /> <!-- v90%=1.0 -->
-            <!-- measured 90%:81-82 med:82 N=2 -->
-            <Limit name="measured-frame-rate-1280x720" range="81-82" /> <!-- v90%=1.0 -->
-            <!-- measured 90%:45-47 med:46 N=2 -->
-            <Limit name="measured-frame-rate-1920x1080" range="45-46" /> <!-- v90%=1.0 -->
+            <Limit name="measured-frame-rate-352x288" range="301-600" />
+            <Limit name="measured-frame-rate-640x360" range="276-550" />
+            <Limit name="measured-frame-rate-720x480" range="258-511" />
+            <Limit name="measured-frame-rate-1280x720" range="182-358" />
+            <Limit name="measured-frame-rate-1920x1080" range="118-234" />
         </MediaCodec>
         <MediaCodec name="c2.google.av1.decoder.secure" type="video/av01" update="true">
-            <!-- measured 90%:295-301 med:296 N=2 -->
-            <Limit name="measured-frame-rate-352x288" range="295-298" /> <!-- v90%=1.0 -->
-            <!-- measured 90%:196-207 med:196 N=2 -->
-            <Limit name="measured-frame-rate-640x360" range="196-201" /> <!-- v90%=1.0 -->
-            <!-- measured 90%:177-180 med:178 N=2 -->
-            <Limit name="measured-frame-rate-720x480" range="177-178" /> <!-- v90%=1.0 -->
-            <!-- measured 90%:81-82 med:82 N=2 -->
-            <Limit name="measured-frame-rate-1280x720" range="81-82" /> <!-- v90%=1.0 -->
-            <!-- measured 90%:45-47 med:46 N=2 -->
-            <Limit name="measured-frame-rate-1920x1080" range="45-46" /> <!-- v90%=1.0 -->
+            <Limit name="measured-frame-rate-352x288" range="301-600" />
+            <Limit name="measured-frame-rate-640x360" range="276-550" />
+            <Limit name="measured-frame-rate-720x480" range="258-511" />
+            <Limit name="measured-frame-rate-1280x720" range="182-358" />
+            <Limit name="measured-frame-rate-1920x1080" range="118-234" />
         </MediaCodec>
+        <MediaCodec name="c2.android.av1.decoder" type="video/av01" update="true">
+            <Limit name="measured-frame-rate-352x288" range="233-315" />
+            <Limit name="measured-frame-rate-640x360" range="114-247" />
+            <Limit name="measured-frame-rate-720x480" range="47-189" />
+            <Limit name="measured-frame-rate-1280x720" range="44-54" />
+         </MediaCodec>
     </Decoders>
 
     <Encoders>
         <MediaCodec name="c2.exynos.h264.encoder" type="video/avc" update="true">
-            <!-- measured 90%:482-560 med:483 N=2 -->
-            <Limit name="measured-frame-rate-320x240" range="482-520" /> <!-- v90%=1.1 -->
-            <!-- measured 90%:301-313 med:302 N=2 -->
-            <Limit name="measured-frame-rate-720x480" range="301-307" /> <!-- v90%=1.0 -->
-            <!-- measured 90%:181-201 med:181 N=2 -->
-            <Limit name="measured-frame-rate-1280x720" range="181-190" /> <!-- v90%=1.1 -->
-            <!-- measured 90%:98-100 med:99 N=2 -->
-            <Limit name="measured-frame-rate-1920x1080" range="98-99" /> <!-- v90%=1.0 -->
+            <Limit name="measured-frame-rate-320x240" range="372-551" />
+            <Limit name="measured-frame-rate-720x480" range="221-308" />
+            <Limit name="measured-frame-rate-1280x720" range="151-190" />
+            <Limit name="measured-frame-rate-1920x1080" range="58-99" />
         </MediaCodec>
         <MediaCodec name="c2.exynos.hevc.encoder" type="video/hevc" update="true">
-            <!-- measured 90%:589-597 med:589 N=2 -->
-            <Limit name="measured-frame-rate-320x240" range="589-593" /> <!-- v90%=1.0 -->
-            <!-- measured 90%:291-304 med:292 N=2 -->
-            <Limit name="measured-frame-rate-720x480" range="291-298" /> <!-- v90%=1.0 -->
-            <!-- measured 90%:195-201 med:196 N=2 -->
-            <Limit name="measured-frame-rate-1280x720" range="195-198" /> <!-- v90%=1.0 -->
-            <!-- measured 90%:94-96 med:95 N=2 -->
-            <Limit name="measured-frame-rate-1920x1080" range="94-95" /> <!-- v90%=1.0 -->
+            <Limit name="measured-frame-rate-320x240" range="371-553" />
+            <Limit name="measured-frame-rate-720x480" range="214-305" />
+            <Limit name="measured-frame-rate-1280x720" range="154-198" />
+            <Limit name="measured-frame-rate-1920x1080" range="46-97" />
         </MediaCodec>
         <MediaCodec name="c2.exynos.mpeg4.encoder" type="video/mp4v-es" update="true">
             <!-- measured 90%:575-670 med:575 N=2 -->
@@ -242,38 +223,65 @@
             <!-- measured 90%:84-86 med:85 N=2 -->
             <Limit name="measured-frame-rate-1920x1080" range="84-85" /> <!-- v90%=1.0 -->
         </MediaCodec>
+        <MediaCodec name="c2.google.av1.encoder" type="video/av01" update="true">
+            <!-- measured 90%:292-307 med:292 N=2 -->
+            <Limit name="measured-frame-rate-320x240" range="292-299" /> <!-- v90%=1.0 -->
+            <!-- measured 90%:162-164 med:162 N=2 -->
+            <Limit name="measured-frame-rate-720x480" range="162-163" /> <!-- v90%=1.0 -->
+            <!-- measured 90%:79-80 med:79 N=2 -->
+            <Limit name="measured-frame-rate-1280x720" range="79-79" /> <!-- v90%=1.0 -->
+            <!-- measured 90%:40-41 med:41 N=2 -->
+            <Limit name="measured-frame-rate-1920x1080" range="40-41" /> <!-- v90%=1.0 -->
+        </MediaCodec>
 
         <MediaCodec name="c2.android.h263.encoder" type="video/3gpp" update="true">
-            <!-- measured 90%:440-443 med:440 N=2 -->
-            <Limit name="measured-frame-rate-176x144" range="440-441" /> <!-- v90%=1.0 -->
+            <!-- measured 90%:868-1433 med:869 SLOW N=2 -->
+            <Limit name="measured-frame-rate-176x144" range="868-1116" /> <!-- v90%=1.3 -->
         </MediaCodec>
         <MediaCodec name="c2.android.avc.encoder" type="video/avc" update="true">
-            <!-- measured 90%:345-350 med:345 N=2 -->
-            <Limit name="measured-frame-rate-320x240" range="345-347" /> <!-- v90%=1.0 -->
-            <!-- measured 90%:101-103 med:101 N=2 -->
-            <Limit name="measured-frame-rate-720x480" range="101-102" /> <!-- v90%=1.0 -->
-            <!-- measured 90%:54-55 med:54 N=2 -->
-            <Limit name="measured-frame-rate-1280x720" range="54-54" /> <!-- v90%=1.0 -->
-            <!-- measured 90%:28-30 med:29 N=2 -->
-            <Limit name="measured-frame-rate-1920x1080" range="28-29" /> <!-- v90%=1.0 -->
+            <!-- measured 90%:357-443 med:427 N=4 -->
+            <Limit name="measured-frame-rate-320x240" range="398-398" /> <!-- v90%=1.1 -->
+            <!-- measured 90%:110-150 med:133 N=4 -->
+            <Limit name="measured-frame-rate-720x480" range="128-128" /> <!-- v90%=1.2 -->
+            <!-- measured 90%:57-87 med:78 N=4 -->
+            <Limit name="measured-frame-rate-1280x720" range="70-70" /> <!-- v90%=1.2 -->
+            <!-- measured 90%:43-47 med:46 N=4 -->
+            <Limit name="measured-frame-rate-1920x1080" range="45-45" /> <!-- v90%=1.0 -->
         </MediaCodec>
         <MediaCodec name="c2.android.hevc.encoder" type="video/hevc" update="true">
-            <!-- measured 90%:61-65 med:62 N=8 -->
-            <Limit name="measured-frame-rate-320x240" range="18-22" /> <!-- v90%=1.0 -->
+            <!-- measured 90%:43-46 med:44 N=4 -->
+            <Limit name="measured-frame-rate-320x240" range="43-44" /> <!-- v90%=1.0 -->
         </MediaCodec>
         <MediaCodec name="c2.android.mpeg4.encoder" type="video/mp4v-es" update="true">
-            <!-- measured 90%:461-471 med:462 N=2 -->
-            <Limit name="measured-frame-rate-176x144" range="461-466" /> <!-- v90%=1.0 -->
+            <!-- measured 90%:1426-1471 med:1427 N=2 -->
+            <Limit name="measured-frame-rate-176x144" range="1426-1448" /> <!-- v90%=1.0 -->
         </MediaCodec>
         <MediaCodec name="c2.android.vp8.encoder" type="video/x-vnd.on2.vp8" update="true">
-            <!-- measured 90%:49-87 med:50 SLOW N=2 -->
-            <Limit name="measured-frame-rate-320x180" range="394-395" /> <!-- v90%=1.3 -->
-            <!-- measured 90%:55-57 med:56 N=2 -->
-            <Limit name="measured-frame-rate-640x360" range="196-197" /> <!-- v90%=1.0 -->
-            <!-- measured 90%:34-35 med:34 N=2 -->
-            <Limit name="measured-frame-rate-1280x720" range="34-34" /> <!-- v90%=1.0 -->
-            <!-- measured 90%:29-31 med:30 N=2 -->
-            <Limit name="measured-frame-rate-1920x1080" range="29-30" /> <!-- v90%=1.0 -->
+            <!-- measured 90%:392-448 med:392 N=2 -->
+            <Limit name="measured-frame-rate-320x180" range="392-419" /> <!-- v90%=1.1 -->
+            <!-- measured 90%:213-226 med:214 N=2 -->
+            <Limit name="measured-frame-rate-640x360" range="213-219" /> <!-- v90%=1.0 -->
+            <!-- measured 90%:48-54 med:49 N=2 -->
+            <Limit name="measured-frame-rate-1280x720" range="48-51" /> <!-- v90%=1.1 -->
+            <!-- measured 90%:35-37 med:36 N=2 -->
+            <Limit name="measured-frame-rate-1920x1080" range="35-36" /> <!-- v90%=1.0 -->
         </MediaCodec>
+        <MediaCodec name="c2.android.vp9.encoder" type="video/x-vnd.on2.vp9" update="true">
+            <!-- measured 90%:304-378 med:304 SLOW N=2 -->
+            <Limit name="measured-frame-rate-320x180" range="304-339" /> <!-- v90%=1.1 -->
+            <!-- measured 90%:103-106 med:104 N=2 -->
+            <Limit name="measured-frame-rate-640x360" range="103-104" /> <!-- v90%=1.0 -->
+            <!-- measured 90%:20-24 med:21 N=2 -->
+            <Limit name="measured-frame-rate-1280x720" range="20-22" /> <!-- v90%=1.1 -->
+        </MediaCodec>
+        <MediaCodec name="c2.android.av1.encoder" type="video/av01" update="true">
+            <!-- measured 90%:367-372 med:367 N=2 -->
+            <Limit name="measured-frame-rate-320x240" range="367-369" /> <!-- v90%=1.0 -->
+            <!-- measured 90%:66-78 med:67 N=2 -->
+            <Limit name="measured-frame-rate-720x480" range="66-72" /> <!-- v90%=1.1 -->
+            <!-- measured 90%:23-28 med:23 N=2 -->
+            <Limit name="measured-frame-rate-1280x720" range="23-25" /> <!-- v90%=1.1 -->
+        </MediaCodec>
+
     </Encoders>
 </MediaCodecs>