Merge pull request #10322 from DolbyLaboratories:dev-v2-multichannel

PiperOrigin-RevId: 454641746

RELEASENOTES.md

@@ -69,6 +69,10 @@
         for audio passthrough when the format audio channel count is unset,
         which occurs with HLS chunkless preparation
         ([10204](https://github.com/google/ExoPlayer/issues/10204)).
+    *   Configure `AudioTrack` with channel mask
+        `AudioFormat.CHANNEL_OUT_7POINT1POINT4` if the decoder outputs 12
+        channel PCM audio
+        ([#10322](#https://github.com/google/ExoPlayer/pull/10322).
 *   DRM
     *   Ensure the DRM session is always correctly updated when seeking
         immediately after a format change

libraries/common/src/main/java/androidx/media3/common/util/Util.java

@@ -1745,6 +1745,10 @@ public final class Util {
           // 8 ch output is not supported before Android L.
           return AudioFormat.CHANNEL_INVALID;
         }
+      case 12:
+        return Util.SDK_INT >= 32
+            ? AudioFormat.CHANNEL_OUT_7POINT1POINT4
+            : AudioFormat.CHANNEL_INVALID;
       default:
         return AudioFormat.CHANNEL_INVALID;
     }