s2: update media codecs from caf

Source:
https://source.codeaurora.org/quic/la/platform/vendor/qcom/tellurium_32/tree/media?h=LA.BR.1.3.6-03810-8976.0

Change-Id: Ic19d2b36cd6ef52f721b55830b7c88393a352012

2 files changed, 181 insertions, 130 deletions

diff --git a/configs/media_codecs.xml b/configs/media_codecs.xml
index d875ff4..9b1d657 100644
--- a/configs/media_codecs.xml
+++ b/configs/media_codecs.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-     Copyright (C) 2015 The Linux Foundation. All rights reserved.
+<!-- Copyright (C) 2012 The Android Open Source Project
+     Copyright (C) 2014-2016 The Linux Foundation. All rights reserved.
      Not a contribution.
 
      Licensed under the Apache License, Version 2.0 (the "License");
@@ -81,32 +81,33 @@ Only the three quirks included above are recognized at this point:
 -->
 
 <!--
-  Decoder capabilities for 8952
-_________________________________________________________________
+  Decoder capabilities for 8956
+   __________ _________________________________________ ___________________
   | Codec    | W       H       fps     Mbps    MB/s    | Encode Secure-dec |
   |__________|_________________________________________|___________________|
-  | h264     | 1920    1088    60      50      489600  |  Y       Y        |
-  | hevc     | 1920    1088    60      50      489600  |  N       Y        |
-  | mpeg4    | 1920    1088    60      40      489600  |  Y       N        |
-  | vc1      | 1920    1088    30      45      244800  |  N       Y        |
-  | vp8      | 1920    1088    30      50      244800  |  Y       N        |
-  | divx3    | 1920    1088    30      20      244800  |  N       N        |
-  | div4/5/6 | 1920    1088    30      50      244800  |  N       N        |
-  | h263     | 864     480     30      2       48600   |  Y       N        |
-  | mpeg2    | 1920    1088    30      80      244800  |  N       Y        |
+  | hevc     | 3840    2160    30      100     972000  |  Y       Y        |
+  | h264     | 3840    2160    30      100     972000  |  Y       Y        |
+  | h263     |  864     480    30        2      48600  |  Y       N        |
+  | mpeg4    | 1920    1088    60       60     489600  |  Y       N        |
+  | mpeg2    | 1920    1088    30       40     244800  |  N       Y        |
+  | vc1      | 1920    1088    60       60     489600  |  N       N        |
+  | vp8      | 3840    2160    30      100     972000  |  Y       N        |
+  | divx3    |  720     480    30        2      40500  |  N       N        |
+  | div4/5/6 | 1920    1088    30       10     244800  |  N       N        |
   |__________|_________________________________________|___________________|
 
 -->
 
 <!--
-  Encoder capabilities for 8952
+  Encoder capabilities for 8956
    ____________________________________________________
   | Codec    | W       H       fps     Mbps    MB/s    |
   |__________|_________________________________________|
-  | h264     | 1920    1088    30      20      244800  |
-  | mpeg4    | 1920    1088    30      40      244800  |
-  | h263     | 864      480    30       2       48600  |
-  | vp8      | 1920    1088    30      20      244800  |
+  | hevc     | 3840    2160    30      100     972000  |
+  | h264     | 3840    2160    30      100     972000  |
+  | h263     |  864     480    30        2      48600  |
+  | mpeg4    | 1920    1088    30       40     244800  |
+  | vp8      | 1920    1088    30       40     244800  |
   |____________________________________________________|
 -->
 
@@ -114,31 +115,54 @@ _________________________________________________________________
     <Include href="media_codecs_google_audio.xml" />
     <Include href="media_codecs_google_telephony.xml" />
     <Settings>
-        <Setting name="max-video-encoder-input-buffers" value="9" />
+        <Setting name="max-video-encoder-input-buffers" value="11" />
     </Settings>
     <Encoders>
