From a9f98ae11afa868a52ebaa5e444be0c2aafad301 Mon Sep 17 00:00:00 2001 From: Andy Hung Date: Wed, 6 Oct 2021 17:28:00 -0700 Subject: [PATCH] AudioTrack: Fix track creation of 9.1.4 and 9.1.6 streams Required support if the platform supports 14 or 16 channels internally, otherwise CTS test fails. Test: atest AudioTrackTest#testImmersiveAudio Bug: 202162797 Change-Id: I052f2e38a27a63e5304b7fb6bffaaabe37efa8eb --- media/java/android/media/AudioTrack.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/media/java/android/media/AudioTrack.java b/media/java/android/media/AudioTrack.java index 23d9532e11a0b..aa72d965f7937 100644 --- a/media/java/android/media/AudioTrack.java +++ b/media/java/android/media/AudioTrack.java @@ -1613,7 +1613,9 @@ public class AudioTrack extends PlayerBase AudioFormat.CHANNEL_OUT_BOTTOM_FRONT_LEFT | AudioFormat.CHANNEL_OUT_BOTTOM_FRONT_CENTER | AudioFormat.CHANNEL_OUT_BOTTOM_FRONT_RIGHT | - AudioFormat.CHANNEL_OUT_LOW_FREQUENCY_2; + AudioFormat.CHANNEL_OUT_LOW_FREQUENCY_2 | + AudioFormat.CHANNEL_OUT_FRONT_WIDE_LEFT | + AudioFormat.CHANNEL_OUT_FRONT_WIDE_RIGHT; // Returns a boolean whether the attributes, format, bufferSizeInBytes, mode allow // power saving to be automatically enabled for an AudioTrack. Returns false if @@ -1787,6 +1789,8 @@ public class AudioTrack extends PlayerBase | AudioFormat.CHANNEL_OUT_TOP_SIDE_RIGHT); put("bottom front", AudioFormat.CHANNEL_OUT_BOTTOM_FRONT_LEFT | AudioFormat.CHANNEL_OUT_BOTTOM_FRONT_RIGHT); + put("front wide", AudioFormat.CHANNEL_OUT_FRONT_WIDE_LEFT + | AudioFormat.CHANNEL_OUT_FRONT_WIDE_RIGHT); }}; /**