commit db4ea93ddef925df7d94964d37483697b0a0a129
author Robert Wu <robertwu@google.com> Tue Jun 27 22:34:15 2023 +0000
committer Mikhail Naganov <mnaganov@google.com> Wed Apr 17 17:29:31 2024 +0000
tree b550856eeba5a860e08b0185c52a6ad29a502334
parent 0ca052b7ef35c03b8c448dc79069732009bd7dfd

AAudio: Support front wide channels

When channel masks were added to AAudio, front wide channels were not
yet supported by audio-hals-enum.h. With ag/15193294, we can actually
support 9.1.x configurations.

Bug: 289125033
Bug: 333541578
Test: OboeTester Test Output after increasing FCC_LIMIT
Test: atest AAudioTests
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:06047b9fa5638ed005a3dfdcd2bff4fadd6d89e1)
Merged-In: I6f88b74ee5f50b86088c6e1c4cca374cfe85e444
Change-Id: I6f88b74ee5f50b86088c6e1c4cca374cfe85e444

media/libaaudio/src/utility/AAudioUtilities.cpp

diff --git a/media/libaaudio/src/utility/AAudioUtilities.cpp b/media/libaaudio/src/utility/AAudioUtilities.cpp
index 872faca..78abe15 100644
--- a/media/libaaudio/src/utility/AAudioUtilities.cpp
+++ b/media/libaaudio/src/utility/AAudioUtilities.cpp
@@ -352,11 +352,10 @@
                 return AUDIO_CHANNEL_OUT_7POINT1POINT2;
             case AAUDIO_CHANNEL_7POINT1POINT4:
                 return AUDIO_CHANNEL_OUT_7POINT1POINT4;
-            // TODO: add 9point1point4 and 9point1point6 when they are added in audio-hal-enums.h
-            // case AAUDIO_CHANNEL_9POINT1POINT4:
-            //     return AUDIO_CHANNEL_OUT_9POINT1POINT4;
-            // case AAUDIO_CHANNEL_9POINT1POINT6:
-            //     return AUDIO_CHANNEL_OUT_9POINT1POINT6;
+            case AAUDIO_CHANNEL_9POINT1POINT4:
+                return AUDIO_CHANNEL_OUT_9POINT1POINT4;
+            case AAUDIO_CHANNEL_9POINT1POINT6:
+                return AUDIO_CHANNEL_OUT_9POINT1POINT6;
             default:
                 ALOGE("%s() %#x unrecognized", __func__, channelMask);
                 return AUDIO_CHANNEL_INVALID;
@@ -434,11 +433,10 @@
                 return AAUDIO_CHANNEL_7POINT1POINT2;
             case AUDIO_CHANNEL_OUT_7POINT1POINT4:
                 return AAUDIO_CHANNEL_7POINT1POINT4;
-            // TODO: add 9point1point4 and 9point1point6 when they are added in audio-hal-enums.h
-            // case AUDIO_CHANNEL_OUT_9POINT1POINT4:
-            //     return AAUDIO_CHANNEL_9POINT1POINT4;
-            // case AUDIO_CHANNEL_OUT_9POINT1POINT6:
-            //     return AAUDIO_CHANNEL_9POINT1POINT6;
+            case AUDIO_CHANNEL_OUT_9POINT1POINT4:
+                return AAUDIO_CHANNEL_9POINT1POINT4;
+            case AUDIO_CHANNEL_OUT_9POINT1POINT6:
+                return AAUDIO_CHANNEL_9POINT1POINT6;
             default:
                 ALOGE("%s() %#x unrecognized", __func__, channelMask);
                 return AAUDIO_CHANNEL_INVALID;