+        <!-- Audio Hardware  -->
+        <MediaCodec name="OMX.qcom.audio.encoder.evrc" type="audio/evrc" >
+            <Quirk name="requires-allocate-on-input-ports" />
+            <Quirk name="requires-allocate-on-output-ports" />
+        </MediaCodec>
+        <MediaCodec name="OMX.qcom.audio.encoder.qcelp13" type="audio/qcelp" >
+            <Quirk name="requires-allocate-on-input-ports" />
+            <Quirk name="requires-allocate-on-output-ports" />
+        </MediaCodec>
+        <!-- Audio Software  -->
         <!-- Video Hardware  -->
+        <MediaCodec name="OMX.qcom.video.encoder.hevc" type="video/hevc" >
+            <Quirk name="requires-allocate-on-input-ports" />
+            <Quirk name="requires-allocate-on-output-ports" />
+            <Quirk name="requires-loaded-to-idle-after-allocation" />
+            <Limit name="size" min="176x64" max="3840x2160" />
+            <Limit name="alignment" value="2x2" />
+            <Limit name="block-size" value="16x16" />
+            <Limit name="blocks-per-second" min="1" max="972000" />
+            <Limit name="bitrate" range="1-100000000" />
+            <Limit name="concurrent-instances" max="16" />
+            <Feature name="intra-refresh" />
+        </MediaCodec>
         <MediaCodec name="OMX.qcom.video.encoder.avc" type="video/avc" >
             <Quirk name="requires-allocate-on-input-ports" />
             <Quirk name="requires-allocate-on-output-ports" />
             <Quirk name="requires-loaded-to-idle-after-allocation" />
-            <Limit name="size" min="96x64" max="1920x1088" />
+            <Limit name="size" min="96x64" max="3840x2160" />
             <Limit name="alignment" value="2x2" />
             <Limit name="block-size" value="16x16" />
-            <Limit name="blocks-per-second" min="1" max="244800" />
-            <Limit name="bitrate" range="1-20000000" />
-            <Limit name="concurrent-instances" max="8" />
+            <Limit name="blocks-per-second" min="1" max="972000" />
+            <Limit name="bitrate" range="1-100000000" />
+            <Limit name="concurrent-instances" max="16" />
+            <Feature name="intra-refresh" />
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.encoder.mpeg4" type="video/mp4v-es" >
             <Quirk name="requires-allocate-on-input-ports" />
             <Quirk name="requires-allocate-on-output-ports" />
-            <Quirk name="requires-loaded-to-idle-after-allocation"/>
+            <Quirk name="requires-loaded-to-idle-after-allocation" />
             <Limit name="size" min="96x64" max="1920x1088" />
             <Limit name="alignment" value="2x2" />
             <Limit name="block-size" value="16x16" />
             <Limit name="blocks-per-second" min="1" max="244800" />
             <Limit name="bitrate" range="1-40000000" />
-            <Limit name="concurrent-instances" max="8" />
+            <Limit name="concurrent-instances" max="16" />
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.encoder.h263" type="video/3gpp" >
             <Quirk name="requires-allocate-on-input-ports" />
@@ -149,7 +173,7 @@ _________________________________________________________________
             <Limit name="block-size" value="16x16" />
             <Limit name="blocks-per-second" min="1" max="48600" />
             <Limit name="bitrate" range="1-2000000" />
-            <Limit name="concurrent-instances" max="8" />
+            <Limit name="concurrent-instances" max="16" />
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.encoder.vp8" type="video/x-vnd.on2.vp8" >
             <Quirk name="requires-allocate-on-input-ports" />
@@ -159,37 +183,44 @@ _________________________________________________________________
             <Limit name="alignment" value="2x2" />
             <Limit name="block-size" value="16x16" />
             <Limit name="blocks-per-second" min="1" max="244800" />
-            <Limit name="bitrate" range="1-20000000" />
-            <Limit name="concurrent-instances" max="8" />
+            <Limit name="bitrate" range="1-40000000" />
+            <Limit name="concurrent-instances" max="16" />
+            <Feature name="intra-refresh" />
         </MediaCodec>
     </Encoders>
     <Decoders>
         <!-- Audio Hardware  -->
         <!-- Audio Software  -->
