Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8602ae4e authored by Andy Hung's avatar Andy Hung Committed by Automerger Merge Worker
Browse files

Merge "AudioTrack: Do not throw exception from isMultichannelConfigSupported"... 

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16047732

Change-Id: Ifa3e0c2475e8a5f44c5298e30af942eecf67c34b
parents 2d78e929 f3ca8480

media/java/android/media/AudioTrack.java

+9 −3
Original line number Diff line number Diff line
@@ -1805,9 +1805,15 @@ public class AudioTrack extends PlayerBase 
            return false;

        }

        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.FCC_24;                // Compressed limited to 24 channels

        } catch (IllegalArgumentException iae) {

            loge("Unsupported encoding " + iae);

            return false;

        }

        if (channelCount > channelCountLimit) {

            loge("Channel configuration contains too many channels for encoding "

                    + encoding + "(" + channelCount + " > " + channelCountLimit + ")");