Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Lajos Molnar
2014-12-05 00:21:01 +00:00
committed by Android (Google) Code Review
parent 6074797441 610e288de6
commit bcaa315d48
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
media/java/android/media/MediaCodecInfo.java
View File

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