From 689451b0c658279ba33dc29ea0c8c85749263233 Mon Sep 17 00:00:00 2001 From: Cedric T Date: Fri, 5 May 2023 15:54:43 +0800 Subject: [PATCH] Set AudioCapabilities.DEFAULT_MAX_CHANNEL_COUNT to 10 --- .../media3/exoplayer/audio/AudioCapabilities.java | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/audio/AudioCapabilities.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/audio/AudioCapabilities.java index 1a48062ca4..739a5d61b2 100644 --- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/audio/AudioCapabilities.java +++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/audio/AudioCapabilities.java @@ -49,7 +49,7 @@ import java.util.Arrays; @UnstableApi public final class AudioCapabilities { - private static final int DEFAULT_MAX_CHANNEL_COUNT = 8; + private static final int DEFAULT_MAX_CHANNEL_COUNT = 10; @VisibleForTesting /* package */ static final int DEFAULT_SAMPLE_RATE_HZ = 48_000; /** The minimum audio capabilities supported by all devices. */ @@ -224,12 +224,7 @@ public final class AudioCapabilities { channelCount = getMaxSupportedChannelCountForPassthrough(encoding, sampleRate); } else { channelCount = format.channelCount; - if (format.sampleMimeType == MimeTypes.AUDIO_DTS_X) { - if (channelCount > 10) { - // To fix wrong reporting from device. ChannelCount is reported as 8 for DTS:X P2 on some devices - return null; - } - } else if (channelCount > maxChannelCount) { + if (channelCount > maxChannelCount) { return null; } }