commit dac5dcb6fa1cd4fbaa6854d62f41e97fb8a2544b
author Dean Wheatley <dwhea@dolby.com> Thu Dec 15 09:52:08 2022 +1100
committer Dean Wheatley <dwhea@dolby.com> Thu Dec 15 09:52:08 2022 +1100
tree 3b673b2ed8754d08559a5df508ebb943055a9bcd
parent dfc66d0a2963e73d81bcf36dc9458d8e1d14859c

audio_channel_out_mask_from_count: Return 5.1.4 position mask for 10 ch

When attempting to open a non-direct output stream with the 5.1.4
position channel mask, AudioFlinger fails and falls back to opening a
direct output stream instead. This is because
audio_channel_out_mask_from_count does not handle support for 10
channels. So, add the canonical position mask definition of 5.1.4 for 10
channels.

Test: m
Change-Id: I6437a9654d1b00be2feb828b0c81ec15a6d15986

audio/include/system/audio.h

diff --git a/audio/include/system/audio.h b/audio/include/system/audio.h
index 8cefb49..b6ed805 100644
--- a/audio/include/system/audio.h
+++ b/audio/include/system/audio.h
@@ -1622,6 +1622,9 @@
     case FCC_8:
         bits = AUDIO_CHANNEL_OUT_7POINT1;
         break;
+    case 10: // 5.1.4
+        bits = AUDIO_CHANNEL_OUT_5POINT1POINT4;
+        break;
     case FCC_12:
         bits = AUDIO_CHANNEL_OUT_7POINT1POINT4;
         break;