+        <MediaCodec name="OMX.qcom.audio.decoder.Qcelp13" type="audio/qcelp" >
+            <Quirk name="requires-global-flush" />
+        </MediaCodec>
+        <MediaCodec name="OMX.qcom.audio.decoder.evrc" type="audio/evrc" >
+            <Quirk name="requires-global-flush" />
+        </MediaCodec>
         <MediaCodec name="OMX.qti.audio.decoder.flac" type="audio/flac" />
         <!-- Video Hardware  -->
         <MediaCodec name="OMX.qcom.video.decoder.avc" type="video/avc" >
             <Quirk name="requires-allocate-on-input-ports" />
             <Quirk name="requires-allocate-on-output-ports" />
-            <Limit name="size" min="64x64" max="1920x1088" />
+            <Limit name="size" min="64x64" max="3840x2160" />
             <Limit name="alignment" value="2x2" />
             <Limit name="block-size" value="16x16" />
-            <Limit name="blocks-per-second" min="1" max="489600" />
-            <Limit name="bitrate" range="1-50000000" />
+            <Limit name="blocks-per-second" min="1" max="972000" />
+            <Limit name="bitrate" range="1-100000000" />
             <Feature name="adaptive-playback" />
-            <Limit name="concurrent-instances" max="8" />
+            <Limit name="concurrent-instances" max="16" />
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.decoder.avc.secure" type="video/avc" >
             <Quirk name="requires-allocate-on-input-ports" />
             <Quirk name="requires-allocate-on-output-ports" />
-            <Limit name="size" min="64x64" max="1920x1088" />
+            <Limit name="size" min="64x64" max="3840x2160" />
             <Limit name="alignment" value="2x2" />
             <Limit name="block-size" value="16x16" />
-            <Limit name="blocks-per-second" min="1" max="489600" />
-            <Limit name="bitrate" range="1-50000000" />
+            <Limit name="blocks-per-second" min="1" max="972000" />
+            <Limit name="bitrate" range="1-100000000" />
             <Feature name="adaptive-playback" />
             <Feature name="secure-playback" required="true" />
-            <Limit name="concurrent-instances" max="4" />
+            <Limit name="concurrent-instances" max="2" />
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.decoder.mpeg2" type="video/mpeg2" >
             <Quirk name="requires-allocate-on-input-ports" />
@@ -198,9 +229,9 @@ _________________________________________________________________
             <Limit name="alignment" value="2x2" />
             <Limit name="block-size" value="16x16" />
             <Limit name="blocks-per-second" min="1" max="244800" />
-            <Limit name="bitrate" range="1-80000000" />
+            <Limit name="bitrate" range="1-40000000" />
             <Feature name="adaptive-playback" />
-            <Limit name="concurrent-instances" max="8" />
+            <Limit name="concurrent-instances" max="16" />
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.decoder.mpeg2.secure" type="video/mpeg2" >
             <Quirk name="requires-allocate-on-input-ports" />
@@ -209,10 +240,10 @@ _________________________________________________________________
             <Limit name="alignment" value="2x2" />
             <Limit name="block-size" value="16x16" />
             <Limit name="blocks-per-second" min="1" max="244800" />
-            <Limit name="bitrate" range="1-80000000" />
+            <Limit name="bitrate" range="1-40000000" />
             <Feature name="adaptive-playback" />
             <Feature name="secure-playback" required="true" />
-            <Limit name="concurrent-instances" max="7" />
+            <Limit name="concurrent-instances" max="9" />
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.decoder.mpeg4" type="video/mp4v-es" >
             <Quirk name="requires-allocate-on-input-ports" />
@@ -221,9 +252,9 @@ _________________________________________________________________
             <Limit name="alignment" value="2x2" />
             <Limit name="block-size" value="16x16" />
             <Limit name="blocks-per-second" min="1" max="489600" />
