universal7580: update media_codecs and dmedia_profiles to A310FXXU4CRG2

Change-Id: Ief38aca3faad68ffeb3e270d219b5e1c097b02a5
Signed-off-by: Stricted <info@stricted.net>

diff --git a/configs/media/media_codecs.xml b/configs/media/media_codecs.xml
index 45276915cfd4c88d1aceedb2178e39393b77d2c5..40423502b45be750cedd462f0a0fdbf92c328ad6 100644 (file)
--- a/configs/media/media_codecs.xml
+++ b/configs/media/media_codecs.xml
@@ -84,92 +84,87 @@ Only the three quirks included above are recognized at this point:
         <Setting name="max-video-encoder-input-buffers" value="9" />
     </Settings>
     <Decoders>
-        <MediaCodec name="OMX.Exynos.MPEG4.Decoder" type="video/mp4v-es" >
+        <MediaCodec name="OMX.Exynos.mpeg4.dec" type="video/mp4v-es" >
             <Quirk name="requires-allocate-on-input-ports" />
             <Quirk name="requires-allocate-on-output-ports" />
             <Quirk name="decoder-ignores-streamcorrupt-error" />
             <Quirk name="video-controller-check-enable" />
-            <Limit name="size" min="32x32" max="2048x2048" />
+            <Limit name="size" min="32x32" 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="16"/>
+            <Limit name="bitrate" range="1-20000000" />
+            <Limit name="concurrent-instances" max="16" />
+            <Feature name="adaptive-playback" />
+        </MediaCodec>
+        <MediaCodec name="OMX.Exynos.h263.dec" type="video/3gpp" >
+            <Quirk name="requires-allocate-on-input-ports" />
+            <Quirk name="requires-allocate-on-output-ports" />
+            <Quirk name="decoder-ignores-streamcorrupt-error" />
+            <Quirk name="video-controller-check-enable" />
+            <Limit name="size" min="32x32" max="720x480" />
+            <Limit name="alignment" value="4x4" />
+            <Limit name="block-size" value="16x16" />
+            <Limit name="blocks-per-second" min="1" max="48600" />
+            <Limit name="bitrate" range="1-20000000" />
+            <Limit name="concurrent-instances" max="16" />
             <Feature name="adaptive-playback" />
         </MediaCodec>
-        <MediaCodec name="OMX.Exynos.H263.Decoder" type="video/3gpp" >
+        <MediaCodec name="OMX.Exynos.avc.dec" type="video/avc" >
             <Quirk name="requires-allocate-on-input-ports" />
             <Quirk name="requires-allocate-on-output-ports" />
+            <Limit name="size" min="32x32" max="1920x1088" />
             <Quirk name="decoder-ignores-streamcorrupt-error" />
             <Quirk name="video-controller-check-enable" />
-            <Limit name="size" min="32x32" max="2048x1152" />
             <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="16"/>
+            <Limit name="bitrate" range="1-20000000" />
+            <Limit name="concurrent-instances" max="16" />
             <Feature name="adaptive-playback" />
         </MediaCodec>
-        <MediaCodec name="OMX.Exynos.AVC.Decoder" type="video/avc" >
+        <MediaCodec name="OMX.Exynos.avc.dec.secure" type="video/avc" >
             <Quirk name="requires-allocate-on-input-ports" />
             <Quirk name="requires-allocate-on-output-ports" />
+            <Limit name="size" min="32x32" max="1920x1088" />
             <Quirk name="decoder-ignores-streamcorrupt-error" />
             <Quirk name="video-controller-check-enable" />
-            <Limit name="size" min="32x32" max="8192x8192" />
             <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="16"/>
+            <Limit name="concurrent-instances" max="2" />
             <Feature name="adaptive-playback" />
+            <Feature name="secure-playback" required="true" />
         </MediaCodec>
-        <MediaCodec name="OMX.Exynos.VP8.Decoder" type="video/x-vnd.on2.vp8" >
+        <MediaCodec name="OMX.Exynos.vp8.dec" type="video/x-vnd.on2.vp8" >
             <Quirk name="requires-allocate-on-input-ports" />
             <Quirk name="requires-allocate-on-output-ports" />
             <Quirk name="decoder-ignores-streamcorrupt-error" />
             <Quirk name="video-controller-check-enable" />
