Merge pull request #728 from lawadr:audio-capabilities-fix

PiperOrigin-RevId: 574829263
androidx · Oct 19, 2023 · 5f80a47 · 5f80a47
2 parents 2673b64 + 8f44916
commit 5f80a47
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
@@ -22,6 +22,9 @@
 *   Audio:
     *   Fix DTS Express audio buffer underflow issue
         ([#650](https://github.com/androidx/media/pull/650)).
+    *   Fix bug where the capabilities check for E-AC3-JOC throws an
+        `IllegalArgumentException`
+        ([#677](https://github.com/androidx/media/issues/677)).
 *   Video:
 *   Text:
     *   Remove `ExoplayerCuesDecoder`. Text tracks with `sampleMimeType =

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
@@ -406,11 +406,15 @@ public static int getMaxSupportedChannelCountForPassthrough(
       // TODO(internal b/234351617): Query supported channel masks directly once it's supported,
       // see also b/25994457.
       for (int channelCount = DEFAULT_MAX_CHANNEL_COUNT; channelCount > 0; channelCount--) {
+        int channelConfig = Util.getAudioTrackChannelConfig(channelCount);
+        if (channelConfig == AudioFormat.CHANNEL_INVALID) {
+          continue;
+        }
         AudioFormat audioFormat =
             new AudioFormat.Builder()
                 .setEncoding(encoding)
                 .setSampleRate(sampleRate)
-                .setChannelMask(Util.getAudioTrackChannelConfig(channelCount))
+                .setChannelMask(channelConfig)
                 .build();
         if (AudioTrack.isDirectPlaybackSupported(audioFormat, DEFAULT_AUDIO_ATTRIBUTES)) {
           return channelCount;