diff --git a/media_codecs_performance_c2.xml b/media_codecs_performance_c2.xml
index a60791cc..7000661b 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="502-753" />
+            <Limit name="measured-frame-rate-352x288" range="420-631" />
         </MediaCodec>
         <MediaCodec name="c2.exynos.vp8.decoder" type="video/x-vnd.on2.vp8" update="true">
             <!-- measured 90%:451-555 med:452 SLOW N=2 -->
@@ -133,7 +131,9 @@
             <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">
-            <Limit name="measured-frame-rate-176x144" range="846-1244" /> <!-- v90%=1.2 -->
+            <Limit name="measured-frame-rate-176x144" range="1215-1823" />
+            <Limit name="measured-frame-rate-480x360" range="830-1246" />
+            <Limit name="measured-frame-rate-1280x720" range="234-351" />
         </MediaCodec>
         <MediaCodec name="c2.android.vp8.decoder" type="video/x-vnd.on2.vp8" update="true">
             <Limit name="measured-frame-rate-320x180" range="873-1013" /> <!-- v90%=1.1 -->
@@ -179,8 +179,7 @@
 
     <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 -->
+            <Limit name="measured-frame-rate-320x240" range="371-554" />
             <!-- 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 -->
@@ -189,8 +188,7 @@
             <Limit name="measured-frame-rate-1920x1080" range="98-99" /> <!-- v90%=1.0 -->
         </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 -->
+            <Limit name="measured-frame-rate-320x240" range="365-546" />
             <!-- 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 -->
@@ -209,29 +207,20 @@
             <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 -->
-            <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="382-574" />
+            <Limit name="measured-frame-rate-640x360" range="182-274" />
+            <Limit name="measured-frame-rate-1280x720" range="89-134" />
+            <Limit name="measured-frame-rate-1920x1080" range="60-91" />
         </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="381-570" />
+            <Limit name="measured-frame-rate-640x360" range="184-276" />
+            <Limit name="measured-frame-rate-1280x720" range="91-136" />
+            <Limit name="measured-frame-rate-1920x1080" range="62-93" />
         </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="841-1261" />
         </MediaCodec>
         <MediaCodec name="c2.android.avc.encoder" type="video/avc" update="true">
             <!-- measured 90%:345-350 med:345 N=2 -->
@@ -248,8 +237,7 @@
             <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 -->
+            <Limit name="measured-frame-rate-176x144" range="1129-1694" />
         </MediaCodec>
         <MediaCodec name="c2.android.vp8.encoder" type="video/x-vnd.on2.vp8" update="true">
             <Limit name="measured-frame-rate-320x180" range="183-284" /> <!-- v90%=1.3 -->
@@ -257,5 +245,10 @@
             <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>
+        <MediaCodec name="c2.android.vp9.encoder" type="video/x-vnd.on2.vp9" update="true">
+            <Limit name="measured-frame-rate-320x180" range="251-376" />
+            <Limit name="measured-frame-rate-640x360" range="64-97" />
+            <Limit name="measured-frame-rate-1280x720" range="16-24" />
+        </MediaCodec>
     </Encoders>
 </MediaCodecs>