diff --git a/media_codecs_performance_c2.xml b/media_codecs_performance_c2.xml
index a595ee4b..a60791cc 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="849-1283" /> <!-- v90%=1.2 -->
+            <Limit name="measured-frame-rate-352x288" range="766-822" /> <!-- v90%=1.1 -->
         </MediaCodec>
         <MediaCodec name="c2.android.avc.decoder" type="video/avc" update="true">
             <!-- measured 90%:342-360 med:343 N=2 -->
@@ -126,28 +126,20 @@
             <Limit name="measured-frame-rate-1920x1080" range="25-26" /> <!-- v90%=1.0 -->
         </MediaCodec>
         <MediaCodec name="c2.android.hevc.decoder" type="video/hevc" 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="583-674" /> <!-- N=20 v90%=1.0 -->
+            <Limit name="measured-frame-rate-640x360" range="337-352" /> <!-- v90%=1.0 -->
+            <Limit name="measured-frame-rate-720x480" range="312-324" /> <!-- v90%=1.0 -->
+            <Limit name="measured-frame-rate-1280x720" range="104-108" /> <!-- v90%=1.0 -->
+            <Limit name="measured-frame-rate-1920x1080" range="54-56" /> <!-- 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="846-1244" /> <!-- v90%=1.2 -->
         </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="873-1013" /> <!-- v90%=1.1 -->
+            <Limit name="measured-frame-rate-640x360" range="394-455" /> <!-- N=20 v90%=1.0 -->
+            <Limit name="measured-frame-rate-1280x720" range="105-109" /> <!-- v90%=1.0 -->
+            <Limit name="measured-frame-rate-1920x1080" range="38-41" /> <!-- v90%=1.0 -->
         </MediaCodec>
         <MediaCodec name="c2.android.vp9.decoder" type="video/x-vnd.on2.vp9" update="true">
             <!-- measured 90%:440-463 med:441 N=2 -->
@@ -207,20 +199,14 @@
             <Limit name="measured-frame-rate-1920x1080" range="94-95" /> <!-- v90%=1.0 -->
         </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="280-451" /> <!-- v90%=1.1 -->
+            <Limit name="measured-frame-rate-352x288" range="214-396" /> <!-- v90%=1.1 -->
+            <Limit name="measured-frame-rate-640x480" range="121-159" /> <!-- v90%=1.0 -->
         </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="273-405" /> <!-- v90%=1.0 -->
+            <Limit name="measured-frame-rate-352x288" range="250-320" /> <!-- v90%=1.0 -->
+            <Limit name="measured-frame-rate-704x576" range="120-176" /> <!-- v90%=1.0 -->
         </MediaCodec>
         <MediaCodec name="c2.exynos.vp8.encoder" type="video/x-vnd.on2.vp8" update="true">
             <!-- measured 90%:478-498 med:479 N=2 -->
@@ -257,19 +243,19 @@
             <!-- measured 90%:28-30 med:29 N=2 -->
             <Limit name="measured-frame-rate-1920x1080" range="28-29" /> <!-- 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="62-63" /> <!-- 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 -->
         </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="49-66" /> <!-- v90%=1.3 -->
-            <!-- measured 90%:55-57 med:56 N=2 -->
-            <Limit name="measured-frame-rate-640x360" range="55-56" /> <!-- 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 -->
+            <Limit name="measured-frame-rate-320x180" range="183-284" /> <!-- v90%=1.3 -->
+            <Limit name="measured-frame-rate-640x360" range="74-134" /> <!-- v90%=1.0 -->
+            <Limit name="measured-frame-rate-1280x720" range="34-38" /> <!-- v90%=1.0 -->
+            <Limit name="measured-frame-rate-1920x1080" range="29-31" /> <!-- v90%=1.0 -->
         </MediaCodec>
     </Encoders>
 </MediaCodecs>