diff --git a/media_codecs_performance_c2.xml b/media_codecs_performance_c2.xml
index 2c6663e9..fada0abc 100644
--- a/media_codecs_performance_c2.xml
+++ b/media_codecs_performance_c2.xml
@@ -112,8 +112,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="1504-2256" />
+            <Limit name="measured-frame-rate-352x288" range="893-1339" />
         </MediaCodec>
         <MediaCodec name="c2.android.avc.decoder" type="video/avc" update="true">
             <!-- measured 90%:342-360 med:343 N=2 -->
@@ -138,26 +138,21 @@
             <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="1851-2777" />
+            <Limit name="measured-frame-rate-480x360" range="1174-1762" />
+            <Limit name="measured-frame-rate-1280x720" range="265-397" />
         </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="847-1271" />
+            <Limit name="measured-frame-rate-640x360" range="412-618" />
+            <Limit name="measured-frame-rate-1280x720" range="119-178" />
+            <Limit name="measured-frame-rate-1920x1080" range="47-70" />
         </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="622-934" />
+            <Limit name="measured-frame-rate-640x360" range="418-627" />
+            <Limit name="measured-frame-rate-1280x720" range="123-185" />
+            <Limit name="measured-frame-rate-1920x1080" range="75-112" />
         </MediaCodec>
         <MediaCodec name="c2.google.av1.decoder" type="video/av01" update="true">
             <!-- measured 90%:295-301 med:296 N=2 -->
@@ -187,65 +182,42 @@
 
     <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 -->
-            <Limit name="measured-frame-rate-176x144" range="575-620" /> <!-- v90%=1.1 -->
-            <!-- measured 90%:222-283 med:222 SLOW N=2 -->
-            <Limit name="measured-frame-rate-352x288" range="222-250" /> <!-- v90%=1.1 -->
-            <!-- measured 90%:123-124 med:124 N=2 -->
-            <Limit name="measured-frame-rate-640x480" range="123-124" /> <!-- v90%=1.0 -->
+            <Limit name="measured-frame-rate-176x144" range="380-566" />
+            <Limit name="measured-frame-rate-352x288" range="222-250" />
+            <Limit name="measured-frame-rate-640x480" range="103-124" />
         </MediaCodec>
         <MediaCodec name="c2.exynos.h263.encoder" type="video/3gpp" update="true">
-            <!-- measured 90%:626-686 med:627 N=2 -->
-            <Limit name="measured-frame-rate-176x144" range="626-656" /> <!-- v90%=1.0 -->
-            <!-- measured 90%:295-300 med:296 N=2 -->
-            <Limit name="measured-frame-rate-352x288" range="295-298" /> <!-- v90%=1.0 -->
-            <!-- measured 90%:95-97 med:96 N=2 -->
-            <Limit name="measured-frame-rate-704x576" range="95-96" /> <!-- v90%=1.0 -->
+            <Limit name="measured-frame-rate-176x144" range="500-751" />
+            <Limit name="measured-frame-rate-352x288" range="236-355" />
+            <Limit name="measured-frame-rate-704x576" range="76-114" />
         </MediaCodec>
         <MediaCodec name="c2.exynos.vp8.encoder" type="video/x-vnd.on2.vp8" update="true">
-            <!-- measured 90%:478-498 med:479 N=2 -->
-            <Limit name="measured-frame-rate-320x180" range="478-488" /> <!-- v90%=1.0 -->
-            <!-- measured 90%:334-347 med:334 N=2 -->
-            <Limit name="measured-frame-rate-640x360" range="334-341" /> <!-- v90%=1.0 -->
-            <!-- measured 90%:142-143 med:142 N=2 -->
-            <Limit name="measured-frame-rate-1280x720" range="142-142" /> <!-- v90%=1.0 -->
-            <!-- measured 90%:69-70 med:69 N=2 -->
-            <Limit name="measured-frame-rate-1920x1080" range="69-69" /> <!-- v90%=1.0 -->
+            <Limit name="measured-frame-rate-320x180" range="378-488" />
+            <Limit name="measured-frame-rate-640x360" range="267-351" />
+            <Limit name="measured-frame-rate-1280x720" range="113-170" />
+            <Limit name="measured-frame-rate-1920x1080" range="55-82" />
         </MediaCodec>
         <MediaCodec name="c2.exynos.vp9.encoder" type="video/x-vnd.on2.vp9" update="true">
-            <!-- measured 90%:474-485 med:474 N=2 -->
-            <Limit name="measured-frame-rate-320x180" range="474-479" /> <!-- v90%=1.0 -->
-            <!-- measured 90%:192-267 med:193 SLOW N=2 -->
-            <Limit name="measured-frame-rate-640x360" range="192-227" /> <!-- v90%=1.2 -->
-            <!-- measured 90%:95-96 med:96 N=2 -->
-            <Limit name="measured-frame-rate-1280x720" range="95-96" /> <!-- v90%=1.0 -->
-            <!-- measured 90%:84-86 med:85 N=2 -->
-            <Limit name="measured-frame-rate-1920x1080" range="84-85" /> <!-- v90%=1.0 -->
+            <Limit name="measured-frame-rate-320x180" range="302-453" />
+            <Limit name="measured-frame-rate-640x360" range="188-283" />
+            <Limit name="measured-frame-rate-1280x720" range="160-240" />
+            <Limit name="measured-frame-rate-1920x1080" range="100-151" />
         </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 -->
+            <Limit name="measured-frame-rate-176x144" range="1452-2178" />
         </MediaCodec>
         <MediaCodec name="c2.android.avc.encoder" type="video/avc" update="true">
             <!-- measured 90%:345-350 med:345 N=2 -->
@@ -262,8 +234,7 @@
             <Limit name="measured-frame-rate-320x240" range="18-22" /> <!-- 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 -->
+            <Limit name="measured-frame-rate-176x144" range="1201-1801" />
         </MediaCodec>
         <MediaCodec name="c2.android.vp8.encoder" type="video/x-vnd.on2.vp8" update="true">
             <!-- measured 90%:49-87 med:50 SLOW N=2 -->
@@ -275,5 +246,10 @@
             <!-- measured 90%:29-31 med:30 N=2 -->
             <Limit name="measured-frame-rate-1920x1080" range="29-30" /> <!-- v90%=1.0 -->
         </MediaCodec>
-    </Encoders>
+        <MediaCodec name="c2.android.vp9.encoder" type="video/x-vnd.on2.vp9" update="true">
+            <Limit name="measured-frame-rate-320x180" range="345-518" />
+            <Limit name="measured-frame-rate-640x360" range="91-136" />
+            <Limit name="measured-frame-rate-1280x720" range="24-36" />
+        </MediaCodec>
+      </Encoders>
 </MediaCodecs>