diff options
| author | Lajos Molnar <lajos@google.com> | 2014-12-13 02:07:20 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-13 02:07:20 +0000 |
| commit | 1896bbb7797842960f37a6bd0f5654f046e9ff45 (patch) | |
| tree | 61d5e0df62b6d53b31090eafd4be14f893df9d93 /media | |
| parent | f750da42246d064c838904869d2d6ff9332c6158 (diff) | |
| parent | d4c0fef88384128acc4c986fe7d3026996d4a96b (diff) | |
| download | frameworks_av-1896bbb7797842960f37a6bd0f5654f046e9ff45.zip frameworks_av-1896bbb7797842960f37a6bd0f5654f046e9ff45.tar.gz frameworks_av-1896bbb7797842960f37a6bd0f5654f046e9ff45.tar.bz2 | |
am d4c0fef8: am 554016a3: Merge "stagefright: advertise 8kHz AAC decoder support" into lmp-mr1-dev
* commit 'd4c0fef88384128acc4c986fe7d3026996d4a96b':
stagefright: advertise 8kHz AAC decoder support
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/data/media_codecs_google_audio.xml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/media/libstagefright/data/media_codecs_google_audio.xml b/media/libstagefright/data/media_codecs_google_audio.xml index 85f6615..a06684b 100644 --- a/media/libstagefright/data/media_codecs_google_audio.xml +++ b/media/libstagefright/data/media_codecs_google_audio.xml @@ -65,7 +65,8 @@ <Encoders> <MediaCodec name="OMX.google.aac.encoder" type="audio/mp4a-latm"> <Limit name="channel-count" max="6" /> - <Limit name="sample-rate" ranges="11025,12000,16000,22050,24000,32000,44100,48000" /> + <Limit name="sample-rate" ranges="8000,11025,12000,16000,22050,24000,32000,44100,48000" /> + <!-- also may support 64000, 88200 and 96000 Hz --> <Limit name="bitrate" range="8000-960000" /> </MediaCodec> <MediaCodec name="OMX.google.amrnb.encoder" type="audio/3gpp"> |