-            <Limit name="size" min="32x32" max="8192x8192" />
+            <Limit name="size" min="32x32" 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="16"/>
+            <Limit name="concurrent-instances" max="16" />
             <Feature name="adaptive-playback" />
         </MediaCodec>
-        <MediaCodec name="OMX.Exynos.VC1.Decoder" >
+        <MediaCodec name="OMX.Exynos.vc1.dec" >
             <Type name="video/wvc1" />
             <Type name="video/x-ms-wmv" />
-            <Limit name="size" min="32x32" max="2048x2048" />
+            <Quirk name="requires-allocate-on-input-ports" />
+            <Quirk name="requires-allocate-on-output-ports" />
+            <Quirk name="decoder-ignores-streamcorrupt-error" />
+            <Quirk name="video-controller-check-enable" />
+            <Limit name="size" min="32x32" 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" />
             <Feature name="adaptive-playback" />
-            <Quirk name="requires-allocate-on-input-ports" />
-            <Quirk name="requires-allocate-on-output-ports" />
-            <Quirk name="decoder-ignores-streamcorrupt-error" />
-            <Quirk name="video-controller-check-enable" />
             <Limit name="concurrent-instances" max="16"/>          
         </MediaCodec>
-
-        <MediaCodec name="OMX.Exynos.MP3.Decoder">
-            <Type name="audio/mpeg">
-                <Limit name="concurrent-instances" max="2"/>
-            </Type>
-            <Type name="audio/mpeg-L1">
-                <Limit name="concurrent-instances" max="2"/>
-            </Type>
-            <Type name="audio/mpeg-L2">
-                <Limit name="concurrent-instances" max="2"/>
-            </Type>
-            <Quirk name="needs-flush-before-disable" />
-            <Quirk name="supports-multiple-frames-per-input" />
-        </MediaCodec>    
-
-        <MediaCodec name="OMX.Exynos.AAC.Decoder" type="audio/mp4a-latm">
-            <Limit name="concurrent-instances" max="4"/>
-        </MediaCodec>
-        
     </Decoders>
 
     <Encoders>
@@ -177,23 +172,23 @@ Only the three quirks included above are recognized at this point:
             <Quirk name="requires-allocate-on-input-ports" />
             <Quirk name="requires-allocate-on-output-ports" />
             <Quirk name="video-controller-check-enable" />
-            <Limit name="size" min="32x32" max="1920x1080" />
+            <Limit name="size" min="32x32" max="1920x1088" />
             <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="983040" />
             <Limit name="bitrate" range="1-20000000" />
-            <Limit name="concurrent-instances" max="16"/>
+            <Limit name="concurrent-instances" max="16" />
         </MediaCodec>
         <MediaCodec name="OMX.Exynos.H263.Encoder" type="video/3gpp" >
             <Quirk name="requires-allocate-on-input-ports" />
             <Quirk name="requires-allocate-on-output-ports" />
             <Quirk name="video-controller-check-enable" />
-            <Limit name="size" min="32x32" max="800x480" />
+            <Limit name="size" min="32x32" max="1920x1080" />
             <Limit name="alignment" value="4x4" />
             <Limit name="block-size" value="16x16" />
-            <Limit name="blocks-per-second" min="1" max="979200" />
-            <Limit name="bitrate" range="1-40000000" />
-            <Limit name="concurrent-instances" max="16"/>
+            <Limit name="blocks-per-second" min="1" max="243000" />
+            <Limit name="bitrate" range="1-20000000" />
+            <Limit name="concurrent-instances" max="16" />
         </MediaCodec>
         <MediaCodec name="OMX.Exynos.MPEG4.Encoder" type="video/mp4v-es" >
             <Quirk name="requires-allocate-on-input-ports" />
@@ -202,9 +197,20 @@ Only the three quirks included above are recognized at this point:
             <Limit name="size" min="32x32" max="1920x1080" />
             <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="16"/>
