msm8916-common: Update media_codecs to latest CAF LA.BR.1.2.9_rb1.12

* Advertise encoder intra-refresh support
* Align files with original files from CAF
* Cleanup spacing while we are at it

Change-Id: Ie3533cee9a704b784228bdc3c6b0d0bb7ed5d87b

2 files changed, 25 insertions, 21 deletions

diff --git a/configs/media_codecs_msm8916.xml b/configs/media_codecs_msm8916.xml
index 87fb82f..393b9b0 100644
--- a/configs/media_codecs_msm8916.xml
+++ b/configs/media_codecs_msm8916.xml
@@ -82,7 +82,7 @@ Only the three quirks included above are recognized at this point:
 
 <!--
   Decoder capabilities for 8916
-_________________________________________________________________
+   ________________________________________________________________________
   | Codec    | W       H       fps     Mbps    MB/s    | Encode Secure-dec |
   |__________|_________________________________________|___________________|
   | h264     | 1920    1088    30      20      244800  |  Y       Y        |
@@ -99,7 +99,7 @@ _________________________________________________________________
 
 <!--
   Encoder capabilities for 8916
-___________________________________________________
+   ____________________________________________________
   | Codec    | W       H       fps     Mbps    MB/s    |
   |__________|_________________________________________|
   | h264     | 1920    1088    30      20      244800  |
@@ -108,6 +108,7 @@ ___________________________________________________
   | vp8      | 1920    1088    30      20      244800  |
   |____________________________________________________|
 -->
+
 <MediaCodecs>
     <Include href="media_codecs_google_audio.xml" />
     <Include href="media_codecs_google_telephony.xml" />
@@ -126,6 +127,7 @@ ___________________________________________________
             <Limit name="blocks-per-second" min="1" max="244800" />
             <Limit name="bitrate" range="1-20000000" />
             <Limit name="concurrent-instances" max="8" />
+            <Feature name="intra-refresh" />
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.encoder.mpeg4" type="video/mp4v-es" >
             <Quirk name="requires-allocate-on-input-ports" />
@@ -159,6 +161,7 @@ ___________________________________________________
             <Limit name="blocks-per-second" min="1" max="244800" />
             <Limit name="bitrate" range="1-20000000" />
             <Limit name="concurrent-instances" max="8" />
+            <Feature name="intra-refresh" />
         </MediaCodec>
     </Encoders>
     <Decoders>
diff --git a/configs/media_codecs_msm8939.xml b/configs/media_codecs_msm8939.xml
index 669d010..2f4824b 100644
--- a/configs/media_codecs_msm8939.xml
+++ b/configs/media_codecs_msm8939.xml
@@ -82,7 +82,7 @@ Only the three quirks included above are recognized at this point:
 
 <!--
   Decoder capabilities for 8939
-_________________________________________________________________
+   ________________________________________________________________________
   | Codec    | W       H       fps     Mbps    MB/s    | Encode Secure-dec |
   |__________|_________________________________________|___________________|
   | h264     | 1920    1088    60      50      489600  |  Y       Y        |
@@ -95,7 +95,6 @@ _________________________________________________________________
   | h263     | 864     480     30      2       48600   |  Y       N        |
   | mpeg2    | 1920    1088    30      80      244800  |  N       Y        |
   |__________|_________________________________________|___________________|
-
 -->
 
 <!--
@@ -128,6 +127,7 @@ _________________________________________________________________
             <Limit name="blocks-per-second" min="1" max="244800" />
             <Limit name="bitrate" range="1-20000000" />
             <Limit name="concurrent-instances" max="8" />
+            <Feature name="intra-refresh" />
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.encoder.mpeg4" type="video/mp4v-es" >
             <Quirk name="requires-allocate-on-input-ports" />
@@ -161,6 +161,7 @@ _________________________________________________________________
             <Limit name="blocks-per-second" min="1" max="244800" />
             <Limit name="bitrate" range="1-20000000" />
             <Limit name="concurrent-instances" max="8" />
+            <Feature name="intra-refresh" />
         </MediaCodec>
     </Encoders>
     <Decoders>
@@ -177,8 +178,8 @@ _________________________________________________________________
             <Limit name="block-size" value="16x16" />
             <Limit name="blocks-per-second" min="1" max="489600" />
             <Limit name="bitrate" range="1-50000000" />
-            <Limit name="concurrent-instances" max="8" />
             <Feature name="adaptive-playback" />
+            <Limit name="concurrent-instances" max="8" />
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.decoder.avc.secure" type="video/avc" >
             <Quirk name="requires-allocate-on-input-ports" />
@@ -188,9 +189,9 @@ _________________________________________________________________
             <Limit name="block-size" value="16x16" />
             <Limit name="blocks-per-second" min="1" max="489600" />
             <Limit name="bitrate" range="1-50000000" />
-            <Limit name="concurrent-instances" max="4" />
             <Feature name="adaptive-playback" />
             <Feature name="secure-playback" required="true" />
