commit ce7dee77c80d51daa502c6c44f3ace3e1b4feeda
author Kei Murayama <Kei.Murayama@sony.com> Fri Apr 02 19:18:59 2021 +0900
committer Andy Hung <hunga@google.com> Thu Apr 15 17:54:49 2021 -0700
tree 74d3ff54cff25f7c7bf71d8adb405187c3a30b5f
parent 6ba267ef8deae066645923d2e764faf3c4b683e9

audio: Add 13ch audio support for 360 Reality Audio

 - Add definitions for the front bottom channels.
 - Add definition for 13ch mask which uses surround 5 channels,
   top 5 channels and bottom 3ch channels.

Bug: 185100731
Test: Play wav with 13ch mask after OUT_CHANNEL_COUNT_MAX to 24
Change-Id: I2a620fb1175c6576bead7878315fc48ff5171ddf

audio/include/system/audio-hal-enums.h

diff --git a/audio/include/system/audio-hal-enums.h b/audio/include/system/audio-hal-enums.h
index 4a8164c..b02a1a8 100644
--- a/audio/include/system/audio-hal-enums.h
+++ b/audio/include/system/audio-hal-enums.h
@@ -92,6 +92,9 @@
     V(AUDIO_CHANNEL_OUT_TOP_BACK_RIGHT, 0x20000u) \
     V(AUDIO_CHANNEL_OUT_TOP_SIDE_LEFT, 0x40000u) \
     V(AUDIO_CHANNEL_OUT_TOP_SIDE_RIGHT, 0x80000u) \
+    V(AUDIO_CHANNEL_OUT_BOTTOM_FRONT_LEFT, 0x100000u) \
+    V(AUDIO_CHANNEL_OUT_BOTTOM_FRONT_CENTER, 0x200000u) \
+    V(AUDIO_CHANNEL_OUT_BOTTOM_FRONT_RIGHT, 0x400000u) \
     V(AUDIO_CHANNEL_OUT_HAPTIC_A, 0x20000000u) \
     V(AUDIO_CHANNEL_OUT_HAPTIC_B, 0x10000000u)
 // These are individual input channel flags, only one bit must be set.
@@ -142,6 +145,15 @@
     V(AUDIO_CHANNEL_OUT_7POINT1, AUDIO_CHANNEL_OUT_FRONT_LEFT | AUDIO_CHANNEL_OUT_FRONT_RIGHT | AUDIO_CHANNEL_OUT_FRONT_CENTER | AUDIO_CHANNEL_OUT_LOW_FREQUENCY | AUDIO_CHANNEL_OUT_BACK_LEFT | AUDIO_CHANNEL_OUT_BACK_RIGHT | AUDIO_CHANNEL_OUT_SIDE_LEFT | AUDIO_CHANNEL_OUT_SIDE_RIGHT) \
     V(AUDIO_CHANNEL_OUT_7POINT1POINT2, AUDIO_CHANNEL_OUT_7POINT1 | AUDIO_CHANNEL_OUT_TOP_SIDE_LEFT | AUDIO_CHANNEL_OUT_TOP_SIDE_RIGHT) \
     V(AUDIO_CHANNEL_OUT_7POINT1POINT4, AUDIO_CHANNEL_OUT_7POINT1 | AUDIO_CHANNEL_OUT_TOP_FRONT_LEFT | AUDIO_CHANNEL_OUT_TOP_FRONT_RIGHT | AUDIO_CHANNEL_OUT_TOP_BACK_LEFT | AUDIO_CHANNEL_OUT_TOP_BACK_RIGHT) \
+    V(AUDIO_CHANNEL_OUT_13POINT_360RA, \
+            AUDIO_CHANNEL_OUT_FRONT_LEFT | AUDIO_CHANNEL_OUT_FRONT_RIGHT | \
+            AUDIO_CHANNEL_OUT_FRONT_CENTER | \
+            AUDIO_CHANNEL_OUT_SIDE_LEFT | AUDIO_CHANNEL_OUT_SIDE_RIGHT | \
+            AUDIO_CHANNEL_OUT_TOP_FRONT_LEFT | AUDIO_CHANNEL_OUT_TOP_FRONT_RIGHT | \
+            AUDIO_CHANNEL_OUT_TOP_FRONT_CENTER | \
+            AUDIO_CHANNEL_OUT_TOP_BACK_LEFT | AUDIO_CHANNEL_OUT_TOP_BACK_RIGHT | \
+            AUDIO_CHANNEL_OUT_BOTTOM_FRONT_LEFT | AUDIO_CHANNEL_OUT_BOTTOM_FRONT_RIGHT | \
+            AUDIO_CHANNEL_OUT_BOTTOM_FRONT_CENTER) \
     V(AUDIO_CHANNEL_OUT_MONO_HAPTIC_A, AUDIO_CHANNEL_OUT_MONO | AUDIO_CHANNEL_OUT_HAPTIC_A) \
     V(AUDIO_CHANNEL_OUT_STEREO_HAPTIC_A, AUDIO_CHANNEL_OUT_STEREO | AUDIO_CHANNEL_OUT_HAPTIC_A) \
     V(AUDIO_CHANNEL_OUT_HAPTIC_AB, AUDIO_CHANNEL_OUT_HAPTIC_A | AUDIO_CHANNEL_OUT_HAPTIC_B) \