+            <Limit name="blocks-per-second" min="1" max="243000" />
+            <Limit name="bitrate" range="1-20000000" />
+            <Limit name="concurrent-instances" max="16" />
+        </MediaCodec>
+        <MediaCodec name="OMX.Exynos.VP8.Encoder" type="video/x-vnd.on2.vp8" >
+            <Quirk name="requires-allocate-on-input-ports" />
+            <Quirk name="requires-allocate-on-output-ports" />
+            <Quirk name="video-controller-check-enable" />
+            <Limit name="size" min="32x32" max="1920x1080" />
+            <Limit name="alignment" value="2x2" />
+            <Limit name="block-size" value="16x16" />
+            <Limit name="blocks-per-second" min="1" max="243000" />
+            <Limit name="bitrate" range="1-20000000" />
+            <Limit name="concurrent-instances" max="16" />
         </MediaCodec>
     </Encoders>
     <Include href="media_codecs_google_video.xml" />

diff --git a/configs/media/media_codecs_performance.xml b/configs/media/media_codecs_performance.xml
index d12504fb63423405f1f4e5512e4d967f407dffb0..9304a5675cf146a63dbbc12515146dccdb12fe08 100644 (file)
--- a/configs/media/media_codecs_performance.xml
+++ b/configs/media/media_codecs_performance.xml
@@ -17,154 +17,136 @@
 <MediaCodecs>
     <Decoders>
         <MediaCodec name="OMX.Exynos.mpeg4.dec" type="video/mp4v-es" update="true" >
-            <Limit name="measured-frame-rate-176x144" range="500-1000" />
-            <Limit name="measured-frame-rate-480x360" range="300-600" />
+            <Limit name="measured-frame-rate-176x144" range="300-600" />
+            <Limit name="measured-frame-rate-480x360" range="120-240" />
         </MediaCodec>
         <MediaCodec name="OMX.SEC.mpeg4.sw.dec" type="video/mp4v-es" update="true" >
-            <Limit name="measured-frame-rate-176x144" range="500-900" />
-            <Limit name="measured-frame-rate-480x360" range="350-600" />
-        </MediaCodec>        
+            <Limit name="measured-frame-rate-176x144" range="600-1100" />
+            <Limit name="measured-frame-rate-480x360" range="350-700" />
+        </MediaCodec>
         <MediaCodec name="OMX.Exynos.h263.dec" type="video/3gpp" update="true" >
             <Limit name="measured-frame-rate-176x144" range="600-1000" />
-            <Limit name="measured-frame-rate-352x288" range="350-600" />
+            <Limit name="measured-frame-rate-352x288" range="250-500" />
         </MediaCodec>
         <MediaCodec name="OMX.SEC.h263.sw.dec" type="video/3gpp" update="true" >
-            <Limit name="measured-frame-rate-176x144" range="500-900" />
-            <Limit name="measured-frame-rate-352x288" range="350-600" />
+            <Limit name="measured-frame-rate-176x144" range="500-1000" />
+            <Limit name="measured-frame-rate-352x288" range="400-800" />
         </MediaCodec>        
         <MediaCodec name="OMX.Exynos.avc.dec" type="video/avc" update="true" >
-            <Limit name="measured-frame-rate-320x240" range="400-700" />
-            <Limit name="measured-frame-rate-720x480" range="250-500" />
-            <Limit name="measured-frame-rate-1280x720" range="180-360" />
-            <Limit name="measured-frame-rate-1920x1080" range="100-200" />
+            <Limit name="measured-frame-rate-320x240" range="250-500" />
+            <Limit name="measured-frame-rate-720x480" range="150-300" />
+            <Limit name="measured-frame-rate-1280x720" range="70-140" />
+            <Limit name="measured-frame-rate-1920x1080" range="30-60" />
         </MediaCodec>
         <MediaCodec name="OMX.SEC.avc.sw.dec" type="video/avc" update="true" >
