commit 05a9b71cf506aed8911b44aa65b1cdafac75b38e
author Jean-Michel Trivi <jmtrivi@google.com> Tue Sep 21 04:56:42 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Sep 21 04:56:42 2021 +0000
tree 1af9aa21fc555decc63ba87e4fa1f2cd29728f09
parent c87402b04f2d9bb7040620b4523d88950f5f2fcd
parent e96014e0670681dfb3a86dbc4517a2506f81cab5

Merge "AudioMixerOps: update for front wide left/right" into sc-v2-dev

media/libaudioprocessing/AudioMixerOps.h

diff --git a/media/libaudioprocessing/AudioMixerOps.h b/media/libaudioprocessing/AudioMixerOps.h
index 2988c67..ab6a8b6 100644
--- a/media/libaudioprocessing/AudioMixerOps.h
+++ b/media/libaudioprocessing/AudioMixerOps.h
@@ -328,7 +328,9 @@
     DO_CHANNEL_POSITION(21);
     DO_CHANNEL_POSITION(22);
     DO_CHANNEL_POSITION(23);
-    static_assert(FCC_LIMIT <= FCC_24); // Note: this may need to change.
+    DO_CHANNEL_POSITION(24);
+    DO_CHANNEL_POSITION(25);
+    static_assert(FCC_LIMIT <= FCC_26); // Note: this may need to change.
 #pragma pop_macro("DO_CHANNEL_POSITION")
 }
 
@@ -346,6 +348,8 @@
         [7] = AUDIO_CHANNEL_OUT_6POINT1,
         [8] = AUDIO_CHANNEL_OUT_7POINT1,
         [12] = AUDIO_CHANNEL_OUT_7POINT1POINT4,
+        [14] = AUDIO_CHANNEL_OUT_9POINT1POINT4,
+        [16] = AUDIO_CHANNEL_OUT_9POINT1POINT6,
         [24] = AUDIO_CHANNEL_OUT_22POINT2,
     };
     return channelCount < std::size(canonical) ? canonical[channelCount] : AUDIO_CHANNEL_NONE;