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

Merge "AudioCapabilities: handle non-standard codec max input channels" into oc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-05-11 22:40:34 +00:00
committed by Android (Google) Code Review
parent 203ec51e2b f31d11341e
commit ffb563d82d
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1067,7 +1067,7 @@ public final class MediaCodecInfo {
private void applyLevelLimits() { private void applyLevelLimits() {
int[] sampleRates = null; int[] sampleRates = null;
Range<Integer> sampleRateRange = null, bitRates = null; Range<Integer> sampleRateRange = null, bitRates = null;
int maxChannels = 0; int maxChannels = MAX_INPUT_CHANNEL_COUNT;
String mime = mParent.getMimeType(); String mime = mParent.getMimeType();
if (mime.equalsIgnoreCase(MediaFormat.MIMETYPE_AUDIO_MPEG)) { if (mime.equalsIgnoreCase(MediaFormat.MIMETYPE_AUDIO_MPEG)) {
@@ -1160,6 +1160,8 @@ public final class MediaCodecInfo {
if (info.containsKey("max-channel-count")) { if (info.containsKey("max-channel-count")) {
maxInputChannels = Utils.parseIntSafely( maxInputChannels = Utils.parseIntSafely(
info.getString("max-channel-count"), maxInputChannels); info.getString("max-channel-count"), maxInputChannels);
} else if ((mParent.mError & ERROR_UNSUPPORTED) != 0) {
maxInputChannels = 0;
} }
if (info.containsKey("bitrate-range")) { if (info.containsKey("bitrate-range")) {
bitRates = bitRates.intersect( bitRates = bitRates.intersect(