-            <Limit name="measured-frame-rate-320x240" range="200-350" />
-            <Limit name="measured-frame-rate-720x480" range="70-140" />
-            <Limit name="measured-frame-rate-1280x720" range="25-50" />
-            <Limit name="measured-frame-rate-1920x1080" range="9-18" />
+            <Limit name="measured-frame-rate-320x240" range="150-300" />
+            <Limit name="measured-frame-rate-720x480" range="50-100" />
+            <Limit name="measured-frame-rate-1280x720" range="20-40" />
+            <Limit name="measured-frame-rate-1920x1080" range="8-16" />
         </MediaCodec>
         <MediaCodec name="OMX.Exynos.avc.dec.secure" type="video/avc" update="true" >
-            <Limit name="measured-frame-rate-320x240" range="400-700" />
-            <Limit name="measured-frame-rate-720x480" range="250-500" />
-            <Limit name="measured-frame-rate-1280x720" range="180-360" />
-            <Limit name="measured-frame-rate-1920x1080" range="100-200" />
+            <Limit name="measured-frame-rate-320x240" range="250-500" />
+            <Limit name="measured-frame-rate-720x480" range="150-300" />
+            <Limit name="measured-frame-rate-1280x720" range="70-140" />
+            <Limit name="measured-frame-rate-1920x1080" range="30-60" />
         </MediaCodec>
         <MediaCodec name="OMX.Exynos.vp8.dec" type="video/x-vnd.on2.vp8" update="true" >
             <Limit name="measured-frame-rate-320x180" range="300-600" />
-            <Limit name="measured-frame-rate-640x360" range="350-550" />
-            <Limit name="measured-frame-rate-1280x720" range="180-360" />
-            <Limit name="measured-frame-rate-1920x1080" range="90-180" />
+            <Limit name="measured-frame-rate-640x360" range="250-500" />
+            <Limit name="measured-frame-rate-1280x720" range="80-160" />
+            <Limit name="measured-frame-rate-1920x1080" range="30-60" />
         </MediaCodec>
         <MediaCodec name="OMX.SEC.vp8.dec" type="video/x-vnd.on2.vp8" update="true" >
-            <Limit name="measured-frame-rate-320x180" range="350-700" />
-            <Limit name="measured-frame-rate-640x360" range="200-400" />
-            <Limit name="measured-frame-rate-1280x720" range="35-70" />
-            <Limit name="measured-frame-rate-1920x1080" range="8-16" />
-        </MediaCodec>
-        <MediaCodec name="OMX.Exynos.hevc.dec" type="video/hevc" update="true" >
-            <Limit name="measured-frame-rate-352x288" range="300-600" />
-            <Limit name="measured-frame-rate-720x480" range="260-520" />
-            <Limit name="measured-frame-rate-1280x720" range="160-320" />
-            <Limit name="measured-frame-rate-1920x1080" range="120-240" />
+            <Limit name="measured-frame-rate-320x180" range="250-500" />
+            <Limit name="measured-frame-rate-640x360" range="80-160" />
+            <Limit name="measured-frame-rate-1280x720" range="16-32" />
+            <Limit name="measured-frame-rate-1920x1080" range="7-14" />
         </MediaCodec>
         <MediaCodec name="OMX.SEC.hevc.sw.dec" type="video/hevc" update="true" >
-            <Limit name="measured-frame-rate-352x288" range="200-400" />
-            <Limit name="measured-frame-rate-720x480" range="100-200" />
-            <Limit name="measured-frame-rate-1280x720" range="30-60" />
-            <Limit name="measured-frame-rate-1920x1080" range="15-30" />
-        </MediaCodec>
-        <MediaCodec name="OMX.Exynos.vp9.dec" type="video/x-vnd.on2.vp9" update="true" >
-            <Limit name="measured-frame-rate-320x180" range="400-700" />
-            <Limit name="measured-frame-rate-640x360" range="220-440" />
-            <Limit name="measured-frame-rate-1280x720" range="70-140" />
-            <Limit name="measured-frame-rate-1920x1080" range="40-80" />
+            <Limit name="measured-frame-rate-352x288" range="100-200" />
+            <Limit name="measured-frame-rate-720x480" range="50-100" />
+            <Limit name="measured-frame-rate-1280x720" range="20-40" />
+            <Limit name="measured-frame-rate-1920x1080" range="14-28" />
         </MediaCodec>
 
         <MediaCodec name="OMX.google.h264.decoder" type="video/avc" update="true">
