commit bcaa315d488c18deb1ab4c6169dc4b4236982990
author Lajos Molnar <lajos@google.com> Fri Dec 05 00:21:01 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Dec 05 00:21:03 2014 +0000
tree e0eb9d040721668337cdd64c5b09b01beb960807
parent 6074797441839964ff8ea4304a453a84d49204ec
parent 610e288de6727d9be3277777e6c5abca4b18aa86

Merge "media: allow full range of Vorbis sampling rates" into lmp-mr1-dev

media/java/android/media/MediaCodecInfo.java

diff --git a/media/java/android/media/MediaCodecInfo.java b/media/java/android/media/MediaCodecInfo.java
index 1029fcc..4513643 100644
--- a/media/java/android/media/MediaCodecInfo.java
+++ b/media/java/android/media/MediaCodecInfo.java
@@ -648,7 +648,7 @@
                 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);