Merge "media: msmnile: Fix VTS issue." into video-userspace.lnx.4.2.r3-rel

2 files changed, 64 insertions, 64 deletions

diff --git a/conf_files/msmnile/media_codecs.xml b/conf_files/msmnile/media_codecs.xml
index 1b98290f..7b459bb0 100644
--- a/conf_files/msmnile/media_codecs.xml
+++ b/conf_files/msmnile/media_codecs.xml
@@ -181,12 +181,12 @@ Only the three quirks included above are recognized at this point:
             <Limit name="bitrate" range="1-160000000" />
             <Limit name="frame-rate" range="1-480" />
             <Limit name="concurrent-instances" max="16" />
-            <Feature name="can-swap-width-height" required="true" />
             <Limit name="performance-point-4096x2304" value="56" />
             <Limit name="performance-point-4096x2160" value="60" />
             <Limit name="performance-point-3840x2160" value="60" />
             <Limit name="performance-point-1920x1080" value="240" />
             <Limit name="performance-point-1280x720" value="480" />
+            <Feature name="can-swap-width-height" required="true" />
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.encoder.vp8" type="video/x-vnd.on2.vp8" >
             <Quirk name="requires-allocate-on-input-ports" />
@@ -199,12 +199,12 @@ Only the three quirks included above are recognized at this point:
             <Limit name="bitrate" range="1-40000000" />
             <Limit name="frame-rate" range="1-240" />
             <Limit name="concurrent-instances" max="16" />
-            <Feature name="can-swap-width-height" required="true" />
             <Limit name="performance-point-4096x2304" value="24" />
             <Limit name="performance-point-4096x2160" value="30" />
             <Limit name="performance-point-3840x2160" value="30" />
             <Limit name="performance-point-1920x1080" value="120" />
             <Limit name="performance-point-1280x720" value="240" />
+            <Feature name="can-swap-width-height" required="true" />
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.encoder.hevc" type="video/hevc" >
             <Quirk name="requires-allocate-on-input-ports" />
@@ -217,7 +217,6 @@ Only the three quirks included above are recognized at this point:
             <Limit name="bitrate" range="1-160000000" />
             <Limit name="frame-rate" range="1-480" />
             <Limit name="concurrent-instances" max="16" />
-            <Feature name="can-swap-width-height" required="true" />
             <Limit name="quality" range="0-100" default="80" />
             <Limit name="performance-point-4096x2304" value="56" />
             <Limit name="performance-point-4096x2160" value="60" />
@@ -225,6 +224,7 @@ Only the three quirks included above are recognized at this point:
             <Limit name="performance-point-1920x1080" value="240" />
             <Limit name="performance-point-1280x720" value="480" />
             <Feature name="bitrate-modes" value="VBR,CBR" />
+            <Feature name="can-swap-width-height" required="true" />
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.encoder.hevc.cq" type="video/hevc" >
             <Quirk name="requires-allocate-on-input-ports" />
@@ -249,8 +249,8 @@ Only the three quirks included above are recognized at this point:
             <Limit name="bitrate" range="1-2000000" />
             <Limit name="frame-rate" range="1-30" />
             <Limit name="concurrent-instances" max="16" />
-            <Feature name="can-swap-width-height" required="true" />
             <Limit name="performance-point-720x480" value="30" />
+            <Feature name="can-swap-width-height" required="true" />
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.encoder.mpeg4sw" type="video/mp4v-es" >
              <Quirk name="requires-allocate-on-input-ports" />
@@ -262,10 +262,10 @@ Only the three quirks included above are recognized at this point:
              <Limit name="blocks-per-second" min="36" max="108000" />
              <Limit name="bitrate" range="1-4000000" />
              <Limit name="frame-rate" range="1-30" />
-             <Attribute name="software-codec" />
              <Limit name="concurrent-instances" max="16" />
-             <Feature name="can-swap-width-height" required="true" />
              <Limit name="performance-point-1280x720" value="30" />
+             <Feature name="can-swap-width-height" required="true" />
+             <Attribute name="software-codec" />
         </MediaCodec>
     </Encoders>
     <Decoders>