-            <Limit name="measured-frame-rate-320x240" range="300-600" />
-            <Limit name="measured-frame-rate-720x480" range="120-240" />
-            <Limit name="measured-frame-rate-1280x720" range="40-80" />
-            <Limit name="measured-frame-rate-1920x1080" range="15-30" />
+            <Limit name="measured-frame-rate-320x240" range="200-400" />
+            <Limit name="measured-frame-rate-720x480" range="80-160" />
+            <Limit name="measured-frame-rate-1280x720" range="25-50" />
+            <Limit name="measured-frame-rate-1920x1080" range="12-24" />
         </MediaCodec>
         <MediaCodec name="OMX.google.h263.decoder" type="video/3gpp" update="true">
-            <Limit name="measured-frame-rate-176x144" range="140-280" />
-            <Limit name="measured-frame-rate-352x288" range="140-280" />
+            <Limit name="measured-frame-rate-176x144" range="120-240" />
+            <Limit name="measured-frame-rate-352x288" range="100-200" />
         </MediaCodec>
         <MediaCodec name="OMX.google.hevc.decoder" type="video/hevc" update="true">
-            <Limit name="measured-frame-rate-352x288" range="350-650" />
-            <Limit name="measured-frame-rate-640x360" range="200-400" />
-            <Limit name="measured-frame-rate-1280x720" range="60-120" />
-            <Limit name="measured-frame-rate-1920x1080" range="30-60" />
+            <Limit name="measured-frame-rate-352x288" range="180-360" />
+            <Limit name="measured-frame-rate-640x360" range="100-200" />
+            <Limit name="measured-frame-rate-1280x720" range="40-80" />
+            <Limit name="measured-frame-rate-1920x1080" range="20-40" />
         </MediaCodec>
         <MediaCodec name="OMX.google.vp8.decoder" type="video/x-vnd.on2.vp8" update="true">
-            <Limit name="measured-frame-rate-320x180" range="600-1000" />
-            <Limit name="measured-frame-rate-640x360" range="200-400" />
-            <Limit name="measured-frame-rate-1280x720" range="42-84" />
-            <Limit name="measured-frame-rate-1920x1080" range="22-44" />
+            <Limit name="measured-frame-rate-320x180" range="300-600" />
+            <Limit name="measured-frame-rate-640x360" range="90-180" />
+            <Limit name="measured-frame-rate-1280x720" range="17-34" />
+            <Limit name="measured-frame-rate-1920x1080" range="8-16" />
         </MediaCodec>
         <MediaCodec name="OMX.google.vp9.decoder" type="video/x-vnd.on2.vp9" update="true">
-            <Limit name="measured-frame-rate-320x180" range="300-600" />
-            <Limit name="measured-frame-rate-640x360" range="180-360" />
-            <Limit name="measured-frame-rate-1280x720" range="70-140" />
-            <Limit name="measured-frame-rate-1920x1080" range="30-60" />
+            <Limit name="measured-frame-rate-320x180" range="200-400" />
+            <Limit name="measured-frame-rate-640x360" range="90-180" />
+            <Limit name="measured-frame-rate-1280x720" range="40-80" />
+            <Limit name="measured-frame-rate-1920x1080" range="20-40" />
         </MediaCodec>
         <MediaCodec name="OMX.google.mpeg4.decoder" update="true">
             <Type name="video/mp4v-es">
-                <Limit name="measured-frame-rate-176x144" range="130-260" />
+                <Limit name="measured-frame-rate-176x144" range="170-340" />
             </Type>
-        </MediaCodec>        
+        </MediaCodec>
     </Decoders>
     <Encoders>
         <MediaCodec name="OMX.Exynos.AVC.Encoder" type="video/avc" update="true" >
