Replaced media xml files with ones from G530W firmware.
diff --git a/media/media_codecs.xml b/media/media_codecs.xml
index 3e551ad..5753bd6 100644
--- a/media/media_codecs.xml
+++ b/media/media_codecs.xml
@@ -109,9 +109,52 @@
|____________________________________________________|
-->
<MediaCodecs>
- <Include href="media_codecs_google_audio.xml" />
- <Include href="media_codecs_google_telephony.xml" />
<Encoders>
+ <!-- Video Hardware -->
+ <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"/>
+ <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-20000000" />
+ <Quirk name="video-controller-check-enable" />
+ </MediaCodec>
+ <MediaCodec name="OMX.qcom.video.encoder.h263" type="video/3gpp" >
+ <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="720x576" />
+ <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" />
+ <Quirk name="video-controller-check-enable" />
+ </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="alignment" value="2x2" />
+ <Limit name="block-size" value="16x16" />
+ <Limit name="blocks-per-second" min="1" max="244800" />
+ <Limit name="bitrate" range="1-20000000" />
+ <Quirk name="video-controller-check-enable" />
+ </MediaCodec>
+ <MediaCodec name="OMX.qcom.video.encoder.vp8" type="video/x-vnd.on2.vp8" >
+ <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="alignment" value="2x2" />
+ <Limit name="block-size" value="16x16" />
+ <Limit name="blocks-per-second" min="1" max="244800" />
+ <Limit name="bitrate" range="1-20000000" />
+ <Quirk name="video-controller-check-enable" />
+ </MediaCodec>
<!-- Audio Hardware -->
<MediaCodec name="OMX.qcom.audio.encoder.evrc" type="audio/evrc" >
<Quirk name="requires-allocate-on-input-ports" />
@@ -121,65 +164,48 @@
<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.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="alignment" value="2x2" />
- <Limit name="block-size" value="16x16" />
- <Limit name="blocks-per-second" min="1" max="244800" />
- <Limit name="bitrate" range="1-20000000" />
- </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"/>
- <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-20000000" />
- </MediaCodec>
- <MediaCodec name="OMX.qcom.video.encoder.h263" type="video/3gpp" >
- <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="720x576" />
- <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" />
- </MediaCodec>
- <MediaCodec name="OMX.qcom.video.encoder.vp8" type="video/x-vnd.on2.vp8" >
- <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="alignment" value="2x2" />
- <Limit name="block-size" value="16x16" />
- <Limit name="blocks-per-second" min="1" max="244800" />
- <Limit name="bitrate" range="1-20000000" />
- </MediaCodec>
</Encoders>
<Decoders>
+ <!-- Audio Software -->
+ <MediaCodec name="OMX.SEC.amr.dec">
+ <Type name="audio/amr-wb" />
+ <Type name="audio/3gpp" />
+ <Quirk name="needs-flush-before-disable" />
+ <Quirk name="decoder-ignores-streamcorrupt-error" />
+ </MediaCodec>
+ <MediaCodec name="OMX.SEC.mp3.dec">
+ <Type name="audio/mpeg"/>
+ <Type name="audio/mpeg-L1"/>
+ <Type name="audio/mpeg-L2"/>
+ <Quirk name="needs-flush-before-disable" />
+ <Quirk name="decoder-ignores-streamcorrupt-error" />
+ </MediaCodec>
+ <MediaCodec name="OMX.SEC.aac.dec" type="audio/mp4a-latm" >
+ <Quirk name="needs-flush-before-disable" />
+ <Quirk name="decoder-ignores-streamcorrupt-error" />
+ </MediaCodec>
+ <MediaCodec name="OMX.SEC.flac.dec" type="audio/flac" >
+ <Quirk name="needs-flush-before-disable" />
+ <Quirk name="decoder-ignores-streamcorrupt-error" />
+ </MediaCodec>
+ <MediaCodec name="OMX.SEC.wma.dec" type="audio/x-ms-wma" >
+ <Quirk name="needs-flush-before-disable" />
+ <Quirk name="decoder-ignores-streamcorrupt-error" />
+ </MediaCodec>
+ <MediaCodec name="OMX.SEC.adpcm.dec" type="audio/x-ima" >
+ <Quirk name="needs-flush-before-disable" />
+ <Quirk name="decoder-ignores-streamcorrupt-error" />
+ </MediaCodec>
<!-- Audio Hardware -->
- <MediaCodec name="OMX.qcom.audio.decoder.wma" type="audio/x-ms-wma" >
- <Quirk name="requires-global-flush" />
- <Quirk name="requires-wma-pro-component" />
- </MediaCodec>
- <MediaCodec name="OMX.qcom.audio.decoder.wmaLossLess" type="audio/x-ms-wma-lossless" >
- <Quirk name="requires-global-flush" />
- </MediaCodec>
- <MediaCodec name="OMX.qcom.audio.decoder.wma10Pro" type="audio/x-ms-wma-pro" >
- <Quirk name="requires-global-flush" />
- </MediaCodec>
<MediaCodec name="OMX.qcom.audio.decoder.amrwbplus" type="audio/amr-wb-plus" >
</MediaCodec>
<!-- Audio Software -->
- <MediaCodec name="OMX.google.aac.decoder" type="audio/mp4a-latm" />
+ <!--
+ Use Google's RAW decoder to support ACodec path for FLAC clips as
+ FLACDecoder is non-OMX component based. A component can be used to
+ support several mimetypes, so existing raw decoder usecases will not
+ be affected by this.
+ -->
<MediaCodec name="OMX.qcom.audio.decoder.Qcelp13" type="audio/qcelp" >
<Quirk name="requires-global-flush" />
</MediaCodec>
@@ -190,6 +216,8 @@
<MediaCodec name="OMX.qcom.video.decoder.avc" type="video/avc" >
<Quirk name="requires-allocate-on-input-ports" />
<Quirk name="requires-allocate-on-output-ports" />
+ <Quirk name="requires-timestamp-reorder" />
+ <Quirk name="video-controller-check-enable" />
<Limit name="size" min="64x64" max="1920x1088" />
<Limit name="alignment" value="2x2" />
<Limit name="block-size" value="16x16" />
@@ -200,6 +228,8 @@
<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" />
+ <Quirk name="requires-timestamp-reorder" />
+ <Quirk name="video-controller-check-enable" />
<Limit name="size" min="64x64" max="1920x1088" />
<Limit name="alignment" value="2x2" />
<Limit name="block-size" value="16x16" />
@@ -207,69 +237,47 @@
<Limit name="bitrate" range="1-20000000" />
<Feature name="adaptive-playback" />
<Feature name="secure-playback" required="true" />
- </MediaCodec>
- <MediaCodec name="OMX.qcom.video.decoder.mpeg2" type="video/mpeg2" >
- <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-20000000" />
- <Feature name="adaptive-playback" />
- </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" />
- <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" />
- <Feature name="adaptive-playback" />
- <Feature name="secure-playback" required="true" />
- </MediaCodec>
+ </MediaCodec>
<MediaCodec name="OMX.qcom.video.decoder.mpeg4" type="video/mp4v-es" >
<Quirk name="requires-allocate-on-input-ports" />
<Quirk name="requires-allocate-on-output-ports" />
+ <Quirk name="requires-timestamp-reorder" />
+ <Quirk name="video-controller-check-enable" />
<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="bitrate" range="1-20000000" />
<Feature name="adaptive-playback" />
</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" />
+ <Quirk name="requires-timestamp-reorder" />
+ <Quirk name="video-controller-check-enable" />
<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="bitrate" range="1-2000000" />
<Feature name="adaptive-playback" />
</MediaCodec>
- <MediaCodec name="OMX.qcom.video.decoder.vc1" type="video/x-ms-wmv" >
+ <MediaCodec name="OMX.qcom.video.decoder.vc1" >
+ <Type name="video/x-ms-wmv"/>
+ <Type name="video/wvc1"/>
<Quirk name="requires-allocate-on-input-ports" />
<Quirk name="requires-allocate-on-output-ports" />
+ <Quirk name="requires-timestamp-reorder" />
+ <Quirk name="video-controller-check-enable" />
<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="bitrate" range="1-20000000" />
<Feature name="adaptive-playback" />
</MediaCodec>
- <MediaCodec name="OMX.qcom.video.decoder.vc1.secure" 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-20000000" />
- <Feature name="adaptive-playback" />
- <Feature name="secure-playback" required="true" />
- </MediaCodec>
+<!-- QCom DivX Components are not used -->
+<!--
<MediaCodec name="OMX.qcom.video.decoder.divx" type="video/divx" >
<Quirk name="requires-allocate-on-input-ports" />
<Quirk name="requires-allocate-on-output-ports" />
@@ -277,17 +285,17 @@
<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-10000000" />
+ <Limit name="bitrate" range="1-50000000" />
<Feature name="adaptive-playback" />
</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="720x480" />
+ <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="40500" />
- <Limit name="bitrate" range="1-2000000" />
+ <Limit name="blocks-per-second" min="1" max="244800" />
+ <Limit name="bitrate" range="1-20000000" />
<Feature name="adaptive-playback" />
</MediaCodec>
<MediaCodec name="OMX.qcom.video.decoder.divx4" type="video/divx4" >
@@ -297,30 +305,84 @@
<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-10000000" />
+ <Limit name="bitrate" range="1-50000000" />
<Feature name="adaptive-playback" />
</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" />
+ <Quirk name="requires-timestamp-reorder" />
+ <Quirk name="video-controller-check-enable" />
<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="bitrate" range="1-20000000" />
<Feature name="adaptive-playback" />
</MediaCodec>
+ <!--
<MediaCodec name="OMX.qcom.video.decoder.hevcswvdec" type="video/hevc" >
<Quirk name="requires-allocate-on-input-ports" />
<Quirk name="requires-allocate-on-output-ports" />
+ <Quirk name="requires-timestamp-reorder" />
+ <Quirk name="video-controller-check-enable" />
<Limit name="size" min="64x64" max="1280x720" />
<Limit name="alignment" value="2x2" />
<Limit name="block-size" value="16x16" />
<Limit name="blocks-per-second" min="1" max="108300" />
<Limit name="bitrate" range="1-3000000" />
+ <Feature name="adaptive-playback" />
+ </MediaCodec>
+ -->
+ <!-- Video Software -->
+ <MediaCodec name="OMX.SEC.h263.sw.dec" type="video/3gpp" >
+ <Quirk name="decoder-ignores-streamcorrupt-error" />
+ </MediaCodec>
+ <MediaCodec name="OMX.SEC.avc.sw.dec" type="video/avc" >
+ <Quirk name="decoder-ignores-streamcorrupt-error" />
+ <Limit name="size" min="64x64" max="2048x2048" />
+ <Feature name="adaptive-playback" />
+ </MediaCodec>
+ <MediaCodec name="OMX.SEC.mpeg4.sw.dec" type="video/mp4v-es" >
+ <Quirk name="decoder-ignores-streamcorrupt-error" />
+ </MediaCodec>
+ <MediaCodec name="OMX.SEC.vc1.sw.dec" >
+ <Type name="video/x-ms-wmv"/>
+ <Type name="video/wvc1"/>
+ <Quirk name="decoder-ignores-streamcorrupt-error" />
+ </MediaCodec>
+ <MediaCodec name="OMX.SEC.wmv7.dec" type="video/x-ms-wmv7" >
+ <Quirk name="decoder-ignores-streamcorrupt-error" />
+ </MediaCodec>
+ <MediaCodec name="OMX.SEC.wmv8.dec" type="video/x-ms-wmv8" >
+ <Quirk name="decoder-ignores-streamcorrupt-error" />
+ </MediaCodec>
+ <MediaCodec name="OMX.SEC.mp43.dec" type="video/mp43" >
+ <Quirk name="decoder-ignores-streamcorrupt-error" />
+ </MediaCodec>
+ <MediaCodec name="OMX.SEC.hevc.sw.dec" type="video/hevc" >
+ <Quirk name="decoder-ignores-streamcorrupt-error" />
+ <Limit name="size" min="64x64" max="2048x2048" />
+ <Feature name="adaptive-playback" />
+ </MediaCodec>
+ <MediaCodec name="OMX.SEC.h263sr.dec" type="video/sorenson" >
+ <Quirk name="decoder-ignores-streamcorrupt-error" />
+ </MediaCodec>
+ <MediaCodec name="OMX.SEC.vp8.dec" type="video/x-vnd.on2.vp8" >
+ <Quirk name="decoder-ignores-streamcorrupt-error" />
+ <Limit name="size" min="64x64" max="2048x2048" />
<Feature name="adaptive-playback" />
</MediaCodec>
</Decoders>
<Include href="media_codecs_google_video.xml" />
- <Include href="media_codecs_ffmpeg.xml" />
+ <Include href="media_codecs_google_audio.xml" />
+ <Include href="media_codecs_google_telephony.xml" />
+ <Encoders>
+ <MediaCodec name="OMX.SEC.naac.enc" type="audio/mp4a-latm">
+ <Limit name="channel-count" max="6" />
+ <Limit name="sample-rate" ranges="11025,12000,16000,22050,24000,32000,44100,48000" />
+ <Limit name="bitrate" range="8000-960000" />
+ </MediaCodec>
+ </Encoders>
</MediaCodecs>
diff --git a/media/media_profiles.xml b/media/media_profiles.xml
index 87c8df2..5c84010 100644
--- a/media/media_profiles.xml
+++ b/media/media_profiles.xml
@@ -1,8 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 The Android Open Source Project
- Copyright (C) 2014 The Linux Foundation. All rights reserved.
+<!-- Copyright (C) 2012-2014, The Linux Foundation. All rights reserved
Not a contribution.
+ Copyright (C) 2010 The Android Open Source Project
+
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
@@ -24,7 +25,7 @@
AudioDecoderCap)>
<!ELEMENT CamcorderProfiles (EncoderProfile+, ImageEncoding+, ImageDecoding, Camera)>
<!ELEMENT EncoderProfile (Video, Audio)>
-<!ATTLIST EncoderProfile quality (high|low) #REQUIRED>
+<!ATTLIST EncoderProfile quality (low|high|qcif|qvga|720p|1080p|timelapselow|timelapsehigh|timelapseqcif|timelapseqvga|timelapse720p|timelapse1080p) #REQUIRED>
<!ATTLIST EncoderProfile fileFormat (mp4|3gp) #REQUIRED>
<!ATTLIST EncoderProfile duration (30|60) #REQUIRED>
<!ATTLIST EncoderProfile cameraId (0|1) #REQUIRED>
@@ -93,646 +94,442 @@
<MediaSettings>
<!-- Each camcorder profile defines a set of predefined configuration parameters -->
<!-- Back Camera -->
- <CamcorderProfiles cameraId="0" startOffsetMs="300">
+ <CamcorderProfiles cameraId="0" startOffsetMs="700">
- <EncoderProfile quality="low" fileFormat="3gp" duration="30">
+ <EncoderProfile quality="low" fileFormat="mp4" duration="30">
<Video codec="h264"
- bitRate="192000"
+ bitRate="384000"
width="176"
height="144"
frameRate="30" />
- <Audio codec="amrnb"
- bitRate="12200"
- sampleRate="8000"
- channels="1" />
+ <Audio codec="aac"
+ bitRate="128000"
+ sampleRate="48000"
+ channels="2" />
</EncoderProfile>
<EncoderProfile quality="high" fileFormat="mp4" duration="30">
<Video codec="h264"
- bitRate="20000000"
+ bitRate="17000000"
width="1920"
height="1080"
frameRate="30" />
<Audio codec="aac"
- bitRate="156000"
+ bitRate="256000"
sampleRate="48000"
channels="2" />
</EncoderProfile>
- <EncoderProfile quality="qvga" fileFormat="mp4" duration="60">
+ <EncoderProfile quality="qcif" fileFormat="mp4" duration="30">
<Video codec="h264"
- bitRate="512000"
+ bitRate="384000"
+ width="176"
+ height="144"
+ frameRate="30" />
+
+ <Audio codec="aac"
+ bitRate="128000"
+ sampleRate="48000"
+ 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="156000"
+ bitRate="128000"
sampleRate="48000"
channels="2" />
</EncoderProfile>
- <EncoderProfile quality="cif" fileFormat="3gp" duration="30">
- <Video codec="h264"
- bitRate="720000"
- width="352"
- height="288"
- frameRate="30" />
-
- <Audio codec="amrnb"
- bitRate="12200"
- sampleRate="8000"
- channels="1" />
- </EncoderProfile>
-
- <EncoderProfile quality="fwvga" fileFormat="mp4" duration="30">
- <Video codec="h264"
- bitRate="2000000"
- width="864"
- height="480"
- frameRate="30" />
-
- <!-- audio setting is ignored -->
- <Audio codec="amrnb"
- bitRate="12200"
- sampleRate="8000"
- channels="1" />
- </EncoderProfile>
-
<EncoderProfile quality="480p" fileFormat="mp4" duration="30">
<Video codec="h264"
- bitRate="2000000"
+ bitRate="3449000"
width="720"
height="480"
frameRate="30" />
<Audio codec="aac"
- bitRate="156000"
+ bitRate="256000"
sampleRate="48000"
channels="2" />
</EncoderProfile>
<EncoderProfile quality="720p" fileFormat="mp4" duration="30">
<Video codec="h264"
- bitRate="14000000"
+ bitRate="12000000"
width="1280"
height="720"
frameRate="30" />
<Audio codec="aac"
- bitRate="156000"
+ bitRate="256000"
sampleRate="48000"
channels="2" />
</EncoderProfile>
<EncoderProfile quality="1080p" fileFormat="mp4" duration="30">
<Video codec="h264"
- bitRate="20000000"
+ bitRate="17000000"
width="1920"
height="1080"
frameRate="30" />
<Audio codec="aac"
- bitRate="156000"
- sampleRate="48000"
- channels="2" />
- </EncoderProfile>
-
- <EncoderProfile quality="qcif" fileFormat="3gp" duration="30">
- <Video codec="h264"
- bitRate="192000"
- width="176"
- height="144"
- frameRate="30" />
-
- <Audio codec="amrnb"
- bitRate="12200"
- sampleRate="8000"
- channels="1" />
- </EncoderProfile>
-
- <EncoderProfile quality="wvga" fileFormat="mp4" duration="30">
- <Video codec="h264"
- bitRate="2000000"
- width="800"
- height="480"
- frameRate="30" />
-
- <Audio codec="aac"
- bitRate="156000"
- sampleRate="48000"
- channels="2" />
- </EncoderProfile>
-
- <EncoderProfile quality="vga" fileFormat="mp4" duration="30">
- <Video codec="h264"
- bitRate="2000000"
- width="640"
- height="480"
- frameRate="30" />
-
- <Audio codec="aac"
- bitRate="156000"
+ bitRate="256000"
sampleRate="48000"
channels="2" />
</EncoderProfile>
<EncoderProfile quality="timelapselow" fileFormat="mp4" duration="30">
<Video codec="h264"
- bitRate="192000"
+ bitRate="384000"
width="176"
height="144"
frameRate="30" />
- <!-- audio setting is ignored -->
- <Audio codec="amrnb"
- bitRate="12200"
- sampleRate="8000"
- channels="1" />
+ <!--
+ 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="timelapsehigh" fileFormat="mp4" duration="30">
<Video codec="h264"
- bitRate="20000000"
+ bitRate="17000000"
width="1920"
height="1080"
frameRate="30" />
- <!-- audio setting is ignored -->
+ <!--
+ The Audio part of the profile will not be used since time lapse mode
+ does not capture audio
+ -->
<Audio codec="aac"
- bitRate="156000"
+ bitRate="256000"
sampleRate="48000"
channels="2" />
</EncoderProfile>
<EncoderProfile quality="timelapseqcif" fileFormat="mp4" duration="30">
<Video codec="h264"
- bitRate="192000"
+ bitRate="384000"
width="176"
height="144"
frameRate="30" />
- <!-- audio setting is ignored -->
- <Audio codec="amrnb"
- bitRate="12200"
- sampleRate="8000"
- channels="1" />
+ <!--
+ 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="timelapsecif" fileFormat="mp4" duration="30">
- <Video codec="h264"
- bitRate="720000"
- width="352"
- height="288"
- frameRate="30" />
-
- <!-- audio setting is ignored -->
- <Audio codec="amrnb"
- bitRate="12200"
- sampleRate="8000"
- channels="1" />
- </EncoderProfile>
-
-
<EncoderProfile quality="timelapseqvga" fileFormat="mp4" duration="30">
<Video codec="h264"
- bitRate="512000"
+ bitRate="767000"
width="320"
height="240"
frameRate="30" />
- <!-- audio setting is ignored -->
- <Audio codec="amrnb"
- bitRate="12200"
- sampleRate="8000"
- channels="1" />
- </EncoderProfile>
-
- <EncoderProfile quality="timelapsewqvga" fileFormat="mp4" duration="30">
- <Video codec="h264"
- bitRate="720000"
- width="432"
- height="240"
- frameRate="30" />
-
- <!-- audio setting is ignored -->
- <Audio codec="amrnb"
- bitRate="12200"
- sampleRate="8000"
- channels="1" />
- </EncoderProfile>
-
- <EncoderProfile quality="timelapsevga" fileFormat="mp4" duration="30">
- <Video codec="h264"
- bitRate="2000000"
- width="640"
- height="480"
- frameRate="30" />
-
- <!-- audio setting is ignored -->
- <Audio codec="amrnb"
- bitRate="12200"
- sampleRate="8000"
- channels="1" />
- </EncoderProfile>
-
- <EncoderProfile quality="timelapsewvga" fileFormat="mp4" duration="30">
- <Video codec="h264"
- bitRate="2000000"
- width="800"
- height="480"
- frameRate="30" />
-
- <!-- audio setting is ignored -->
- <Audio codec="amrnb"
- bitRate="12200"
- sampleRate="8000"
- channels="1" />
- </EncoderProfile>
-
- <EncoderProfile quality="timelapsefwvga" fileFormat="mp4" duration="30">
- <Video codec="h264"
- bitRate="2000000"
- width="864"
- height="480"
- frameRate="30" />
-
- <!-- audio setting is ignored -->
- <Audio codec="amrnb"
- bitRate="12200"
- sampleRate="8000"
- channels="1" />
+ <!--
+ 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="2000000"
- width="640"
+ bitRate="3449000"
+ width="720"
height="480"
frameRate="30" />
- <!-- audio setting is ignored -->
+ <!--
+ The Audio part of the profile will not be used since time lapse mode
+ does not capture audio
+ -->
<Audio codec="aac"
- bitRate="156000"
+ bitRate="256000"
sampleRate="48000"
channels="2" />
</EncoderProfile>
<EncoderProfile quality="timelapse720p" fileFormat="mp4" duration="30">
<Video codec="h264"
- bitRate="14000000"
+ bitRate="12000000"
width="1280"
height="720"
frameRate="30" />
- <!-- audio setting is ignored -->
+ <!--
+ The Audio part of the profile will not be used since time lapse mode
+ does not capture audio
+ -->
<Audio codec="aac"
- bitRate="156000"
+ bitRate="256000"
sampleRate="48000"
channels="2" />
</EncoderProfile>
<EncoderProfile quality="timelapse1080p" fileFormat="mp4" duration="30">
<Video codec="h264"
- bitRate="20000000"
+ bitRate="17000000"
width="1920"
height="1080"
frameRate="30" />
- <!-- audio setting is ignored -->
+ <!--
+ The Audio part of the profile will not be used since time lapse mode
+ does not capture audio
+ -->
<Audio codec="aac"
- bitRate="156000"
+ bitRate="256000"
sampleRate="48000"
channels="2" />
</EncoderProfile>
- <ImageEncoding quality="95" />
+ <ImageEncoding quality="95" />
<ImageEncoding quality="80" />
<ImageEncoding quality="70" />
<ImageDecoding memCap="20000000" />
</CamcorderProfiles>
- <!-- Front Camera -->
- <CamcorderProfiles cameraId="1" startOffsetMs="300">
- <EncoderProfile quality="low" fileFormat="3gp" duration="30">
+ <!-- Front Camera -->
+ <CamcorderProfiles cameraId="1" startOffsetMs="700">
+
+ <EncoderProfile quality="low" fileFormat="mp4" duration="30">
<Video codec="h264"
- bitRate="192000"
+ bitRate="384000"
width="176"
height="144"
frameRate="30" />
- <Audio codec="amrnb"
- bitRate="12200"
- sampleRate="8000"
- channels="1" />
+ <Audio codec="aac"
+ bitRate="128000"
+ sampleRate="48000"
+ channels="2" />
</EncoderProfile>
<EncoderProfile quality="high" fileFormat="mp4" duration="30">
<Video codec="h264"
- bitRate="20000000"
+ bitRate="17000000"
width="1920"
height="1080"
frameRate="30" />
<Audio codec="aac"
- bitRate="156000"
+ bitRate="256000"
sampleRate="48000"
channels="2" />
</EncoderProfile>
- <EncoderProfile quality="qvga" fileFormat="mp4" duration="60">
+ <EncoderProfile quality="qcif" fileFormat="mp4" duration="30">
<Video codec="h264"
- bitRate="512000"
+ bitRate="384000"
+ width="176"
+ height="144"
+ frameRate="30" />
+
+ <Audio codec="aac"
+ bitRate="128000"
+ sampleRate="48000"
+ 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="156000"
+ bitRate="128000"
sampleRate="48000"
channels="2" />
</EncoderProfile>
- <EncoderProfile quality="cif" fileFormat="3gp" duration="30">
- <Video codec="h264"
- bitRate="720000"
- width="352"
- height="288"
- frameRate="30" />
-
- <Audio codec="amrnb"
- bitRate="12200"
- sampleRate="8000"
- channels="1" />
- </EncoderProfile>
-
- <EncoderProfile quality="fwvga" fileFormat="mp4" duration="30">
- <Video codec="h264"
- bitRate="2000000"
- width="864"
- height="480"
- frameRate="30" />
-
- <!-- audio setting is ignored -->
- <Audio codec="amrnb"
- bitRate="12200"
- sampleRate="8000"
- channels="1" />
- </EncoderProfile>
-
<EncoderProfile quality="480p" fileFormat="mp4" duration="30">
<Video codec="h264"
- bitRate="2000000"
+ bitRate="3449000"
width="720"
height="480"
frameRate="30" />
<Audio codec="aac"
- bitRate="156000"
+ bitRate="256000"
sampleRate="48000"
channels="2" />
</EncoderProfile>
<EncoderProfile quality="720p" fileFormat="mp4" duration="30">
<Video codec="h264"
- bitRate="14000000"
+ bitRate="12000000"
width="1280"
height="720"
frameRate="30" />
<Audio codec="aac"
- bitRate="156000"
+ bitRate="256000"
sampleRate="48000"
channels="2" />
</EncoderProfile>
<EncoderProfile quality="1080p" fileFormat="mp4" duration="30">
<Video codec="h264"
- bitRate="20000000"
+ bitRate="17000000"
width="1920"
height="1080"
frameRate="30" />
<Audio codec="aac"
- bitRate="156000"
- sampleRate="48000"
- channels="2" />
- </EncoderProfile>
-
- <EncoderProfile quality="qcif" fileFormat="3gp" duration="30">
- <Video codec="h264"
- bitRate="192000"
- width="176"
- height="144"
- frameRate="30" />
-
- <Audio codec="amrnb"
- bitRate="12200"
- sampleRate="8000"
- channels="1" />
- </EncoderProfile>
-
- <EncoderProfile quality="wvga" fileFormat="mp4" duration="30">
- <Video codec="h264"
- bitRate="2000000"
- width="800"
- height="480"
- frameRate="30" />
-
- <Audio codec="aac"
- bitRate="156000"
- sampleRate="48000"
- channels="2" />
- </EncoderProfile>
-
- <EncoderProfile quality="vga" fileFormat="mp4" duration="30">
- <Video codec="h264"
- bitRate="2000000"
- width="640"
- height="480"
- frameRate="30" />
-
- <Audio codec="aac"
- bitRate="156000"
+ bitRate="256000"
sampleRate="48000"
channels="2" />
</EncoderProfile>
<EncoderProfile quality="timelapselow" fileFormat="mp4" duration="30">
<Video codec="h264"
- bitRate="192000"
+ bitRate="384000"
width="176"
height="144"
frameRate="30" />
- <!-- audio setting is ignored -->
- <Audio codec="amrnb"
- bitRate="12200"
- sampleRate="8000"
- channels="1" />
+ <!--
+ 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="timelapsehigh" fileFormat="mp4" duration="30">
<Video codec="h264"
- bitRate="20000000"
+ bitRate="17000000"
width="1920"
height="1080"
frameRate="30" />
- <!-- audio setting is ignored -->
+ <!--
+ The Audio part of the profile will not be used since time lapse mode
+ does not capture audio
+ -->
<Audio codec="aac"
- bitRate="156000"
+ bitRate="256000"
sampleRate="48000"
channels="2" />
</EncoderProfile>
<EncoderProfile quality="timelapseqcif" fileFormat="mp4" duration="30">
<Video codec="h264"
- bitRate="192000"
+ bitRate="384000"
width="176"
height="144"
frameRate="30" />
- <!-- audio setting is ignored -->
- <Audio codec="amrnb"
- bitRate="12200"
- sampleRate="8000"
- channels="1" />
- </EncoderProfile>
-
- <EncoderProfile quality="timelapsecif" fileFormat="mp4" duration="30">
- <Video codec="h264"
- bitRate="1200000"
- width="352"
- height="288"
- frameRate="30" />
-
- <!-- audio setting is ignored -->
+ <!--
+ The Audio part of the profile will not be used since time lapse mode
+ does not capture audio
+ -->
<Audio codec="aac"
- bitRate="96000"
- sampleRate="48000"
- channels="1" />
- </EncoderProfile>
-
- <EncoderProfile quality="timelapseqvga" fileFormat="mp4" duration="30">
- <Video codec="h264"
- bitRate="512000"
- width="320"
- height="240"
- frameRate="30" />
-
- <!-- audio setting is ignored -->
- <Audio codec="amrnb"
- bitRate="12200"
- sampleRate="8000"
- channels="1" />
- </EncoderProfile>
-
- <EncoderProfile quality="timelapsewqvga" fileFormat="mp4" duration="30">
- <Video codec="h264"
- bitRate="720000"
- width="432"
- height="240"
- frameRate="30" />
-
- <!-- audio setting is ignored -->
- <Audio codec="amrnb"
- bitRate="12200"
- sampleRate="8000"
- channels="1" />
- </EncoderProfile>
-
- <EncoderProfile quality="timelapsevga" fileFormat="mp4" duration="30">
- <Video codec="h264"
- bitRate="2000000"
- width="640"
- height="480"
- frameRate="30" />
-
- <!-- audio setting is ignored -->
- <Audio codec="amrnb"
- bitRate="12200"
- sampleRate="8000"
- channels="1" />
- </EncoderProfile>
-
- <EncoderProfile quality="timelapsewvga" fileFormat="mp4" duration="30">
- <Video codec="h264"
- bitRate="2000000"
- width="800"
- height="480"
- frameRate="30" />
-
- <!-- audio setting is ignored -->
- <Audio codec="amrnb"
- bitRate="12200"
- sampleRate="8000"
- channels="1" />
- </EncoderProfile>
-
- <EncoderProfile quality="timelapsefwvga" fileFormat="mp4" duration="30">
- <Video codec="h264"
- bitRate="2000000"
- width="864"
- height="480"
- frameRate="30" />
-
- <!-- audio setting is ignored -->
- <Audio codec="amrnb"
- bitRate="12200"
- sampleRate="8000"
- channels="1" />
- </EncoderProfile>
-
- <EncoderProfile quality="timelapse480p" fileFormat="mp4" duration="30">
- <Video codec="h264"
- bitRate="5000000"
- width="720"
- height="480"
- frameRate="30" />
-
- <!-- audio setting is ignored -->
- <Audio codec="aac"
- bitRate="96000"
- sampleRate="48000"
- channels="1" />
- </EncoderProfile>
-
- <EncoderProfile quality="timelapse720p" fileFormat="mp4" duration="30">
- <Video codec="h264"
- bitRate="8000000"
- width="1280"
- height="720"
- frameRate="30" />
-
- <!-- audio setting is ignored -->
- <Audio codec="aac"
- bitRate="96000"
- sampleRate="48000"
- channels="1" />
- </EncoderProfile>
-
- <EncoderProfile quality="timelapse1080p" fileFormat="mp4" duration="30">
- <Video codec="h264"
- bitRate="20000000"
- width="1920"
- height="1080"
- frameRate="30" />
-
- <!-- audio setting is ignored -->
- <Audio codec="aac"
- bitRate="156000"
+ bitRate="128000"
sampleRate="48000"
channels="2" />
</EncoderProfile>
- <ImageEncoding quality="95" />
- <ImageEncoding quality="80" />
- <ImageEncoding quality="70" />
- <ImageDecoding memCap="20000000" />
+ <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="3449000"
+ width="720"
+ height="480"
+ frameRate="30" />
+
+ <!--
+ The Audio part of the profile will not be used since time lapse mode
+ does not capture audio
+ -->
+ <Audio codec="aac"
+ bitRate="256000"
+ sampleRate="48000"
+ channels="2" />
+ </EncoderProfile>
+
+ <EncoderProfile quality="timelapse720p" fileFormat="mp4" duration="30">
+ <Video codec="h264"
+ bitRate="12000000"
+ width="1280"
+ height="720"
+ frameRate="30" />
+
+ <!--
+ The Audio part of the profile will not be used since time lapse mode
+ does not capture audio
+ -->
+ <Audio codec="aac"
+ bitRate="256000"
+ sampleRate="48000"
+ channels="2" />
+ </EncoderProfile>
+
+ <EncoderProfile quality="timelapse1080p" fileFormat="mp4" duration="30">
+ <Video codec="h264"
+ bitRate="17000000"
+ width="1920"
+ height="1080"
+ frameRate="30" />
+
+ <!--
+ The Audio part of the profile will not be used since time lapse mode
+ does not capture audio
+ -->
+ <Audio codec="aac"
+ bitRate="256000"
+ sampleRate="48000"
+ channels="2" />
+ </EncoderProfile>
+
+ <ImageEncoding quality="95" />
+ <ImageEncoding quality="80" />
+ <ImageEncoding quality="70" />
+ <ImageDecoding memCap="20000000" />
</CamcorderProfiles>
@@ -747,16 +544,16 @@
<VideoEncoderCap name="h264" enabled="true"
minBitRate="64000" maxBitRate="20000000"
minFrameWidth="176" maxFrameWidth="1920"
- minFrameHeight="144" maxFrameHeight="1088"
+ minFrameHeight="144" maxFrameHeight="1080"
minFrameRate="15" maxFrameRate="30"
maxHFRFrameWidth="1280" maxHFRFrameHeight="720"
maxHFRMode="60" />
<VideoEncoderCap name="h263" enabled="true"
- minBitRate="64000" maxBitRate="2000000"
+ minBitRate="64000" maxBitRate="1000000"
minFrameWidth="176" maxFrameWidth="800"
minFrameHeight="144" maxFrameHeight="480"
- minFrameRate="15" maxFrameRate="30"
+ minFrameRate="1" maxFrameRate="30"
maxHFRFrameWidth="0" maxHFRFrameHeight="0"
maxHFRMode="0" />
@@ -764,24 +561,14 @@
minBitRate="64000" maxBitRate="20000000"
minFrameWidth="176" maxFrameWidth="1920"
minFrameHeight="144" maxFrameHeight="1088"
- minFrameRate="15" maxFrameRate="30"
+ minFrameRate="1" maxFrameRate="30"
maxHFRFrameWidth="0" maxHFRFrameHeight="0"
maxHFRMode="0" />
<AudioEncoderCap name="aac" enabled="true"
- minBitRate="8000" maxBitRate="96000"
+ minBitRate="8192" maxBitRate="256000"
minSampleRate="8000" maxSampleRate="48000"
- minChannels="1" maxChannels="6" />
-
- <AudioEncoderCap name="heaac" enabled="true"
- minBitRate="8000" maxBitRate="64000"
- minSampleRate="16000" maxSampleRate="48000"
- minChannels="1" maxChannels="1" />
-
- <AudioEncoderCap name="aaceld" enabled="true"
- minBitRate="16000" maxBitRate="192000"
- minSampleRate="16000" maxSampleRate="48000"
- minChannels="1" maxChannels="1" />
+ minChannels="1" maxChannels="2" />
<AudioEncoderCap name="amrwb" enabled="true"
minBitRate="6600" maxBitRate="23850"
@@ -805,9 +592,8 @@
for TEST applications. For other applications, we do
not perform any checks at all.
-->
- <VideoDecoderCap name="wmv" enabled="true"/>
- <AudioDecoderCap name="wma" enabled="true"/>
-
+ <VideoDecoderCap name="wmv" enabled="false"/>
+ <AudioDecoderCap name="wma" enabled="false"/>
<!--
The VideoEditor Capability configuration:
- maxInputFrameWidth: maximum video width of imported video clip.
@@ -819,9 +605,9 @@
For this platform, it allows maximum 30MB(3MB per 1080p frame x 10
frames) memory.
-->
- <VideoEditorCap maxInputFrameWidth="1280"
- maxInputFrameHeight="720" maxOutputFrameWidth="1280"
- maxOutputFrameHeight="720" maxPrefetchYUVFrames="10"/>
+ <VideoEditorCap maxInputFrameWidth="1920"
+ maxInputFrameHeight="1088" maxOutputFrameWidth="1920"
+ maxOutputFrameHeight="1080" maxPrefetchYUVFrames="10"/>
<!--
The VideoEditor Export codec profile and level values
correspond to the values in OMX_Video.h.