@@ -279,8 +279,6 @@ Only the three quirks included above are recognized at this point:
             <Limit name="blocks-per-second" min="36" max="3916800" />
             <Limit name="bitrate" range="1-220000000" />
             <Limit name="frame-rate" range="1-480" />
-            <Feature name="adaptive-playback" />
-            <Feature name="can-swap-width-height" required="true" />
             <Limit name="concurrent-instances" max="16" />
             <Limit name="performance-point-4096x2304" value="60" />
             <Limit name="performance-point-4096x2160" value="96" />
@@ -288,6 +286,8 @@ Only the three quirks included above are recognized at this point:
             <Limit name="performance-point-1920x1088" range="480" />
             <Limit name="performance-point-1920x1088" range="240" />
             <Limit name="performance-point-1280x720" value="480" />
+            <Feature name="adaptive-playback" />
+            <Feature name="can-swap-width-height" required="true" />
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.decoder.avc.secure" type="video/avc" >
             <Quirk name="requires-allocate-on-input-ports" />
@@ -298,13 +298,13 @@ Only the three quirks included above are recognized at this point:
             <Limit name="blocks-per-second" min="36" max="2073600" />
             <Limit name="bitrate" range="1-40000000" />
             <Limit name="frame-rate" range="1-60" />
-            <Feature name="adaptive-playback" />
-            <Feature name="can-swap-width-height" required="true" />
-            <Feature name="secure-playback" required="true" />
             <Limit name="concurrent-instances" max="3" />
             <Limit name="performance-point-4096x2304" value="30" />
             <Limit name="performance-point-4096x2160" value="60" />
             <Limit name="performance-point-3840x2160" value="60" />
+            <Feature name="adaptive-playback" />
+            <Feature name="can-swap-width-height" required="true" />
+            <Feature name="secure-playback" required="true" />
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.decoder.mpeg2" type="video/mpeg2" >
             <Quirk name="requires-allocate-on-input-ports" />
@@ -315,11 +315,11 @@ Only the three quirks included above are recognized at this point:
             <Limit name="blocks-per-second" min="36" max="244800" />
             <Limit name="bitrate" range="1-40000000" />
             <Limit name="frame-rate" range="1-30" />
-            <Feature name="adaptive-playback" />
-            <Feature name="can-swap-width-height" required="true" />
             <Limit name="concurrent-instances" max="16" />
             <Limit name="performance-point-1920x1080" value="30" />
-        </MediaCodec>
+            <Feature name="adaptive-playback" />
+            <Feature name="can-swap-width-height" required="true" />
+         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.decoder.mpeg2.secure" type="video/mpeg2" >
             <Quirk name="requires-allocate-on-input-ports" />
             <Quirk name="requires-allocate-on-output-ports" />
@@ -329,11 +329,11 @@ Only the three quirks included above are recognized at this point:
             <Limit name="blocks-per-second" min="36" max="244800" />
             <Limit name="bitrate" range="1-40000000" />
             <Limit name="frame-rate" range="1-30" />
+            <Limit name="concurrent-instances" max="3" />
+            <Limit name="performance-point-1920x1080" value="30" />
             <Feature name="adaptive-playback" />
             <Feature name="can-swap-width-height" required="true" />
             <Feature name="secure-playback" required="true" />
-            <Limit name="concurrent-instances" max="3" />
-            <Limit name="performance-point-1920x1080" value="30" />
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.decoder.vp8" type="video/x-vnd.on2.vp8" >
             <Quirk name="requires-allocate-on-input-ports" />
@@ -344,14 +344,14 @@ Only the three quirks included above are recognized at this point:
             <Limit name="blocks-per-second" min="36" max="1036800" />
             <Limit name="bitrate" range="1-100000000" />
             <Limit name="frame-rate" range="1-240" />
-            <Feature name="adaptive-playback" />
-            <Feature name="can-swap-width-height" required="true" />
             <Limit name="concurrent-instances" max="16" />
             <Limit name="performance-point-4096x2304" value="24" />
             <Limit name="performance-point-4096x2160" value="30" />
             <Limit name="performance-point-3840x2160" value="30" />
             <Limit name="performance-point-1920x1080" value="120" />
             <Limit name="performance-point-1280x720" value="240" />
