diff options
| author | Dave Burke <daveburke@google.com> | 2012-04-30 12:45:56 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-04-30 12:45:56 -0700 |
| commit | 5af5a1dde2bc5c8f7d97c7465e2d809ab615df63 (patch) | |
| tree | 9ef4e8516db748177a8bf326791018bc354a0104 | |
| parent | ecc13f4e251ac879da7f844013e034ebbe6cb14c (diff) | |
| parent | 8acb868d5d02ea1b23466e76cc6fab7379f11696 (diff) | |
| download | device_samsung_tuna-5af5a1dde2bc5c8f7d97c7465e2d809ab615df63.zip device_samsung_tuna-5af5a1dde2bc5c8f7d97c7465e2d809ab615df63.tar.gz device_samsung_tuna-5af5a1dde2bc5c8f7d97c7465e2d809ab615df63.tar.bz2 | |
Merge "Updated media_profiles to standard bit-rates, added HE-AAC." into jb-dev
| -rwxr-xr-x | media_profiles.xml | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/media_profiles.xml b/media_profiles.xml index de210d7..d34bb05 100755 --- 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> @@ -357,13 +357,18 @@ minFrameRate="15" 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" |