-            <Limit name="bitrate" range="1-40000000" />
+            <Limit name="bitrate" range="1-60000000" />
             <Feature name="adaptive-playback" />
-            <Limit name="concurrent-instances" max="8" />
+            <Limit name="concurrent-instances" max="16" />
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.decoder.h263" type="video/3gpp" >
             <Quirk name="requires-allocate-on-input-ports" />
@@ -234,18 +265,18 @@ _________________________________________________________________
             <Limit name="blocks-per-second" min="1" max="48600" />
             <Limit name="bitrate" range="1-2000000" />
             <Feature name="adaptive-playback" />
-            <Limit name="concurrent-instances" max="8" />
+            <Limit name="concurrent-instances" max="16" />
         </MediaCodec>
-        <MediaCodec name="OMX.qcom.video.decoder.wmv" type="video/x-ms-wmv" >
+       <!-- <MediaCodec name="OMX.qcom.video.decoder.wmv" type="video/x-ms-wmv" >
             <Quirk name="requires-allocate-on-input-ports" />
             <Quirk name="requires-allocate-on-output-ports" />
             <Limit name="size" min="64x64" max="1920x1088" />
             <Limit name="alignment" value="2x2" />
             <Limit name="block-size" value="16x16" />
-            <Limit name="blocks-per-second" min="1" max="244800" />
-            <Limit name="bitrate" range="1-45000000" />
+            <Limit name="blocks-per-second" min="1" max="489600" />
+            <Limit name="bitrate" range="1-60000000" />
             <Feature name="adaptive-playback" />
-            <Limit name="concurrent-instances" max="8" />
+            <Limit name="concurrent-instances" max="16" />
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.decoder.wmv.secure" type="video/x-ms-wmv" >
             <Quirk name="requires-allocate-on-input-ports" />
@@ -253,22 +284,22 @@ _________________________________________________________________
             <Limit name="size" min="64x64" max="1920x1088" />
             <Limit name="alignment" value="2x2" />
             <Limit name="block-size" value="16x16" />
-            <Limit name="blocks-per-second" min="1" max="244800" />
-            <Limit name="bitrate" range="1-45000000" />
+            <Limit name="blocks-per-second" min="1" max="489600" />
+            <Limit name="bitrate" range="1-60000000" />
             <Feature name="adaptive-playback" />
             <Feature name="secure-playback" required="true" />
             <Limit name="concurrent-instances" max="7" />
-        </MediaCodec>
+        </MediaCodec> -->
         <MediaCodec name="OMX.qcom.video.decoder.vc1" type="video/wvc1" >
             <Quirk name="requires-allocate-on-input-ports" />
             <Quirk name="requires-allocate-on-output-ports" />
             <Limit name="size" min="64x64" max="1920x1088" />
             <Limit name="alignment" value="2x2" />
             <Limit name="block-size" value="16x16" />
-            <Limit name="blocks-per-second" min="1" max="244800" />
-            <Limit name="bitrate" range="1-45000000" />
+            <Limit name="blocks-per-second" min="1" max="489600" />
+            <Limit name="bitrate" range="1-60000000" />
             <Feature name="adaptive-playback" />
-            <Limit name="concurrent-instances" max="8" />
+            <Limit name="concurrent-instances" max="16" />
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.decoder.vc1.secure" type="video/wvc1" >
             <Quirk name="requires-allocate-on-input-ports" />
@@ -276,8 +307,8 @@ _________________________________________________________________
             <Limit name="size" min="64x64" max="1920x1088" />
             <Limit name="alignment" value="2x2" />
             <Limit name="block-size" value="16x16" />
-            <Limit name="blocks-per-second" min="1" max="244800" />
-            <Limit name="bitrate" range="1-45000000" />
+            <Limit name="blocks-per-second" min="1" max="489600" />
+            <Limit name="bitrate" range="1-60000000" />
             <Feature name="adaptive-playback" />
             <Feature name="secure-playback" required="true" />
             <Limit name="concurrent-instances" max="7" />
