diff options
| author | Lajos Molnar <lajos@google.com> | 2014-12-08 19:12:07 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-08 19:12:07 +0000 |
| commit | 967da505b2cb96ed85161fd940dbecb467bfe38c (patch) | |
| tree | 1749c431e157181edb80c3452d0a1ae70fb8d167 | |
| parent | 3f771d879cb75a4d8e3b1a2d98f02f76c16cccd1 (diff) | |
| parent | 2b6dc199432a574d8655734865b0d75d2140fd8c (diff) | |
| download | frameworks_base-967da505b2cb96ed85161fd940dbecb467bfe38c.zip frameworks_base-967da505b2cb96ed85161fd940dbecb467bfe38c.tar.gz frameworks_base-967da505b2cb96ed85161fd940dbecb467bfe38c.tar.bz2 | |
am 2b6dc199: am bcaa315d: Merge "media: allow full range of Vorbis sampling rates" into lmp-mr1-dev
* commit '2b6dc199432a574d8655734865b0d75d2140fd8c':
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); |