+            <Feature name="adaptive-playback" />
+            <Feature name="can-swap-width-height" required="true" />
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.decoder.vp9" type="video/x-vnd.on2.vp9" >
             <Quirk name="requires-allocate-on-input-ports" />
@@ -362,8 +362,6 @@ Only the three quirks included above are recognized at this point:
             <Limit name="blocks-per-second" min="36" max="3916800" />
             <Limit name="bitrate" range="1-220000000" />
             <Limit name="frame-rate" range="1-480" />
-            <Feature name="adaptive-playback" />
-            <Feature name="can-swap-width-height" required="true" />
             <Limit name="concurrent-instances" max="6" />
             <Limit name="performance-point-4096x2304" value="60" />
             <Limit name="performance-point-4096x2160" value="96" />
@@ -371,6 +369,8 @@ Only the three quirks included above are recognized at this point:
             <Limit name="performance-point-1920x1088" range="480" />
             <Limit name="performance-point-1920x1088" range="240" />
             <Limit name="performance-point-1280x720" value="480" />
+            <Feature name="adaptive-playback" />
+            <Feature name="can-swap-width-height" required="true" />
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.decoder.vp9.secure" type="video/x-vnd.on2.vp9" >
             <Quirk name="requires-allocate-on-input-ports" />
@@ -381,13 +381,13 @@ Only the three quirks included above are recognized at this point:
             <Limit name="blocks-per-second" min="36" max="2073600" />
             <Limit name="bitrate" range="1-40000000" />
             <Limit name="frame-rate" range="1-60" />
-            <Feature name="adaptive-playback" />
-            <Feature name="can-swap-width-height" required="true" />
-            <Feature name="secure-playback" required="true" />
             <Limit name="concurrent-instances" max="3" />
             <Limit name="performance-point-4096x2304" value="30" />
             <Limit name="performance-point-4096x2160" value="60" />
             <Limit name="performance-point-3840x2160" value="60" />
+            <Feature name="adaptive-playback" />
+            <Feature name="can-swap-width-height" required="true" />
+            <Feature name="secure-playback" required="true" />
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.decoder.hevc" type="video/hevc" >
             <Quirk name="requires-allocate-on-input-ports" />
@@ -398,8 +398,6 @@ Only the three quirks included above are recognized at this point:
             <Limit name="blocks-per-second" min="36" max="3916800" />
             <Limit name="bitrate" range="1-220000000" />
             <Limit name="frame-rate" range="1-480" />
-            <Feature name="adaptive-playback" />
-            <Feature name="can-swap-width-height" required="true" />
             <Limit name="concurrent-instances" max="16" />
             <Limit name="performance-point-4096x2304" value="60" />
             <Limit name="performance-point-4096x2160" value="96" />
@@ -407,6 +405,8 @@ Only the three quirks included above are recognized at this point:
             <Limit name="performance-point-1920x1088" range="480" />
             <Limit name="performance-point-1920x1088" range="240" />
             <Limit name="performance-point-1280x720" value="480" />
+            <Feature name="adaptive-playback" />
+            <Feature name="can-swap-width-height" required="true" />
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.decoder.hevc.secure" type="video/hevc" >
             <Quirk name="requires-allocate-on-input-ports" />
@@ -417,13 +417,13 @@ Only the three quirks included above are recognized at this point:
             <Limit name="blocks-per-second" min="36" max="2073600" />
             <Limit name="bitrate" range="1-40000000" />
             <Limit name="frame-rate" range="1-60" />
-            <Feature name="adaptive-playback" />
-            <Feature name="can-swap-width-height" required="true" />
-            <Feature name="secure-playback" required="true" />
             <Limit name="concurrent-instances" max="3" />
             <Limit name="performance-point-4096x2304" value="30" />
             <Limit name="performance-point-4096x2160" value="60" />
             <Limit name="performance-point-3840x2160" value="60" />