@@ -288,21 +319,21 @@ _________________________________________________________________
             <Limit name="size" min="64x64" max="1920x1088" />
             <Limit name="alignment" value="2x2" />
             <Limit name="block-size" value="16x16" />
-            <Limit name="blocks-per-second" min="1" max="244800" />s
-            <Limit name="bitrate" range="1-20000000" />
+            <Limit name="blocks-per-second" min="1" max="244800" />
+            <Limit name="bitrate" range="1-10000000" />
             <Feature name="adaptive-playback" />
-            <Limit name="concurrent-instances" max="8" />
+            <Limit name="concurrent-instances" max="16" />
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.decoder.divx311" type="video/divx311" >
             <Quirk name="requires-allocate-on-input-ports" />
             <Quirk name="requires-allocate-on-output-ports" />
-            <Limit name="size" min="64x64" max="1920x1088" />
+            <Limit name="size" min="64x64" max="720x480" />
             <Limit name="alignment" value="2x2" />
             <Limit name="block-size" value="16x16" />
-            <Limit name="blocks-per-second" min="1" max="244800" />
+            <Limit name="blocks-per-second" min="1" max="40500" />
             <Limit name="bitrate" range="1-2000000" />
             <Feature name="adaptive-playback" />
-            <Limit name="concurrent-instances" max="8" />
+            <Limit name="concurrent-instances" max="16" />
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.decoder.divx4" type="video/divx4" >
             <Quirk name="requires-allocate-on-input-ports" />
@@ -311,31 +342,43 @@ _________________________________________________________________
             <Limit name="alignment" value="2x2" />
             <Limit name="block-size" value="16x16" />
             <Limit name="blocks-per-second" min="1" max="244800" />
-            <Limit name="bitrate" range="1-20000000" />
+            <Limit name="bitrate" range="1-10000000" />
             <Feature name="adaptive-playback" />
-            <Limit name="concurrent-instances" max="8" />
+            <Limit name="concurrent-instances" max="16" />
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.decoder.vp8" type="video/x-vnd.on2.vp8" >
             <Quirk name="requires-allocate-on-input-ports" />
             <Quirk name="requires-allocate-on-output-ports" />
-            <Limit name="size" min="64x64" max="1920x1088" />
+            <Limit name="size" min="64x64" max="3840x2160" />
             <Limit name="alignment" value="2x2" />
             <Limit name="block-size" value="16x16" />
-            <Limit name="blocks-per-second" min="1" max="244800" />
-            <Limit name="bitrate" range="1-50000000" />
+            <Limit name="blocks-per-second" min="1" max="972000" />
+            <Limit name="bitrate" range="1-100000000" />
             <Feature name="adaptive-playback" />
-            <Limit name="concurrent-instances" max="8" />
+            <Limit name="concurrent-instances" max="16" />
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.decoder.hevc" type="video/hevc" >
             <Quirk name="requires-allocate-on-input-ports" />
             <Quirk name="requires-allocate-on-output-ports" />
-            <Limit name="size" min="64x64" max="1920x1088" />
+            <Limit name="size" min="64x64" max="3840x2160" />
             <Limit name="alignment" value="2x2" />
             <Limit name="block-size" value="16x16" />
-            <Limit name="blocks-per-second" min="1" max="489600" />
-            <Limit name="bitrate" range="1-50000000" />
+            <Limit name="blocks-per-second" min="1" max="972000" />
+            <Limit name="bitrate" range="1-100000000" />
+            <Feature name="adaptive-playback" />
+            <Limit name="concurrent-instances" max="16" />
+        </MediaCodec>
+        <MediaCodec name="OMX.qcom.video.decoder.hevc.secure" type="video/hevc" >
+            <Quirk name="requires-allocate-on-input-ports" />
+            <Quirk name="requires-allocate-on-output-ports" />
+            <Limit name="size" min="64x64" max="3840x2160" />
+            <Limit name="alignment" value="2x2" />
+            <Limit name="block-size" value="16x16" />
+            <Limit name="blocks-per-second" min="1" max="972000" />
+            <Limit name="bitrate" range="1-100000000" />
             <Feature name="adaptive-playback" />
