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

PiperOrigin-RevId: 454641746
google · Jun 14, 2022 · 1c373d5 · 1c373d5
2 parents d2f5f21 + ea8f6a1
commit 1c373d5
Showing 1 changed file with 4 additions and 0 deletions.
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
@@ -1666,6 +1666,10 @@ public static int getAudioTrackChannelConfig(int channelCount) {
  // 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;
  }