am 38935e6e: Merge "media: allow full range of Vorbis sampling rates"

* commit '38935e6eafc90d491e3a02e15ebb0890b7731473':
  media: allow full range of Vorbis sampling rates
This commit is contained in:
Lajos Molnar
2014-12-08 18:07:49 +00:00
committed by Android Git Automerger

View File

@@ -648,7 +648,7 @@ public final class MediaCodecInfo {
maxChannels = 48;
} else if (mime.equalsIgnoreCase(MediaFormat.MIMETYPE_AUDIO_VORBIS)) {
bitRates = Range.create(32000, 500000);
sampleRates = new int[] { 8000, 12000, 16000, 24000, 48000, 192000 };
sampleRateRange = Range.create(8000, 192000);
maxChannels = 255;
} else if (mime.equalsIgnoreCase(MediaFormat.MIMETYPE_AUDIO_OPUS)) {
bitRates = Range.create(6000, 510000);