msm8974: Enable new sample rate representation
and overhaul profiles
Change-Id: I3d58897803fc00fd2787fe421692438338d0f45d
Conflicts:
BoardConfigCommon.mk
diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index f0b431d..ca2349e 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -69,6 +69,7 @@
AUDIO_FEATURE_ENABLED_MULTI_VOICE_SESSIONS := true
AUDIO_FEATURE_ENABLED_PROXY_DEVICE := true
AUDIO_FEATURE_PCM_IOCTL_ENABLED := true
+AUDIO_FEATURE_ENABLED_NEW_SAMPLE_RATE := true
# Bluetooth
BOARD_HAVE_BLUETOOTH := true
diff --git a/configs/media_profiles.xml b/configs/media_profiles.xml
index c709e91..426ca04 100644
--- a/configs/media_profiles.xml
+++ b/configs/media_profiles.xml
@@ -2,13 +2,10 @@
<!-- Copyright (C) 2010 The Android Open Source Project
Copyright (C) 2012-2013 The Linux Foundation. All rights reserved.
Not a contribution.
-
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
-
http://www.apache.org/licenses/LICENSE-2.0
-
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -172,6 +169,19 @@
channels="2" />
</EncoderProfile>
+ <EncoderProfile quality="fwvga" fileFormat="mp4" duration="30">
+ <Video codec="h264"
+ bitRate="2000000"
+ width="864"
+ height="480"
+ frameRate="30" />
+
+ <Audio codec="aac"
+ bitRate="156000"
+ sampleRate="48000"
+ channels="2" />
+ </EncoderProfile>
+
<EncoderProfile quality="480p" fileFormat="mp4" duration="30">
<Video codec="h264"
bitRate="2000000"
@@ -211,19 +221,6 @@
channels="2" />
</EncoderProfile>
- <EncoderProfile quality="1440p" fileFormat="mp4" duration="30">
- <Video codec="h264"
- bitRate="40000000"
- width="2560"
- height="1440"
- frameRate="30" />
-
- <Audio codec="aac"
- bitRate="320000"
- sampleRate="48000"
- channels="2" />
- </EncoderProfile>
-
<EncoderProfile quality="2160p" fileFormat="mp4" duration="30">
<Video codec="h264"
bitRate="65000000"
@@ -349,6 +346,20 @@
channels="2" />
</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="aac"
+ bitRate="156000"
+ sampleRate="48000"
+ channels="2" />
+ </EncoderProfile>
+
<EncoderProfile quality="timelapse480p" fileFormat="mp4" duration="30">
<Video codec="h264"
bitRate="2000000"
@@ -391,20 +402,6 @@
channels="2" />
</EncoderProfile>
- <EncoderProfile quality="timelapse1440p" fileFormat="mp4" duration="30">
- <Video codec="h264"
- bitRate="40000000"
- width="2560"
- height="1440"
- frameRate="30" />
-
- <!-- audio setting is ignored -->
- <Audio codec="aac"
- bitRate="320000"
- sampleRate="48000"
- channels="2" />
- </EncoderProfile>
-
<EncoderProfile quality="timelapse2160p" fileFormat="mp4" duration="30">
<Video codec="h264"
bitRate="65000000"
@@ -457,13 +454,13 @@
<EncoderProfile quality="high" fileFormat="mp4" duration="30">
<Video codec="h264"
- bitRate="40000000"
- width="2560"
- height="1440"
+ bitRate="14000000"
+ width="1280"
+ height="720"
frameRate="30" />
<Audio codec="aac"
- bitRate="320000"
+ bitRate="156000"
sampleRate="48000"
channels="2" />
</EncoderProfile>
@@ -533,6 +530,19 @@
channels="2" />
</EncoderProfile>
+ <EncoderProfile quality="fwvga" fileFormat="mp4" duration="30">
+ <Video codec="h264"
+ bitRate="2000000"
+ width="864"
+ height="480"
+ frameRate="30" />
+
+ <Audio codec="aac"
+ bitRate="156000"
+ sampleRate="48000"
+ channels="2" />
+ </EncoderProfile>
+
<EncoderProfile quality="480p" fileFormat="mp4" duration="30">
<Video codec="h264"
bitRate="2000000"
@@ -559,32 +569,6 @@
channels="2" />
</EncoderProfile>
- <EncoderProfile quality="1080p" fileFormat="mp4" duration="30">
- <Video codec="h264"
- bitRate="20000000"
- width="1920"
- height="1080"
- frameRate="30" />
-
- <Audio codec="aac"
- bitRate="156000"
- sampleRate="48000"
- channels="2" />
- </EncoderProfile>
-
- <EncoderProfile quality="1440p" fileFormat="mp4" duration="30">
- <Video codec="h264"
- bitRate="40000000"
- width="2560"
- height="1440"
- frameRate="30" />
-
- <Audio codec="aac"
- bitRate="320000"
- sampleRate="48000"
- channels="2" />
- </EncoderProfile>
-
<EncoderProfile quality="timelapselow" fileFormat="mp4" duration="30">
<Video codec="h264"
bitRate="512000"
@@ -601,14 +585,14 @@
<EncoderProfile quality="timelapsehigh" fileFormat="mp4" duration="30">
<Video codec="h264"
- bitRate="40000000"
- width="2560"
- height="1440"
+ bitRate="14000000"
+ width="1280"
+ height="720"
frameRate="30" />
<!-- audio setting is ignored -->
<Audio codec="aac"
- bitRate="320000"
+ bitRate="156000"
sampleRate="48000"
channels="2" />
</EncoderProfile>
@@ -683,6 +667,20 @@
channels="2" />
</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="aac"
+ bitRate="156000"
+ sampleRate="48000"
+ channels="2" />
+ </EncoderProfile>
+
<EncoderProfile quality="timelapse480p" fileFormat="mp4" duration="30">
<Video codec="h264"
bitRate="5000000"
@@ -711,34 +709,6 @@
channels="2" />
</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"
- sampleRate="48000"
- channels="2" />
- </EncoderProfile>
-
- <EncoderProfile quality="timelapse1440p" fileFormat="mp4" duration="30">
- <Video codec="h264"
- bitRate="40000000"
- width="2560"
- height="1440"
- frameRate="30" />
-
- <!-- audio setting is ignored -->
- <Audio codec="aac"
- bitRate="320000"
- sampleRate="48000"
- channels="2" />
- </EncoderProfile>
-
<ImageEncoding quality="95" />
<ImageEncoding quality="80" />
<ImageEncoding quality="70" />