+            <Feature name="adaptive-playback" />
+            <Feature name="can-swap-width-height" required="true" />
+            <Feature name="secure-playback" required="true" />
         </MediaCodec>
         <!-- Video Software -->
         <MediaCodec name="OMX.qti.video.decoder.h263sw" type="video/3gpp" >
@@ -435,10 +435,10 @@ Only the three quirks included above are recognized at this point:
              <Limit name="blocks-per-second" min="36" max="48600" />
              <Limit name="bitrate" range="1-16000000" />
              <Limit name="frame-rate" range="1-30" />
-             <Feature name="adaptive-playback" />
-             <Feature name="can-swap-width-height" required="true" />
              <Limit name="concurrent-instances" max="16" />
              <Limit name="performance-point-720x480" value="30" />
+             <Feature name="adaptive-playback" />
+             <Feature name="can-swap-width-height" required="true" />
         </MediaCodec>
         <MediaCodec name="OMX.qti.video.decoder.mpeg4sw" type="video/mp4v-es">
              <Quirk name="requires-allocate-on-input-ports" />
@@ -450,8 +450,8 @@ Only the three quirks included above are recognized at this point:
              <Limit name="bitrate" range="1-40000000" />
              <Limit name="frame-rate" range="1-30" />
              <Limit name="concurrent-instances" max="16" />
-             <Feature name="can-swap-width-height" required="true" />
              <Limit name="performance-point-1920x1080" value="30" />
+             <Feature name="can-swap-width-height" required="true" />
         </MediaCodec>
         <MediaCodec name="OMX.google.opus.decoder" type="audio/opus" update="true" rank="100"/>
     </Decoders>
diff --git a/conf_files/msmnile/media_codecs_vendor.xml b/conf_files/msmnile/media_codecs_vendor.xml
index 8d4d1efa..003ebaca 100644
--- a/conf_files/msmnile/media_codecs_vendor.xml
+++ b/conf_files/msmnile/media_codecs_vendor.xml
@@ -183,12 +183,12 @@ Only the three quirks included above are recognized at this point:
             <Limit name="bitrate" range="1-160000000" />
             <Limit name="frame-rate" range="1-480" />
             <Limit name="concurrent-instances" max="16" />
-            <Feature name="can-swap-width-height" required="true" />
             <Limit name="performance-point-4096x2304" value="56" />
             <Limit name="performance-point-4096x2160" value="60" />
             <Limit name="performance-point-3840x2160" value="60" />
             <Limit name="performance-point-1920x1080" value="240" />
             <Limit name="performance-point-1280x720" value="480" />
+            <Feature name="can-swap-width-height" required="true" />
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.encoder.vp8" type="video/x-vnd.on2.vp8" >
             <Quirk name="requires-allocate-on-input-ports" />
@@ -201,12 +201,12 @@ Only the three quirks included above are recognized at this point:
             <Limit name="bitrate" range="1-40000000" />
             <Limit name="frame-rate" range="1-240" />
             <Limit name="concurrent-instances" max="16" />
-            <Feature name="can-swap-width-height" required="true" />
             <Limit name="performance-point-4096x2304" value="24" />
             <Limit name="performance-point-4096x2160" value="30" />
             <Limit name="performance-point-3840x2160" value="30" />
             <Limit name="performance-point-1920x1080" value="120" />
             <Limit name="performance-point-1280x720" value="240" />
+            <Feature name="can-swap-width-height" required="true" />
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.encoder.hevc" type="video/hevc" >
             <Quirk name="requires-allocate-on-input-ports" />
@@ -219,7 +219,6 @@ Only the three quirks included above are recognized at this point:
             <Limit name="bitrate" range="1-160000000" />
             <Limit name="frame-rate" range="1-480" />
             <Limit name="concurrent-instances" max="16" />
-            <Feature name="can-swap-width-height" required="true" />
             <Limit name="quality" range="0-100" default="80" />
             <Limit name="performance-point-4096x2304" value="56" />
             <Limit name="performance-point-4096x2160" value="60" />
@@ -227,6 +226,7 @@ Only the three quirks included above are recognized at this point:
             <Limit name="performance-point-1920x1080" value="240" />
             <Limit name="performance-point-1280x720" value="480" />
             <Feature name="bitrate-modes" value="VBR,CBR" />
