summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/data
diff options
context:
space:
mode:
authorMarco Nelissen <marcone@google.com>2015-03-20 09:15:11 -0700
committerMarco Nelissen <marcone@google.com>2015-03-20 09:15:11 -0700
commit17c39e708ed657b8fa66f8acce5128e51696915c (patch)
treeec0f96c66e44c39e83800bb7a02792ab57781e99 /media/libstagefright/data
parent340cebdaa2875ba2ab9725b81218ebc59d84164b (diff)
downloadframeworks_av-17c39e708ed657b8fa66f8acce5128e51696915c.zip
frameworks_av-17c39e708ed657b8fa66f8acce5128e51696915c.tar.gz
frameworks_av-17c39e708ed657b8fa66f8acce5128e51696915c.tar.bz2
ulaw and alaw aren't limited to 8kHz
Bug: https://code.google.com/p/android/issues/detail?id=158490 Change-Id: Ib30e156c99a997db861bb85e17244a5effdd55cf
Diffstat (limited to 'media/libstagefright/data')
-rw-r--r--media/libstagefright/data/media_codecs_google_audio.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/media/libstagefright/data/media_codecs_google_audio.xml b/media/libstagefright/data/media_codecs_google_audio.xml
index a06684b..b957b0c 100644
--- a/media/libstagefright/data/media_codecs_google_audio.xml
+++ b/media/libstagefright/data/media_codecs_google_audio.xml
@@ -38,12 +38,12 @@
</MediaCodec>
<MediaCodec name="OMX.google.g711.alaw.decoder" type="audio/g711-alaw">
<Limit name="channel-count" max="1" />
- <Limit name="sample-rate" ranges="8000" />
+ <Limit name="sample-rate" ranges="8000-48000" />
<Limit name="bitrate" range="64000" />
</MediaCodec>
<MediaCodec name="OMX.google.g711.mlaw.decoder" type="audio/g711-mlaw">
<Limit name="channel-count" max="1" />
- <Limit name="sample-rate" ranges="8000" />
+ <Limit name="sample-rate" ranges="8000-48000" />
<Limit name="bitrate" range="64000" />
</MediaCodec>
<MediaCodec name="OMX.google.vorbis.decoder" type="audio/vorbis">