+            <Limit name="concurrent-instances" max="3" />
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.decoder.mpeg2" type="video/mpeg2" >
             <Quirk name="requires-allocate-on-input-ports" />
@@ -200,8 +201,8 @@ _________________________________________________________________
             <Limit name="block-size" value="16x16" />
             <Limit name="blocks-per-second" min="1" max="244800" />
             <Limit name="bitrate" range="1-80000000" />
-            <Limit name="concurrent-instances" max="8" />
             <Feature name="adaptive-playback" />
+            <Limit name="concurrent-instances" max="8" />
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.decoder.mpeg2.secure" type="video/mpeg2" >
             <Quirk name="requires-allocate-on-input-ports" />
@@ -211,9 +212,9 @@ _________________________________________________________________
             <Limit name="block-size" value="16x16" />
             <Limit name="blocks-per-second" min="1" max="244800" />
             <Limit name="bitrate" range="1-80000000" />
-            <Limit name="concurrent-instances" max="7" />
             <Feature name="adaptive-playback" />
             <Feature name="secure-playback" required="true" />
+            <Limit name="concurrent-instances" max="6" />
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.decoder.mpeg4" type="video/mp4v-es" >
             <Quirk name="requires-allocate-on-input-ports" />
@@ -223,19 +224,19 @@ _________________________________________________________________
             <Limit name="block-size" value="16x16" />
             <Limit name="blocks-per-second" min="1" max="489600" />
             <Limit name="bitrate" range="1-40000000" />
-            <Limit name="concurrent-instances" max="8" />
             <Feature name="adaptive-playback" />
+            <Limit name="concurrent-instances" max="8" />
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.decoder.h263" type="video/3gpp" >
             <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="864x480" />
             <Limit name="alignment" value="2x2" />
             <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" />
             <Feature name="adaptive-playback" />
+            <Limit name="concurrent-instances" max="8" />
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.decoder.vc1" type="video/x-ms-wmv" >
             <Quirk name="requires-allocate-on-input-ports" />
@@ -245,8 +246,8 @@ _________________________________________________________________
             <Limit name="block-size" value="16x16" />
             <Limit name="blocks-per-second" min="1" max="244800" />
             <Limit name="bitrate" range="1-45000000" />
-            <Limit name="concurrent-instances" max="8" />
             <Feature name="adaptive-playback" />
+            <Limit name="concurrent-instances" max="8" />
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.decoder.vc1.secure" type="video/x-ms-wmv" >
             <Quirk name="requires-allocate-on-input-ports" />
@@ -256,9 +257,9 @@ _________________________________________________________________
             <Limit name="block-size" value="16x16" />
             <Limit name="blocks-per-second" min="1" max="244800" />
             <Limit name="bitrate" range="1-45   000000" />
-            <Limit name="concurrent-instances" max="8" />
             <Feature name="adaptive-playback" />
             <Feature name="secure-playback" required="true" />
+            <Limit name="concurrent-instances" max="6" />
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.decoder.divx" type="video/divx" >
             <Quirk name="requires-allocate-on-input-ports" />
@@ -268,19 +269,19 @@ _________________________________________________________________
             <Limit name="block-size" value="16x16" />
             <Limit name="blocks-per-second" min="1" max="244800" />
             <Limit name="bitrate" range="1-50000000" />
-            <Limit name="concurrent-instances" max="8" />
             <Feature name="adaptive-playback" />
+            <Limit name="concurrent-instances" max="8" />
         </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="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-20000000" />
-            <Limit name="concurrent-instances" max="8" />
             <Feature name="adaptive-playback" />
+            <Limit name="concurrent-instances" max="8" />
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.decoder.divx4" type="video/divx4" >
             <Quirk name="requires-allocate-on-input-ports" />
@@ -290,8 +291,8 @@ _________________________________________________________________
             <Limit name="block-size" value="16x16" />
             <Limit name="blocks-per-second" min="1" max="244800" />
             <Limit name="bitrate" range="1-50000000" />
-            <Limit name="concurrent-instances" max="8" />
             <Feature name="adaptive-playback" />
+            <Limit name="concurrent-instances" max="8" />
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.decoder.vp8" type="video/x-vnd.on2.vp8" >
             <Quirk name="requires-allocate-on-input-ports" />
@@ -301,19 +302,19 @@ _________________________________________________________________
             <Limit name="block-size" value="16x16" />
             <Limit name="blocks-per-second" min="1" max="244800" />
             <Limit name="bitrate" range="1-50000000" />
-            <Limit name="concurrent-instances" max="8" />
             <Feature name="adaptive-playback" />
+            <Limit name="concurrent-instances" max="8" />
         </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="1920X1080" />
-            <Limit name="alignment" value="16x16" />
+            <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="489600" />
             <Limit name="bitrate" range="1-50000000" />
-            <Limit name="concurrent-instances" max="8" />
             <Feature name="adaptive-playback" />
+            <Limit name="concurrent-instances" max="8" />
         </MediaCodec>
     </Decoders>
     <Include href="media_codecs_google_video.xml" />