+            <Feature name="can-swap-width-height" required="true" />
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.encoder.hevc.cq" type="video/hevc" >
             <Quirk name="requires-allocate-on-input-ports" />
@@ -267,8 +267,8 @@ Only the three quirks included above are recognized at this point:
             <Limit name="bitrate" range="1-2000000" />
             <Limit name="frame-rate" range="1-30" />
             <Limit name="concurrent-instances" max="16" />
-            <Feature name="can-swap-width-height" required="true" />
             <Limit name="performance-point-720x480" value="30" />
+            <Feature name="can-swap-width-height" required="true" />
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.encoder.mpeg4sw" type="video/mp4v-es" >
              <Quirk name="requires-allocate-on-input-ports" />
@@ -280,10 +280,10 @@ Only the three quirks included above are recognized at this point:
              <Limit name="blocks-per-second" min="36" max="108000" />
              <Limit name="bitrate" range="1-4000000" />
              <Limit name="frame-rate" range="1-30" />
-             <Attribute name="software-codec" />
              <Limit name="concurrent-instances" max="16" />
-             <Feature name="can-swap-width-height" required="true" />
              <Limit name="performance-point-1280x720" value="30" />
+             <Feature name="can-swap-width-height" required="true" />
+             <Attribute name="software-codec" />
         </MediaCodec>
     </Encoders>
     <Decoders>
@@ -297,8 +297,6 @@ Only the three quirks included above are recognized at this point:
             <Limit name="blocks-per-second" min="36" max="3916800" />
             <Limit name="bitrate" range="1-220000000" />
             <Limit name="frame-rate" range="1-480" />
-            <Feature name="adaptive-playback" />
-            <Feature name="can-swap-width-height" required="true" />
             <Limit name="concurrent-instances" max="16" />
             <Limit name="performance-point-4096x2304" value="60" />
             <Limit name="performance-point-4096x2160" value="96" />
@@ -306,6 +304,8 @@ Only the three quirks included above are recognized at this point:
             <Limit name="performance-point-1920x1088" range="480" />
             <Limit name="performance-point-1920x1088" range="240" />
             <Limit name="performance-point-1280x720" value="480" />
+            <Feature name="adaptive-playback" />
+            <Feature name="can-swap-width-height" required="true" />
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.decoder.avc.secure" type="video/avc" >
             <Quirk name="requires-allocate-on-input-ports" />
@@ -316,13 +316,13 @@ Only the three quirks included above are recognized at this point:
             <Limit name="blocks-per-second" min="36" max="2073600" />
             <Limit name="bitrate" range="1-40000000" />
             <Limit name="frame-rate" range="1-60" />
-            <Feature name="adaptive-playback" />
-            <Feature name="can-swap-width-height" required="true" />
-            <Feature name="secure-playback" required="true" />
             <Limit name="concurrent-instances" max="3" />
             <Limit name="performance-point-4096x2304" value="30" />
             <Limit name="performance-point-4096x2160" value="60" />
             <Limit name="performance-point-3840x2160" value="60" />
+            <Feature name="adaptive-playback" />
+            <Feature name="can-swap-width-height" required="true" />
+            <Feature name="secure-playback" required="true" />
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.decoder.mpeg2" type="video/mpeg2" >
             <Quirk name="requires-allocate-on-input-ports" />
@@ -333,10 +333,10 @@ Only the three quirks included above are recognized at this point:
             <Limit name="blocks-per-second" min="36" max="244800" />
             <Limit name="bitrate" range="1-40000000" />
             <Limit name="frame-rate" range="1-30" />
-            <Feature name="adaptive-playback" />
-            <Feature name="can-swap-width-height" required="true" />
             <Limit name="concurrent-instances" max="16" />
             <Limit name="performance-point-1920x1080" value="30" />
+            <Feature name="adaptive-playback" />
+            <Feature name="can-swap-width-height" required="true" />
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.decoder.mpeg2.secure" type="video/mpeg2" >
             <Quirk name="requires-allocate-on-input-ports" />
