diff options
author | James Dong <jdong@google.com> | 2011-09-06 17:41:03 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-09-06 17:41:03 -0700 |
commit | 6fbf877df8495e084cab3e0d0916e6fcb19c902d (patch) | |
tree | 188860baf49593c952c6ebcc15d7181f92992161 | |
parent | c9660f0bc3766ec1202c955bc9e2e6ff80986b6d (diff) | |
parent | f04348eec47d39b383b904939f167406c0a3d5d0 (diff) | |
download | device_samsung_tuna-6fbf877df8495e084cab3e0d0916e6fcb19c902d.zip device_samsung_tuna-6fbf877df8495e084cab3e0d0916e6fcb19c902d.tar.gz device_samsung_tuna-6fbf877df8495e084cab3e0d0916e6fcb19c902d.tar.bz2 |
Merge "Add 720p video recording profile for back camera"
-rwxr-xr-x | media_profiles.xml | 73 |
1 files changed, 53 insertions, 20 deletions
diff --git a/media_profiles.xml b/media_profiles.xml index 425c761..c62f9c4 100755 --- a/media_profiles.xml +++ b/media_profiles.xml @@ -107,8 +107,8 @@ height="288" frameRate="30" /> <Audio codec="aac" - bitRate="12200" - sampleRate="8000" + bitRate="96000" + sampleRate="48000" channels="1" /> </EncoderProfile> @@ -119,8 +119,20 @@ height="480" frameRate="30" /> <Audio codec="aac" - bitRate="12200" - sampleRate="8000" + bitRate="96000" + sampleRate="48000" + channels="1" /> + </EncoderProfile> + + <EncoderProfile quality="720p" fileFormat="mp4" duration="30"> + <Video codec="h264" + bitRate="8000000" + width="1280" + height="720" + frameRate="30" /> + <Audio codec="aac" + bitRate="96000" + sampleRate="48000" channels="1" /> </EncoderProfile> @@ -142,7 +154,8 @@ width="176" height="144" frameRate="30" /> - <Audio codec="aac" + <!-- audio setting is ignored --> + <Audio codec="amrnb" bitRate="12200" sampleRate="8000" channels="1" /> @@ -154,9 +167,10 @@ width="352" height="288" frameRate="30" /> + <!-- audio setting is ignored --> <Audio codec="aac" - bitRate="12200" - sampleRate="8000" + bitRate="96000" + sampleRate="48000" channels="1" /> </EncoderProfile> @@ -166,9 +180,23 @@ width="720" height="480" frameRate="30" /> + <!-- audio setting is ignored --> <Audio codec="aac" - bitRate="12200" - sampleRate="8000" + 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> @@ -178,6 +206,7 @@ width="1920" height="1080" frameRate="30" /> + <!-- audio setting is ignored --> <Audio codec="aac" bitRate="96000" sampleRate="48000" @@ -212,8 +241,8 @@ height="288" frameRate="30" /> <Audio codec="aac" - bitRate="12200" - sampleRate="8000" + bitRate="96000" + sampleRate="48000" channels="1" /> </EncoderProfile> @@ -224,14 +253,14 @@ height="480" frameRate="30" /> <Audio codec="aac" - bitRate="12200" - sampleRate="8000" + bitRate="96000" + sampleRate="48000" channels="1" /> </EncoderProfile> <EncoderProfile quality="720p" fileFormat="mp4" duration="30"> <Video codec="h264" - bitRate="12000000" + bitRate="8000000" width="1280" height="720" frameRate="30" /> @@ -247,7 +276,8 @@ width="176" height="144" frameRate="30" /> - <Audio codec="aac" + <!-- audio setting is ignored --> + <Audio codec="amrnb" bitRate="12200" sampleRate="8000" channels="1" /> @@ -259,9 +289,10 @@ width="352" height="288" frameRate="30" /> + <!-- audio setting is ignored --> <Audio codec="aac" - bitRate="12200" - sampleRate="8000" + bitRate="96000" + sampleRate="48000" channels="1" /> </EncoderProfile> @@ -271,18 +302,20 @@ width="720" height="480" frameRate="30" /> + <!-- audio setting is ignored --> <Audio codec="aac" - bitRate="12200" - sampleRate="8000" + bitRate="96000" + sampleRate="48000" channels="1" /> </EncoderProfile> <EncoderProfile quality="timelapse720p" fileFormat="mp4" duration="30"> <Video codec="h264" - bitRate="12000000" + bitRate="8000000" width="1280" height="720" frameRate="30" /> + <!-- audio setting is ignored --> <Audio codec="aac" bitRate="96000" sampleRate="48000" |