-            <Limit name="concurrent-instances" max="8" />
+            <Feature name="secure-playback" required="true" />
+            <Limit name="concurrent-instances" max="2" />
         </MediaCodec>
     </Decoders>
     <Include href="media_codecs_google_video.xml" />
diff --git a/configs/media_codecs_performance.xml b/configs/media_codecs_performance.xml
index a47c787..8b3a4fc 100644
--- a/configs/media_codecs_performance.xml
+++ b/configs/media_codecs_performance.xml
@@ -21,89 +21,96 @@
 <MediaCodecs>
     <Encoders>
         <MediaCodec name="OMX.qcom.video.encoder.avc" type="video/avc" update="true">
-            <Limit name="measured-frame-rate-320x240" range="517-517" />
-            <Limit name="measured-frame-rate-720x480" range="135-135" />
-            <Limit name="measured-frame-rate-1280x720" range="90-90" />
-            <Limit name="measured-frame-rate-1920x1080" range="40-40" />
+            <Limit name="measured-frame-rate-320x240" range="164-164" />
+            <Limit name="measured-frame-rate-720x480" range="81-81" />
+            <Limit name="measured-frame-rate-1280x720" range="31-31" />
+            <Limit name="measured-frame-rate-1920x1080" range="20-20" />
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.encoder.h263" type="video/3gpp" update="true">
-            <Limit name="measured-frame-rate-176x144" range="637-637" />
-            <Limit name="measured-frame-rate-352x288" range="369-369" />
+            <Limit name="measured-frame-rate-176x144" range="293-293" />
+            <Limit name="measured-frame-rate-352x288" range="170-170" />
+        </MediaCodec>
+        <MediaCodec name="OMX.qcom.video.encoder.hevc" type="video/hevc" update="true">
+            <Limit name="measured-frame-rate-320x240" range="165-165" />
+            <Limit name="measured-frame-rate-720x480" range="80-80" />
+            <Limit name="measured-frame-rate-1280x720" range="34-34" />
+            <Limit name="measured-frame-rate-1920x1080" range="31-31" />
+            <Limit name="measured-frame-rate-3840x2160" range="23-23" />
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.encoder.mpeg4" type="video/mp4v-es" update="true">
-            <Limit name="measured-frame-rate-176x144" range="628-628" />
-            <Limit name="measured-frame-rate-352x288" range="339-339" />
-            <Limit name="measured-frame-rate-640x480" range="199-199" />
+            <Limit name="measured-frame-rate-176x144" range="351-351" />
+            <Limit name="measured-frame-rate-352x288" range="263-263" />
+            <Limit name="measured-frame-rate-640x480" range="144-144" />
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.encoder.vp8" type="video/x-vnd.on2.vp8" update="true">
-            <Limit name="measured-frame-rate-320x180" range="180-180" />
-            <Limit name="measured-frame-rate-640x360" range="166-166" />
-            <Limit name="measured-frame-rate-1280x720" range="70-70" />
-            <Limit name="measured-frame-rate-1920x1080" range="35-35" />
+            <Limit name="measured-frame-rate-320x180" range="312-312" />
+            <Limit name="measured-frame-rate-640x360" range="175-174" />
+            <Limit name="measured-frame-rate-1280x720" range="29-29" />
+            <Limit name="measured-frame-rate-1920x1080" range="25-25" />
         </MediaCodec>
         <MediaCodec name="OMX.google.h264.encoder" type="video/avc" update="true">
-            <Limit name="measured-frame-rate-320x240" range="271-271" />
-            <Limit name="measured-frame-rate-720x480" range="115-115" />
-            <Limit name="measured-frame-rate-1280x720" range="52-52" />
-            <Limit name="measured-frame-rate-1920x1080" range="30-30" />
+            <Limit name="measured-frame-rate-320x240" range="185-185" />
+            <Limit name="measured-frame-rate-720x480" range="87-87" />
+            <Limit name="measured-frame-rate-1280x720" range="45-45" />
+            <Limit name="measured-frame-rate-1920x1080" range="28-28" />
         </MediaCodec>
         <MediaCodec name="OMX.google.h263.encoder" type="video/3gpp" update="true">