@@ -347,11 +347,11 @@ Only the three quirks included above are recognized at this point:
             <Limit name="blocks-per-second" min="36" max="244800" />
             <Limit name="bitrate" range="1-40000000" />
             <Limit name="frame-rate" range="1-30" />
+            <Limit name="concurrent-instances" max="3" />
+            <Limit name="performance-point-1920x1080" value="30" />
             <Feature name="adaptive-playback" />
             <Feature name="can-swap-width-height" required="true" />
             <Feature name="secure-playback" required="true" />
-            <Limit name="concurrent-instances" max="3" />
-            <Limit name="performance-point-1920x1080" value="30" />
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.decoder.vp8" type="video/x-vnd.on2.vp8" >
             <Quirk name="requires-allocate-on-input-ports" />
@@ -362,14 +362,14 @@ Only the three quirks included above are recognized at this point:
             <Limit name="blocks-per-second" min="36" max="1036800" />
             <Limit name="bitrate" range="1-100000000" />
             <Limit name="frame-rate" range="1-240" />
-            <Feature name="adaptive-playback" />
-            <Feature name="can-swap-width-height" required="true" />
             <Limit name="concurrent-instances" max="16" />
             <Limit name="performance-point-4096x2304" value="24" />
             <Limit name="performance-point-4096x2160" value="30" />
             <Limit name="performance-point-3840x2160" value="30" />
             <Limit name="performance-point-1920x1080" value="120" />
             <Limit name="performance-point-1280x720" value="240" />
+            <Feature name="adaptive-playback" />
+            <Feature name="can-swap-width-height" required="true" />
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.decoder.vp9" type="video/x-vnd.on2.vp9" >
             <Quirk name="requires-allocate-on-input-ports" />
@@ -380,8 +380,6 @@ Only the three quirks included above are recognized at this point:
             <Limit name="blocks-per-second" min="36" max="3916800" />
             <Limit name="bitrate" range="1-220000000" />
             <Limit name="frame-rate" range="1-480" />
-            <Feature name="adaptive-playback" />
-            <Feature name="can-swap-width-height" required="true" />
             <Limit name="concurrent-instances" max="6" />
             <Limit name="performance-point-4096x2304" value="60" />
             <Limit name="performance-point-4096x2160" value="96" />
@@ -389,6 +387,8 @@ Only the three quirks included above are recognized at this point:
             <Limit name="performance-point-1920x1088" range="480" />
             <Limit name="performance-point-1920x1088" range="240" />
             <Limit name="performance-point-1280x720" value="480" />
+            <Feature name="adaptive-playback" />
+            <Feature name="can-swap-width-height" required="true" />
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.decoder.vp9.secure" type="video/x-vnd.on2.vp9" >
             <Quirk name="requires-allocate-on-input-ports" />
@@ -399,13 +399,13 @@ Only the three quirks included above are recognized at this point:
             <Limit name="blocks-per-second" min="36" max="2073600" />
             <Limit name="bitrate" range="1-40000000" />
             <Limit name="frame-rate" range="1-60" />
-            <Feature name="adaptive-playback" />
-            <Feature name="can-swap-width-height" required="true" />
-            <Feature name="secure-playback" required="true" />
             <Limit name="concurrent-instances" max="3" />
             <Limit name="performance-point-4096x2304" value="30" />
             <Limit name="performance-point-4096x2160" value="60" />
             <Limit name="performance-point-3840x2160" value="60" />
+            <Feature name="adaptive-playback" />
+            <Feature name="can-swap-width-height" required="true" />
+            <Feature name="secure-playback" required="true" />
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.decoder.hevc" type="video/hevc" >
             <Quirk name="requires-allocate-on-input-ports" />
@@ -416,8 +416,6 @@ Only the three quirks included above are recognized at this point:
             <Limit name="blocks-per-second" min="36" max="3916800" />
             <Limit name="bitrate" range="1-220000000" />
             <Limit name="frame-rate" range="1-480" />
-            <Feature name="adaptive-playback" />
-            <Feature name="can-swap-width-height" required="true" />
             <Limit name="concurrent-instances" max="16" />
             <Limit name="performance-point-4096x2304" value="60" />
             <Limit name="performance-point-4096x2160" value="96" />
