diff --git a/configs/media/media_codecs_performance.xml b/configs/media/media_codecs_performance.xml
index 31a018d1..70f5ba90 100644
--- a/configs/media/media_codecs_performance.xml
+++ b/configs/media/media_codecs_performance.xml
@@ -38,7 +38,7 @@
             <Limit name="measured-frame-rate-352x288" range="261-261" />
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.encoder.mpeg4" type="video/mp4v-es" update="true">
-            <Limit name="measured-frame-rate-176x144" range="547-565" />
+            <Limit name="measured-frame-rate-176x144" range="72-135" />
             <Limit name="measured-frame-rate-352x288" range="263-263" />
             <Limit name="measured-frame-rate-640x480" range="144-144" />
         </MediaCodec>
@@ -55,47 +55,32 @@
             <Limit name="measured-frame-rate-1920x1080" range="28-28" />
         </MediaCodec>
         <MediaCodec name="c2.android.avc.encoder" type="video/avc" update="true">
-            <Limit name="measured-frame-rate-320x240" range="370-385" />
+            <Limit name="measured-frame-rate-320x240" range="295-310" />
             <Limit name="measured-frame-rate-720x480" range="25-50" />
             <Limit name="measured-frame-rate-1280x720" range="22-44" />
             <Limit name="measured-frame-rate-1920x1080" range="16-30" />
         </MediaCodec>
-        <MediaCodec name="c2.android.avc.encoder" type="video/avc" update="true">
-            <Limit name="measured-frame-rate-320x240" range="190-380" />
-            <Limit name="measured-frame-rate-720x480" range="55-110" />
-            <Limit name="measured-frame-rate-1280x720" range="30-78" />
-            <Limit name="measured-frame-rate-1920x1080" range="22-45" />
-        </MediaCodec>
         <MediaCodec name="OMX.google.h263.encoder" type="video/3gpp" update="true">
-            <Limit name="measured-frame-rate-176x144" range="50-100" />
+            <Limit name="measured-frame-rate-176x144" range="350-365" />
         </MediaCodec>
         <MediaCodec name="c2.android.h263.encoder" type="video/3gpp" update="true">
-            <Limit name="measured-frame-rate-176x144" range="200-400" />
+            <Limit name="measured-frame-rate-176x144" range="152-345" />
         </MediaCodec>
         <MediaCodec name="OMX.google.mpeg4.encoder" type="video/mp4v-es" update="true">
             <Limit name="measured-frame-rate-176x144" range="385-385" />
         </MediaCodec>
         <MediaCodec name="c2.android.mpeg4.encoder" type="video/mp4v-es" update="true">
-            <Limit name="measured-frame-rate-176x144" range="200-400" />
+            <Limit name="measured-frame-rate-176x144" range="350-360" />
         </MediaCodec>
         <MediaCodec name="c2.android.hevc.encoder" type="video/hevc" update="true">
             <Limit name="measured-frame-rate-320x240" range="13-21" />
         </MediaCodec>
-        <MediaCodec name="c2.android.mpeg4.encoder" type="video/mp4v-es" update="true">
-            <Limit name="measured-frame-rate-176x144" range="200-380" />
-        </MediaCodec>
         <MediaCodec name="OMX.google.vp8.encoder" type="video/x-vnd.on2.vp8" update="true">
             <Limit name="measured-frame-rate-320x180" range="100-120" />
             <Limit name="measured-frame-rate-640x360" range="45-50" />
             <Limit name="measured-frame-rate-1280x720" range="30-35" />
             <Limit name="measured-frame-rate-1920x1080" range="20-30" />
         </MediaCodec>
-        <MediaCodec name="c2.android.vp8.encoder" type="video/x-vnd.on2.vp8" update="true">
-            <Limit name="measured-frame-rate-320x180" range="75-150" />
-            <Limit name="measured-frame-rate-640x360" range="42-75" />
-            <Limit name="measured-frame-rate-1280x720" range="14-35" />
-            <Limit name="measured-frame-rate-1920x1080" range="10-19" />
-        </MediaCodec>
         <MediaCodec name="OMX.google.vp9.encoder" type="video/x-vnd.on2.vp9" update="true">
             <Limit name="measured-frame-rate-320x180" range="140-180" />
             <Limit name="measured-frame-rate-640x360" range="45-60" />
