From 941c5d84b0d8df593d39258a47e7ef79b0a3f578 Mon Sep 17 00:00:00 2001
From: Marc Baechinger <marc.baechinger@gmail.com>
Date: Tue, 14 Jun 2022 17:22:39 +0000
Subject: [PATCH] Merge pull request #10322 from
 DolbyLaboratories:dev-v2-multichannel

PiperOrigin-RevId: 454641746
(cherry picked from commit 1c373d515991f5aef15d75f6a6de80492fe14d70)
---
 .../main/java/com/google/android/exoplayer2/util/Util.java    | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/library/common/src/main/java/com/google/android/exoplayer2/util/Util.java b/library/common/src/main/java/com/google/android/exoplayer2/util/Util.java
index f32b869607..009483761b 100644
--- a/library/common/src/main/java/com/google/android/exoplayer2/util/Util.java
+++ b/library/common/src/main/java/com/google/android/exoplayer2/util/Util.java
@@ -1644,6 +1644,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;
     }