-            <Limit name="measured-frame-rate-176x144" range="532-532" />
+            <Limit name="measured-frame-rate-176x144" range="354-354" />
         </MediaCodec>
         <MediaCodec name="OMX.google.mpeg4.encoder" type="video/mp4v-es" update="true">
-            <Limit name="measured-frame-rate-176x144" range="517-517" />
+            <Limit name="measured-frame-rate-176x144" range="385-385" />
         </MediaCodec>
         <MediaCodec name="OMX.google.vp8.encoder" type="video/x-vnd.on2.vp8" update="true">
-            <Limit name="measured-frame-rate-320x180" range="85-85" />
-            <Limit name="measured-frame-rate-640x360" range="36-36" />
-            <Limit name="measured-frame-rate-1280x720" range="26-26" />
-            <Limit name="measured-frame-rate-1920x1080" range="13-13" />
+            <Limit name="measured-frame-rate-320x180" range="95-95" />
+            <Limit name="measured-frame-rate-640x360" range="37-37" />
+            <Limit name="measured-frame-rate-1280x720" range="32-32" />
+            <Limit name="measured-frame-rate-1920x1080" range="16-16" />
         </MediaCodec>
     </Encoders>
     <Decoders>
         <MediaCodec name="OMX.qcom.video.decoder.avc" type="video/avc" update="true">
-            <Limit name="measured-frame-rate-320x240" range="537-537" />
-            <Limit name="measured-frame-rate-720x480" range="290-290" />
-            <Limit name="measured-frame-rate-1280x720" range="147-147" />
-            <Limit name="measured-frame-rate-1920x1088" range="72-72" />
+            <Limit name="measured-frame-rate-320x240" range="409-409" />
+            <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="151-151" />
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.decoder.hevc" type="video/hevc" update="true">
-            <Limit name="measured-frame-rate-352x288" range="692-692" />
-            <Limit name="measured-frame-rate-640x360" range="273-273" />
-            <Limit name="measured-frame-rate-720x480" range="507-507" />
-            <Limit name="measured-frame-rate-1280x720" range="231-231" />
-            <Limit name="measured-frame-rate-1920x1088" range="97-97" />
+            <Limit name="measured-frame-rate-352x288" range="434-434" />
+            <Limit name="measured-frame-rate-720x480" range="338-338" />
+            <Limit name="measured-frame-rate-1280x720" range="320-320" />
+            <Limit name="measured-frame-rate-1920x1088" range="181-181" />
+            <Limit name="measured-frame-rate-3840x2160" range="44-44" />
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.decoder.h263" type="video/3gpp" update="true">
-            <Limit name="measured-frame-rate-176x144" range="415-415" />
-            <Limit name="measured-frame-rate-352x288" range="884-884" />
+            <Limit name="measured-frame-rate-176x144" range="283-283" />
+            <Limit name="measured-frame-rate-352x288" range="323-323" />
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.decoder.mpeg4" type="video/mp4v-es" update="true">
-            <Limit name="measured-frame-rate-176x144" range="580-580" />
-            <Limit name="measured-frame-rate-480x360" range="724-724" />
+            <Limit name="measured-frame-rate-176x144" range="410-410" />
+            <Limit name="measured-frame-rate-480x360" range="268-268" />
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.decoder.vp8" type="video/x-vnd.on2.vp8" update="true">
-            <Limit name="measured-frame-rate-320x240" range="449-449" />
-            <Limit name="measured-frame-rate-640x360" range="409-409" />
-            <Limit name="measured-frame-rate-1280x720" range="131-131" />
-            <Limit name="measured-frame-rate-1920x1080" range="63-63" />
+            <Limit name="measured-frame-rate-320x240" range="430-430" />
+            <Limit name="measured-frame-rate-640x360" range="303-303" />
+            <Limit name="measured-frame-rate-1280x720" range="389-389" />
+            <Limit name="measured-frame-rate-1920x1080" range="199-199" />
         </MediaCodec>
         <MediaCodec name="OMX.google.h264.decoder" type="video/avc" update="true">