@@ -107,42 +92,39 @@
             <Limit name="measured-frame-rate-1280x720" range="17-34" />
             <Limit name="measured-frame-rate-1920x1080" range="7-15" />
         </MediaCodec>
-        <MediaCodec name="c2.android.hevc.encoder" type="video/hevc" update="true">
-            <Limit name="measured-frame-rate-320x240" range="21-38" />
-        </MediaCodec>
     </Encoders>
     <Decoders>
         <MediaCodec name="OMX.qcom.video.decoder.avc" type="video/avc" update="true">
-            <Limit name="measured-frame-rate-320x240" range="380-395" />
+            <Limit name="measured-frame-rate-320x240" range="555-566" />
             <Limit name="measured-frame-rate-720x480" range="239-239" />
             <Limit name="measured-frame-rate-1280x720" range="197-197" />
             <Limit name="measured-frame-rate-1920x1088" range="88-88" />
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.decoder.hevc" type="video/hevc" update="true">
-            <Limit name="measured-frame-rate-352x288" range="467-480" />
-	    <Limit name="measured-frame-rate-640x360" range="348-352" />
-            <Limit name="measured-frame-rate-720x480" range="280-283" />
+            <Limit name="measured-frame-rate-352x288" range="650-655" />
+            <Limit name="measured-frame-rate-640x360" range="395-398" />
+            <Limit name="measured-frame-rate-720x480" range="300-304" />
             <Limit name="measured-frame-rate-1280x720" range="241-241" />
             <Limit name="measured-frame-rate-1920x1088" range="90-100" />
             <Limit name="measured-frame-rate-3840x2160" range="30-40" />
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.decoder.h263" type="video/3gpp" update="true">
-            <Limit name="measured-frame-rate-176x144" range="596-610" />
-            <Limit name="measured-frame-rate-352x288" range="323-323" />
+            <Limit name="measured-frame-rate-176x144" range="890-898" />
+            <Limit name="measured-frame-rate-352x288" range="840-850" />
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.decoder.mpeg4" type="video/mp4v-es" update="true">
-            <Limit name="measured-frame-rate-176x144" range="547-565" />
-            <Limit name="measured-frame-rate-480x360" range="268-268" />
+            <Limit name="measured-frame-rate-176x144" range="850-875" />
+            <Limit name="measured-frame-rate-480x360" range="766-794" />
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.decoder.vp8" type="video/x-vnd.on2.vp8" update="true">
-            <Limit name="measured-frame-rate-320x180" range="508-518" />
-            <Limit name="measured-frame-rate-640x360" range="303-303" />
-            <Limit name="measured-frame-rate-1280x720" range="335-343" />
+            <Limit name="measured-frame-rate-320x180" range="680-696" />
+            <Limit name="measured-frame-rate-640x360" range="400-415" />
+            <Limit name="measured-frame-rate-1280x720" range="350-358" />
             <Limit name="measured-frame-rate-1920x1080" range="199-199" />
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.decoder.vp9" type="video/x-vnd.on2.vp9" update="true">
-            <Limit name="measured-frame-rate-320x180" range="250-270" />
-            <Limit name="measured-frame-rate-640x360" range="230-250" />
+            <Limit name="measured-frame-rate-320x180" range="500-524" />
+            <Limit name="measured-frame-rate-640x360" range="360-366" />
             <Limit name="measured-frame-rate-1280x720" range="190-210" />
             <Limit name="measured-frame-rate-1920x1080" range="170-190" />
             <Limit name="measured-frame-rate-3840x2160" range="48-48" />
@@ -154,8 +136,8 @@
             <Limit name="measured-frame-rate-1920x1080" range="20-30" />
         </MediaCodec>
         <MediaCodec name="c2.android.avc.decoder" type="video/avc" update="true">
-            <Limit name="measured-frame-rate-320x240" range="158-163" />
-            <Limit name="measured-frame-rate-720x480" range="35-36"/>
+            <Limit name="measured-frame-rate-320x240" range="233-236" />
+            <Limit name="measured-frame-rate-720x480" range="24-48"/>
             <Limit name="measured-frame-rate-1280x720" range="13-19" />
             <Limit name="measured-frame-rate-1920x1080" range="5-10" />
         </MediaCodec>
