From 48509df714bfa26b33bb99b8809004316d104059 Mon Sep 17 00:00:00 2001 From: Tianyi Feng Date: Fri, 19 May 2023 23:10:52 +0000 Subject: [PATCH] Quick return the capabilities for API29 TV case --- .../androidx/media3/exoplayer/audio/AudioCapabilities.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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 003d2a89ca..fa9c12cf46 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 @@ -114,10 +114,15 @@ public final class AudioCapabilities { // encodings. if (Util.SDK_INT >= 29 && (Util.isTv(context) || Util.isAutomotive(context))) { supportedEncodings.addAll(Api29.getDirectPlaybackSupportedEncodings()); + return new AudioCapabilities( + Ints.toArray(supportedEncodings.build()), DEFAULT_MAX_CHANNEL_COUNT); } if (intent != null && intent.getIntExtra(AudioManager.EXTRA_AUDIO_PLUG_STATE, 0) == 1) { - supportedEncodings.addAll(Ints.asList(intent.getIntArrayExtra(AudioManager.EXTRA_ENCODINGS))); + @Nullable int[] encodingsFromExtra = intent.getIntArrayExtra(AudioManager.EXTRA_ENCODINGS); + if (encodingsFromExtra != null) { + supportedEncodings.addAll(Ints.asList(encodingsFromExtra)); + } return new AudioCapabilities( Ints.toArray(supportedEncodings.build()), intent.getIntExtra(