-            <Limit name="measured-frame-rate-320x240" range="255-255" />
-            <Limit name="measured-frame-rate-720x480" range="95-95" />
-            <Limit name="measured-frame-rate-1280x720" range="38-38" />
-            <Limit name="measured-frame-rate-1920x1080" range="27-27" />
+            <Limit name="measured-frame-rate-320x240" range="536-536" />
+            <Limit name="measured-frame-rate-720x480" range="108-108" />
+            <Limit name="measured-frame-rate-1280x720" range="44-44" />
+            <Limit name="measured-frame-rate-1920x1080" range="13-13" />
         </MediaCodec>
         <MediaCodec name="OMX.google.hevc.decoder" type="video/hevc" update="true">
-            <Limit name="measured-frame-rate-352x288" range="210-210" />
-            <Limit name="measured-frame-rate-640x360" range="169-169" />
-            <Limit name="measured-frame-rate-720x480" range="119-119" />
-            <Limit name="measured-frame-rate-1280x720" range="61-61" />
-            <Limit name="measured-frame-rate-1920x1080" range="78-78" />
+            <Limit name="measured-frame-rate-352x288" range="194-194" />
+            <Limit name="measured-frame-rate-640x360" range="150-150" />
+            <Limit name="measured-frame-rate-720x480" range="93-93" />
+            <Limit name="measured-frame-rate-1280x720" range="47-47" />
+            <Limit name="measured-frame-rate-1920x1080" range="46-46" />
         </MediaCodec>
         <MediaCodec name="OMX.google.h263.decoder" type="video/3gpp" update="true">
-            <Limit name="measured-frame-rate-176x144" range="285-285" />
-            <Limit name="measured-frame-rate-352x288" range="151-151" />
+            <Limit name="measured-frame-rate-176x144" range="213-213" />
+            <Limit name="measured-frame-rate-352x288" range="177-177" />
         </MediaCodec>
         <MediaCodec name="OMX.google.mpeg4.decoder" update="true">
             <Type name="video/mp4v-es">
@@ -111,16 +118,17 @@
             </Type>
         </MediaCodec>
         <MediaCodec name="OMX.google.vp8.decoder" type="video/x-vnd.on2.vp8" update="true">
-            <Limit name="measured-frame-rate-320x180" range="510-510" />
-            <Limit name="measured-frame-rate-640x360" range="143-143" />
-            <Limit name="measured-frame-rate-1280x720" range="62-62" />
-            <Limit name="measured-frame-rate-1920x1080" range="14-14" />
+            <Limit name="measured-frame-rate-320x240" range="361-361" />
+            <Limit name="measured-frame-rate-640x360" range="280-280" />
+            <Limit name="measured-frame-rate-1280x720" range="40-40" />
+            <Limit name="measured-frame-rate-1920x1080" range="25-25" />
         </MediaCodec>
         <MediaCodec name="OMX.google.vp9.decoder" type="video/x-vnd.on2.vp9" update="true">
-            <Limit name="measured-frame-rate-320x240" range="510-510" />
-            <Limit name="measured-frame-rate-640x360" range="139-139" />
-            <Limit name="measured-frame-rate-1280x720" range="54-54" />
-            <Limit name="measured-frame-rate-1920x1080" range="71-71" />
+            <Limit name="measured-frame-rate-320x180" range="320-320" />
+            <Limit name="measured-frame-rate-320x240" range="604-604" />
+            <Limit name="measured-frame-rate-640x360" range="182-182" />
+            <Limit name="measured-frame-rate-1280x720" range="58-58" />
+            <Limit name="measured-frame-rate-1920x1080" range="38-38" />
         </MediaCodec>
     </Decoders>
 </MediaCodecs>