@@ -167,29 +149,29 @@
             <Limit name="measured-frame-rate-1920x1080" range="45-48" />
         </MediaCodec>
         <MediaCodec name="c2.android.hevc.decoder" type="video/hevc" update="true">
-            <Limit name="measured-frame-rate-352x288" range="192-220" />
-            <Limit name="measured-frame-rate-640x360" range="80-91" />
-            <Limit name="measured-frame-rate-720x480" range="56-64" />
-            <Limit name="measured-frame-rate-1280x720" range="44-44" />
-            <Limit name="measured-frame-rate-1920x1080" range="18-19" />
+            <Limit name="measured-frame-rate-352x288" range="250-258" />
+            <Limit name="measured-frame-rate-640x360" range="110-114" />
+            <Limit name="measured-frame-rate-720x480" range="24-48" />
+            <Limit name="measured-frame-rate-1280x720" range="50-55" />
+            <Limit name="measured-frame-rate-1920x1080" range="8-16" />
         </MediaCodec>
         <MediaCodec name="OMX.google.h263.decoder" type="video/3gpp" update="true">
-            <Limit name="measured-frame-rate-176x144" range="190-210" />
-            <Limit name="measured-frame-rate-352x288" range="170-182" />
+            <Limit name="measured-frame-rate-176x144" range="650-710" />
+            <Limit name="measured-frame-rate-352x288" range="370-481" />
         </MediaCodec>
         <MediaCodec name="c2.android.h263.decoder" type="video/3gpp" update="true">
-             <Limit name="measured-frame-rate-176x144" range="360-722"/>
-             <Limit name="measured-frame-rate-352x288" range="268-432" />
+             <Limit name="measured-frame-rate-176x144" range="650-710"/>
+             <Limit name="measured-frame-rate-352x288" range="370-481" />
         </MediaCodec>
         <MediaCodec name="OMX.google.vp8.decoder" type="video/x-vnd.on2.vp8" update="true">
-            <Limit name="measured-frame-rate-320x240" range="575-580" />
-            <Limit name="measured-frame-rate-640x360" range="200-220" />
+            <Limit name="measured-frame-rate-320x240" range="480-490" />
+            <Limit name="measured-frame-rate-640x360" range="199-201" />
             <Limit name="measured-frame-rate-1280x720" range="45-55" />
             <Limit name="measured-frame-rate-1920x1080" range="18-22" />
         </MediaCodec>
         <MediaCodec name="c2.android.vp8.decoder" type="video/x-vnd.on2.vp8" update="true">
-            <Limit name="measured-frame-rate-320x180" range="268-453" />
-            <Limit name="measured-frame-rate-640x360" range="177-196" />
+            <Limit name="measured-frame-rate-320x180" range="480-490" />
+            <Limit name="measured-frame-rate-640x360" range="199-201" />
             <Limit name="measured-frame-rate-1280x720" range="22-45" />
             <Limit name="measured-frame-rate-1920x1080" range="11-22" />
         </MediaCodec>
@@ -200,10 +182,11 @@
             <Limit name="measured-frame-rate-1920x1080" range="47-52" />
         </MediaCodec>
         <MediaCodec name="c2.android.vp9.decoder" type="video/x-vnd.on2.vp9" update="true">
+            <Limit name="measured-frame-rate-320x180" range="290-294" />
             <Limit name="measured-frame-rate-320x240" range="48-96" />
-            <Limit name="measured-frame-rate-640x360" range="25-50" />
-            <Limit name="measured-frame-rate-1280x720" range="15-30" />
-            <Limit name="measured-frame-rate-1920x1080" range="9-18" />
+            <Limit name="measured-frame-rate-640x360" range="130-134" />
+            <Limit name="measured-frame-rate-1280x720" range="65-70" />
+            <Limit name="measured-frame-rate-1920x1080" range="40-45" />
         </MediaCodec>
         <MediaCodec name="OMX.google.mpeg4.decoder" update="true">
             <Type name="video/mp4v-es">
@@ -212,7 +195,7 @@
          </MediaCodec>
          <MediaCodec name="c2.android.mpeg4.decoder" update="true">
             <Type name="video/mp4v-es">
-                <Limit name="measured-frame-rate-176x144" range="395-961" />
+                <Limit name="measured-frame-rate-176x144" range="700-715" />
             </Type>
          </MediaCodec>
     </Decoders>