From 8ab1a68939d6df2e98462d2fc6c9653596df50ef Mon Sep 17 00:00:00 2001 From: Cedric T Date: Wed, 31 May 2023 19:58:12 +0800 Subject: [PATCH] Return offload unsupported for DTSX P2 and API < 34. --- .../audio/DefaultAudioOffloadSupportProvider.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/audio/DefaultAudioOffloadSupportProvider.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/audio/DefaultAudioOffloadSupportProvider.java index e6f7a08827..c1e9d3c1e9 100644 --- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/audio/DefaultAudioOffloadSupportProvider.java +++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/audio/DefaultAudioOffloadSupportProvider.java @@ -81,18 +81,17 @@ public final class DefaultAudioOffloadSupportProvider @C.Encoding int encoding = MimeTypes.getEncoding(checkNotNull(format.sampleMimeType), format.codecs); - if (encoding == C.ENCODING_INVALID) { + // AudioFormat.ENCODING_DTS_UHD_P2 is defined from API 34 onwards. We return offload + // unsupported to prevent crash in Util.getAudioFormat() below when it tries to create + // an AudioFormat with ENCODING_DTS_UHD_P2. + if ((encoding == C.ENCODING_INVALID) || + ((Util.SDK_INT < 34) && (encoding == C.ENCODING_DTS_UHD_P2))) { return AudioOffloadSupport.DEFAULT_UNSUPPORTED; } int channelConfig = Util.getAudioTrackChannelConfig(format.channelCount); if (channelConfig == AudioFormat.CHANNEL_INVALID) { return AudioOffloadSupport.DEFAULT_UNSUPPORTED; } - // AudioFormat.ENCODING_DTS_UHD_P2 is defined from API 34 onwards. Before that encoding should - // be set to C.ENCODING_DTS, which is supported by TV ICs for offload playback. - if ((Util.SDK_INT < 34) && (encoding == C.ENCODING_DTS_UHD_P2)) { - encoding = C.ENCODING_DTS; - } AudioFormat audioFormat = Util.getAudioFormat(format.sampleRate, channelConfig, encoding); if (Util.SDK_INT >= 31) { return Api31.getOffloadedPlaybackSupport(