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

Merge "AudioTrack: Do not throw exception from isMultichannelConfigSupported" into sc-v2-dev

Browse Source
This commit is contained in:
Andy Hung
2021-10-14 18:59:21 +00:00
committed by Android (Google) Code Review
parent 3ec70603c1 4b8954d48b
commit f3ca848003
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
media/java/android/media/AudioTrack.java
View File

@@ -1805,9 +1805,15 @@ public class AudioTrack extends PlayerBase
return false; return false;
} }
final int channelCount = AudioFormat.channelCountFromOutChannelMask(channelConfig); final int channelCount = AudioFormat.channelCountFromOutChannelMask(channelConfig);
final int channelCountLimit = AudioFormat.isEncodingLinearFrames(encoding) final int channelCountLimit;
try {
channelCountLimit = AudioFormat.isEncodingLinearFrames(encoding)
? AudioSystem.OUT_CHANNEL_COUNT_MAX // PCM limited to OUT_CHANNEL_COUNT_MAX ? AudioSystem.OUT_CHANNEL_COUNT_MAX // PCM limited to OUT_CHANNEL_COUNT_MAX
: AudioSystem.FCC_24; // Compressed limited to 24 channels : AudioSystem.FCC_24; // Compressed limited to 24 channels
} catch (IllegalArgumentException iae) {
loge("Unsupported encoding " + iae);
return false;
}
if (channelCount > channelCountLimit) { if (channelCount > channelCountLimit) {
loge("Channel configuration contains too many channels for encoding " loge("Channel configuration contains too many channels for encoding "
+ encoding + "(" + channelCount + " > " + channelCountLimit + ")"); + encoding + "(" + channelCount + " > " + channelCountLimit + ")");