summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Burke <daveburke@google.com>2012-04-28 22:05:45 -0700
committerDave Burke <daveburke@google.com>2012-04-30 08:56:00 -0700
commit57ccb5e9d2302fb78a6706e75b896606a8d9166c (patch)
tree8f5a29d11ef82ce0c0b3348a67547ec68064fe6b
parent4b54242aeef9ff984dd495505b074ff9a9e311fd (diff)
downloadwingray-57ccb5e9d2302fb78a6706e75b896606a8d9166c.tar.gz
Updated media_profiles to standard bit-rates, added HE-AAC.
Bug: 6275957 Change-Id: Ibe20e5e24e1c20fc6f3b8d8409150f6c1881c645
-rw-r--r--media_profiles.xml13
1 files changed, 9 insertions, 4 deletions
diff --git a/media_profiles.xml b/media_profiles.xml
index 777bccc..9157750 100644
--- a/media_profiles.xml
+++ b/media_profiles.xml
@@ -56,7 +56,7 @@
<!ATTLIST VideoEncoderCap minFrameRate CDATA #REQUIRED>
<!ATTLIST VideoEncoderCap maxFrameRate CDATA #REQUIRED>
<!ELEMENT AudioEncoderCap EMPTY>
- <!ATTLIST AudioEncoderCap name (amrnb|amrwb|aac|aaceld|wma) #REQUIRED>
+ <!ATTLIST AudioEncoderCap name (amrnb|amrwb|aac|heaac|aaceld|wma) #REQUIRED>
<!ATTLIST AudioEncoderCap enabled (true|false) #REQUIRED>
<!ATTLIST AudioEncoderCap minBitRate CDATA #REQUIRED>
<!ATTLIST AudioEncoderCap maxBitRate CDATA #REQUIRED>
@@ -359,13 +359,18 @@
minFrameRate="1" maxFrameRate="30" />
<AudioEncoderCap name="aac" enabled="true"
- minBitRate="8000" maxBitRate="128000"
+ minBitRate="758" maxBitRate="288000"
minSampleRate="8000" maxSampleRate="48000"
minChannels="1" maxChannels="1" />
+ <AudioEncoderCap name="heaac" enabled="true"
+ minBitRate="8000" maxBitRate="64000"
+ minSampleRate="16000" maxSampleRate="48000"
+ minChannels="1" maxChannels="1" />
+
<AudioEncoderCap name="aaceld" enabled="true"
- minBitRate="8000" maxBitRate="384000"
- minSampleRate="8000" maxSampleRate="48000"
+ minBitRate="16000" maxBitRate="192000"
+ minSampleRate="16000" maxSampleRate="48000"
minChannels="1" maxChannels="1" />
<AudioEncoderCap name="amrwb" enabled="true"