diff options
| author | Lajos Molnar <lajos@google.com> | 2014-12-05 00:27:15 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-05 00:27:15 +0000 |
| commit | 2b6dc199432a574d8655734865b0d75d2140fd8c (patch) | |
| tree | 82e0350fd9d46a02c8325301d2af952b48f7bc4e | |
| parent | d1133ba8855199b34c22b369f34c987a14c68b85 (diff) | |
| parent | bcaa315d488c18deb1ab4c6169dc4b4236982990 (diff) | |
| download | frameworks_base-2b6dc199432a574d8655734865b0d75d2140fd8c.zip frameworks_base-2b6dc199432a574d8655734865b0d75d2140fd8c.tar.gz frameworks_base-2b6dc199432a574d8655734865b0d75d2140fd8c.tar.bz2 | |
am bcaa315d: Merge "media: allow full range of Vorbis sampling rates" into lmp-mr1-dev
* commit 'bcaa315d488c18deb1ab4c6169dc4b4236982990':
media: allow full range of Vorbis sampling rates
| -rw-r--r-- | media/java/android/media/MediaCodecInfo.java | 2 |
1 files changed, 1 insertions, 1 deletions
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 @@ 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); |