summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRicardo Cerqueira <cyanogenmod@cerqueira.org>2014-04-17 20:09:14 +0100
committerRicardo Cerqueira <cyanogenmod@cerqueira.org>2014-04-17 20:10:48 +0100
commit3de122f91108b3aec9db6eb26141f1ad080c0451 (patch)
treeb500190188b89c5a9371b83f06f1734d4ac0c0a7
parent9e716cab7c5878bbcd3dabd004a20ad5320f8fee (diff)
downloaddevice_samsung_smdk4412-common-3de122f91108b3aec9db6eb26141f1ad080c0451.zip
device_samsung_smdk4412-common-3de122f91108b3aec9db6eb26141f1ad080c0451.tar.gz
device_samsung_smdk4412-common-3de122f91108b3aec9db6eb26141f1ad080c0451.tar.bz2
media_profiles: Remove unused profiles
Fixup the table to pass media testing (and get better compatibility with 3rd party apps) Change-Id: I312ffe1b64043a00a9a89ec6b985e9213fb05c26
-rw-r--r--configs/media_profiles.xml124
1 files changed, 9 insertions, 115 deletions
diff --git a/configs/media_profiles.xml b/configs/media_profiles.xml
index 2de9af9..4dc5f0d 100644
--- a/configs/media_profiles.xml
+++ b/configs/media_profiles.xml
@@ -25,6 +25,7 @@
<!ATTLIST EncoderProfile quality (timelapse1080p|timelapse720p|timelapse480p|timelapsehigh|timelapselow|480p|qcif|high|low) #REQUIRED>
<!ATTLIST EncoderProfile fileFormat (mp4|3gp) #REQUIRED>
<!ATTLIST EncoderProfile duration (30|60) #REQUIRED>
+ <!ATTLIST EncoderProfile cameraId (0|1) #REQUIRED>
<!ELEMENT Video EMPTY>
<!ATTLIST Video codec (h264|h263|m4v) #REQUIRED>
<!ATTLIST Video bitRate CDATA #REQUIRED>
@@ -89,25 +90,12 @@
<!-- Back Camera -->
<CamcorderProfiles cameraId="0">
- <EncoderProfile quality="low" fileFormat="mp4" duration="30">
+ <EncoderProfile quality="qvga" fileFormat="mp4" duration="30">
<Video codec="h264"
bitRate="384000"
- width="176"
- height="144"
- frameRate="30" />
-
- <Audio codec="aac"
- bitRate="128000"
- sampleRate="48000"
- channels="2" />
- </EncoderProfile>
-
- <EncoderProfile quality="qcif" fileFormat="mp4" duration="30">
- <Video codec="h264"
- bitRate="384000"
- width="176"
- height="144"
- frameRate="30" />
+ width="320"
+ height="240"
+ frameRate="15" />
<Audio codec="aac"
bitRate="128000"
@@ -154,40 +142,6 @@
channels="2" />
</EncoderProfile>
- <EncoderProfile quality="timelapselow" fileFormat="3gp" duration="30">
- <Video codec="h264"
- bitRate="384000"
- width="176"
- height="144"
- 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="1" />
- </EncoderProfile>
-
- <EncoderProfile quality="timelapsehigh" 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="128000"
- sampleRate="48000"
- channels="1" />
- </EncoderProfile>
-
<EncoderProfile quality="timelapseqcif" fileFormat="3gp" duration="30">
<Video codec="h264"
bitRate="384000"
@@ -266,38 +220,12 @@
<!-- Front Camera -->
<CamcorderProfiles cameraId="1">
- <EncoderProfile quality="low" fileFormat="3gp" duration="30">
- <Video codec="h264"
- bitRate="384000"
- width="176"
- height="144"
- frameRate="30" />
-
- <Audio codec="aac"
- bitRate="128000"
- sampleRate="48000"
- channels="1" />
- </EncoderProfile>
-
- <EncoderProfile quality="high" fileFormat="mp4" duration="30">
- <Video codec="h264"
- bitRate="3078000"
- width="640"
- height="480"
- frameRate="30" />
-
- <Audio codec="aac"
- bitRate="128000"
- sampleRate="48000"
- channels="1" />
- </EncoderProfile>
-
- <EncoderProfile quality="qcif" fileFormat="3gp" duration="30">
+ <EncoderProfile quality="qvga" fileFormat="3gp" duration="30">
<Video codec="h264"
bitRate="384000"
- width="176"
- height="144"
- frameRate="30" />
+ width="320"
+ height="240"
+ frameRate="15" />
<Audio codec="aac"
bitRate="128000"
@@ -318,40 +246,6 @@
channels="1" />
</EncoderProfile>
- <EncoderProfile quality="timelapselow" fileFormat="3gp" duration="30">
- <Video codec="h264"
- bitRate="384000"
- width="176"
- height="144"
- 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="1" />
- </EncoderProfile>
-
- <EncoderProfile quality="timelapsehigh" fileFormat="mp4" duration="30">
- <Video codec="h264"
- bitRate="3078000"
- width="640"
- 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="128000"
- sampleRate="48000"
- channels="1" />
- </EncoderProfile>
-
<EncoderProfile quality="timelapseqcif" fileFormat="3gp" duration="30">
<Video codec="h264"
bitRate="384000"