-            <Limit name="measured-frame-rate-320x240" range="115-450" />
-            <Limit name="measured-frame-rate-720x480" range="65-250" />
-            <Limit name="measured-frame-rate-1280x720" range="40-120" />
-            <Limit name="measured-frame-rate-1920x1080" range="30-80" />
+            <Limit name="measured-frame-rate-320x240" range="200-400" />
+            <Limit name="measured-frame-rate-720x480" range="120-200" />
+            <Limit name="measured-frame-rate-1280x720" range="30-120" />
+            <Limit name="measured-frame-rate-1920x1080" range="15-60" />
         </MediaCodec>
         <MediaCodec name="OMX.Exynos.H263.Encoder" type="video/3gpp" update="true" >
-            <Limit name="measured-frame-rate-320x240" range="115-450" />
-            <Limit name="measured-frame-rate-720x480" range="65-250" />
-            <Limit name="measured-frame-rate-1280x720" range="40-120" />
-            <Limit name="measured-frame-rate-1920x1080" range="15-80" />
+            <Limit name="measured-frame-rate-320x240" range="200-400" />
+            <Limit name="measured-frame-rate-720x480" range="120-200" />
+            <Limit name="measured-frame-rate-1280x720" range="30-120" />
+            <Limit name="measured-frame-rate-1920x1080" range="15-60" />
         </MediaCodec>
         <MediaCodec name="OMX.Exynos.MPEG4.Encoder" type="video/mp4v-es" update="true" >
-            <Limit name="measured-frame-rate-320x240" range="115-450" />
-            <Limit name="measured-frame-rate-720x480" range="65-250" />
-            <Limit name="measured-frame-rate-1280x720" range="40-120" />
-            <Limit name="measured-frame-rate-1920x1080" range="30-80" />
+            <Limit name="measured-frame-rate-320x240" range="200-400" />
+            <Limit name="measured-frame-rate-720x480" range="120-200" />
+            <Limit name="measured-frame-rate-1280x720" range="30-120" />
+            <Limit name="measured-frame-rate-1920x1080" range="15-60" />
         </MediaCodec>
         <MediaCodec name="OMX.Exynos.VP8.Encoder" type="video/x-vnd.on2.vp8" update="true" >
-            <Limit name="measured-frame-rate-320x240" range="110-450" />
-            <Limit name="measured-frame-rate-640x360" range="65-250" />
-            <Limit name="measured-frame-rate-1280x720" range="40-120" />
-            <Limit name="measured-frame-rate-1920x1080" range="30-80" />
-        </MediaCodec>
-        <MediaCodec name="OMX.Exynos.HEVC.Encoder" type="video/hevc" update="true" >
-            <Limit name="measured-frame-rate-320x240" range="115-450" />
-            <Limit name="measured-frame-rate-720x480" range="65-250" />
-            <Limit name="measured-frame-rate-1280x720" range="40-120" />
-            <Limit name="measured-frame-rate-1920x1080" range="40-110" />
-            <Limit name="measured-frame-rate-3840x2160" range="15-50" />
+            <Limit name="measured-frame-rate-320x240" range="200-400" />
+            <Limit name="measured-frame-rate-720x480" range="120-200" />
+            <Limit name="measured-frame-rate-1280x720" range="30-120" />
+            <Limit name="measured-frame-rate-1920x1080" range="15-60" />
         </MediaCodec>
 
         <MediaCodec name="OMX.google.h264.encoder" type="video/avc" update="true">
-            <Limit name="measured-frame-rate-320x240" range="120-480" />
-            <Limit name="measured-frame-rate-720x480" range="60-200" />
+            <Limit name="measured-frame-rate-320x240" range="60-240" />
+            <Limit name="measured-frame-rate-720x480" range="30-100" />
             <Limit name="measured-frame-rate-1280x720" range="15-60" />
             <Limit name="measured-frame-rate-1920x1080" range="10-40" />
         </MediaCodec>
         <MediaCodec name="OMX.google.h263.encoder" type="video/3gpp" update="true">
