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 am: ffb563d82d

Browse Source 
am: 6033c043ff

Change-Id: I7879b4b76a202dce3cebad1ad37aac3ddb599278
This commit is contained in:
Robert Shih
2017-05-12 06:14:39 +00:00
committed by android-build-merger
parent 1f3179a7c4 6033c043ff
commit d4e79f09d8
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() {
int[] sampleRates = null;
Range<Integer> sampleRateRange = null, bitRates = null;
int maxChannels = 0;
int maxChannels = MAX_INPUT_CHANNEL_COUNT;
String mime = mParent.getMimeType();
if (mime.equalsIgnoreCase(MediaFormat.MIMETYPE_AUDIO_MPEG)) {
@@ -1160,6 +1160,8 @@ public final class MediaCodecInfo {
if (info.containsKey("max-channel-count")) {
maxInputChannels = Utils.parseIntSafely(
info.getString("max-channel-count"), maxInputChannels);
} else if ((mParent.mError & ERROR_UNSUPPORTED) != 0) {
maxInputChannels = 0;
}
if (info.containsKey("bitrate-range")) {
bitRates = bitRates.intersect(