@@ -425,6 +423,8 @@ Only the three quirks included above are recognized at this point:
             <Limit name="performance-point-1920x1088" range="480" />
             <Limit name="performance-point-1920x1088" range="240" />
             <Limit name="performance-point-1280x720" value="480" />
+            <Feature name="adaptive-playback" />
+            <Feature name="can-swap-width-height" required="true" />
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.decoder.hevc.secure" type="video/hevc" >
             <Quirk name="requires-allocate-on-input-ports" />
@@ -435,13 +435,13 @@ Only the three quirks included above are recognized at this point:
             <Limit name="blocks-per-second" min="36" max="2073600" />
             <Limit name="bitrate" range="1-40000000" />
             <Limit name="frame-rate" range="1-60" />
-            <Feature name="adaptive-playback" />
-            <Feature name="can-swap-width-height" required="true" />
-            <Feature name="secure-playback" required="true" />
             <Limit name="concurrent-instances" max="3" />
             <Limit name="performance-point-4096x2304" value="30" />
             <Limit name="performance-point-4096x2160" value="60" />
             <Limit name="performance-point-3840x2160" value="60" />
+            <Feature name="adaptive-playback" />
+            <Feature name="can-swap-width-height" required="true" />
+            <Feature name="secure-playback" required="true" />
         </MediaCodec>
         <!-- Video Software -->
         <MediaCodec name="OMX.qti.video.decoder.h263sw" type="video/3gpp" >
@@ -453,10 +453,10 @@ Only the three quirks included above are recognized at this point:
              <Limit name="blocks-per-second" min="36" max="48600" />
              <Limit name="bitrate" range="1-16000000" />
              <Limit name="frame-rate" range="1-30" />
-             <Feature name="adaptive-playback" />
-             <Feature name="can-swap-width-height" required="true" />
              <Limit name="concurrent-instances" max="16" />
              <Limit name="performance-point-720x480" value="30" />
+             <Feature name="adaptive-playback" />
+             <Feature name="can-swap-width-height" required="true" />
         </MediaCodec>
         <MediaCodec name="OMX.qti.video.decoder.mpeg4sw">
              <Quirk name="requires-allocate-on-input-ports" />
@@ -469,8 +469,8 @@ Only the three quirks included above are recognized at this point:
                 <Limit name="bitrate" range="1-40000000" />
                 <Limit name="frame-rate" range="1-30" />
                 <Limit name="concurrent-instances" max="16" />
-                <Feature name="can-swap-width-height" required="true" />
                 <Limit name="performance-point-1920x1080" value="30" />
+                <Feature name="can-swap-width-height" required="true" />
              </Type>
              <Type name="video/mp4v-esdp">
                 <Limit name="size" min="96x96" max="1920x1088" />
@@ -480,8 +480,8 @@ Only the three quirks included above are recognized at this point:
                 <Limit name="bitrate" range="1-40000000" />
                 <Limit name="frame-rate" range="1-30" />
                 <Limit name="concurrent-instances" max="16" />
-                <Feature name="can-swap-width-height" required="true" />
                 <Limit name="performance-point-1920x1080" value="30" />
+                <Feature name="can-swap-width-height" required="true" />
              </Type>
         </MediaCodec>
         <MediaCodec name="OMX.qti.video.decoder.vc1sw" type="video/x-ms-wmv" >
@@ -493,10 +493,10 @@ Only the three quirks included above are recognized at this point:
             <Limit name="blocks-per-second" min="36" max="244800" />
             <Limit name="bitrate" range="1-20000000" />
             <Limit name="frame-rate" range="1-30" />
-            <Feature name="adaptive-playback" />
-            <Feature name="can-swap-width-height" required="true" />
             <Limit name="concurrent-instances" max="16" />
             <Limit name="performance-point-1920x1080" value="30" />
+            <Feature name="adaptive-playback" />
+            <Feature name="can-swap-width-height" required="true" />
         </MediaCodec>
     </Decoders>
     <Include href="media_codecs_google_video.xml" />