Reorder audio capability checks

tonihei · SheenaChhabra · commit a85d9e251c7e · 2024-03-11T04:14:31.000-07:00
Using the more accurate check available on later API versions first is likely better than falling back to a fallback solution from older API versions. PiperOrigin-RevId: 614612628 (cherry picked from commit 18cbbf3)
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
@@ -157,10 +157,7 @@ public static AudioCapabilities getCapabilities(
 
     ImmutableSet.Builder<Integer> supportedEncodings = new ImmutableSet.Builder<>();
     supportedEncodings.add(C.ENCODING_PCM_16BIT);
-    if (deviceMaySetExternalSurroundSoundGlobalSetting()
-        && Global.getInt(context.getContentResolver(), EXTERNAL_SURROUND_SOUND_KEY, 0) == 1) {
-      supportedEncodings.addAll(EXTERNAL_SURROUND_SOUND_ENCODINGS);
-    }
+
     // AudioTrack.isDirectPlaybackSupported returns true for encodings that are supported for audio
     // offload, as well as for encodings we want to list for passthrough mode. Therefore we only use
     // it on TV and automotive devices, which generally shouldn't support audio offload for surround
@@ -171,6 +168,11 @@ public static AudioCapabilities getCapabilities(
           getAudioProfiles(Ints.toArray(supportedEncodings.build()), DEFAULT_MAX_CHANNEL_COUNT));
     }
 
+    if (deviceMaySetExternalSurroundSoundGlobalSetting()
+        && Global.getInt(context.getContentResolver(), EXTERNAL_SURROUND_SOUND_KEY, 0) == 1) {
+      supportedEncodings.addAll(EXTERNAL_SURROUND_SOUND_ENCODINGS);
+    }
+
     if (intent != null && intent.getIntExtra(AudioManager.EXTRA_AUDIO_PLUG_STATE, 0) == 1) {
       @Nullable int[] encodingsFromExtra = intent.getIntArrayExtra(AudioManager.EXTRA_ENCODINGS);
       if (encodingsFromExtra != null) {