-            <Limit name="measured-frame-rate-176x144" range="100-400" />
+            <Limit name="measured-frame-rate-176x144" range="250-450" />
         </MediaCodec>
         <MediaCodec name="OMX.google.mpeg4.encoder" type="video/mp4v-es" update="true">
-            <Limit name="measured-frame-rate-176x144" range="85-350" />
+            <Limit name="measured-frame-rate-176x144" range="250-450" />
         </MediaCodec>
         <MediaCodec name="OMX.google.vp8.encoder" type="video/x-vnd.on2.vp8" update="true">
-            <Limit name="measured-frame-rate-320x180" range="40-155" />
-            <Limit name="measured-frame-rate-640x360" range="30-120" />
-            <Limit name="measured-frame-rate-1280x720" range="25-110" />
+            <Limit name="measured-frame-rate-320x180" range="60-240" />
+            <Limit name="measured-frame-rate-640x360" range="30-100" />
+            <Limit name="measured-frame-rate-1280x720" range="15-60" />
             <Limit name="measured-frame-rate-1920x1080" range="10-40" />
         </MediaCodec>
     </Encoders>
 </MediaCodecs>
+

diff --git a/configs/media/media_profiles_V1_0.xml b/configs/media/media_profiles_V1_0.xml
index 7a55e7a5288e371fe10fe9a0d8a951249725e33b..37acc45358dacf24a1b9c35b43b9becc61d14336 100644 (file)
--- a/configs/media/media_profiles_V1_0.xml
+++ b/configs/media/media_profiles_V1_0.xml
@@ -49,6 +49,19 @@
              channels="2" />
     </EncoderProfile>
 
+    <EncoderProfile quality="qvga" fileFormat="mp4" duration="30">
+      <Video codec="h264"
+             bitRate="767000"
+             width="320"
+             height="240"
+             frameRate="30" />
+
+      <Audio codec="aac"
+             bitRate="128000"
+             sampleRate="48000"
+             channels="2" />
+    </EncoderProfile>
+
     <EncoderProfile quality="480p" fileFormat="mp4" duration="30">
       <Video codec="h264"
              bitRate="3078000"
@@ -122,6 +135,23 @@
              channels="2" />
     </EncoderProfile>
 
+    <EncoderProfile quality="timelapseqvga" fileFormat="mp4" duration="30">
+      <Video codec="h264"
+             bitRate="767000"
+             width="320"
+             height="240"
+             frameRate="30" />
+
+      <!--
+            The Audio part of the profile will not be used since time lapse mode
+            does not capture audio
+      -->
+      <Audio codec="aac"
+             bitRate="128000"
+             sampleRate="48000"
+             channels="2" />
+    </EncoderProfile>
+
     <EncoderProfile quality="timelapse480p" fileFormat="mp4" duration="30">
       <Video codec="h264"
              bitRate="3078000"
@@ -209,6 +239,19 @@
              channels="2" />
     </EncoderProfile>
 
+    <EncoderProfile quality="qvga" fileFormat="mp4" duration="30">
+      <Video codec="h264"
+             bitRate="767000"
+             width="320"
+             height="240"
+             frameRate="30" />
+
+      <Audio codec="aac"
+             bitRate="128000"
+             sampleRate="48000"
+             channels="2" />
+    </EncoderProfile>
+
     <EncoderProfile quality="480p" fileFormat="mp4" duration="30">
       <Video codec="h264"
              bitRate="3078000"
@@ -282,6 +325,23 @@
              channels="2" />
     </EncoderProfile>
 
+    <EncoderProfile quality="timelapseqvga" fileFormat="mp4" duration="30">
+      <Video codec="h264"
+             bitRate="767000"
+             width="320"
+             height="240"
+             frameRate="30" />
+
+      <!--
+             The Audio part of the profile will not be used since time lapse mode
+             does not capture audio
+       -->
+      <Audio codec="aac"
+             bitRate="128000"
+             sampleRate="48000"
+             channels="2" />
+    </EncoderProfile>
+
     <EncoderProfile quality="timelapse480p" fileFormat="mp4" duration="30">
       <Video codec="h264"
              bitRate="3078000"