From 162f5e827a83b1cebaac6b945c04eccd10dd5b65 Mon Sep 17 00:00:00 2001 From: Tianyi Feng Date: Wed, 17 May 2023 12:40:22 +0000 Subject: [PATCH] Add type argument when using ImmutableSet --- .../media3/exoplayer/audio/AudioCapabilities.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 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 48fc945015..99941084b8 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 @@ -102,7 +102,7 @@ public final class AudioCapabilities { return DEFAULT_AUDIO_CAPABILITIES; } - ImmutableSet.Builder supportedEncodings = new ImmutableSet.Builder<>(); + ImmutableSet.Builder supportedEncodings = new ImmutableSet.Builder<>(); if (deviceMaySetExternalSurroundSoundGlobalSetting() && Global.getInt(context.getContentResolver(), EXTERNAL_SURROUND_SOUND_KEY, 0) == 1) { supportedEncodings.addAll(Ints.asList(EXTERNAL_SURROUND_SOUND_ENCODINGS)); @@ -123,10 +123,10 @@ public final class AudioCapabilities { AudioManager.EXTRA_MAX_CHANNEL_COUNT, /* defaultValue= */ DEFAULT_MAX_CHANNEL_COUNT)); } - ImmutableSet supportedEncodingsSet = supportedEncodings.build(); + ImmutableSet supportedEncodingsSet = supportedEncodings.build(); if (!supportedEncodingsSet.isEmpty()) { return new AudioCapabilities( - Ints.toArray(supportedEncodingsSet), /* defaultValue= */ DEFAULT_MAX_CHANNEL_COUNT); + Ints.toArray(supportedEncodingsSet), /* maxChannelCount= */ DEFAULT_MAX_CHANNEL_COUNT); } return DEFAULT_AUDIO_CAPABILITIES; } @@ -230,7 +230,7 @@ public final class AudioCapabilities { channelCount = format.channelCount; // Some DTS:X TVs reports ACTION_HDMI_AUDIO_PLUG.EXTRA_MAX_CHANNEL_COUNT as 8 // instead of 10. See https://github.com/androidx/media/issues/396 - if (format.sampleMimeType == MimeTypes.AUDIO_DTS_X) { + if (format.sampleMimeType.equals(MimeTypes.AUDIO_DTS_X)) { if (channelCount > 10) { return null; }