diff options
| author | Mikhail Naganov <mnaganov@google.com> | 2019-02-21 07:08:19 +1100 |
|---|---|---|
| committer | Mikhail Naganov <mnaganov@google.com> | 2019-03-08 16:31:28 -0800 |
| commit | ce6f1cf448ccd8e901a8ea6dae620b1d7a51fdd5 (patch) | |
| tree | a6a596bfe1c3d878f882c7a634abce58324ecfbb /audio | |
| parent | c5524a6154301321d3507f55d6f2130b8444b442 (diff) | |
| download | android_hardware_interfaces-ce6f1cf448ccd8e901a8ea6dae620b1d7a51fdd5.tar.gz android_hardware_interfaces-ce6f1cf448ccd8e901a8ea6dae620b1d7a51fdd5.tar.bz2 android_hardware_interfaces-ce6f1cf448ccd8e901a8ea6dae620b1d7a51fdd5.zip | |
audio: Fix and enhance channel mask enums
Add AUDIO_CHANNEL_INDEX_MASK_{9..24}
Fix channel order for AUDIO_CHANNEL_OUT_3POINT{0,1}POINT2
Bug: 126455009
Test: make
Change-Id: I36a89c9903ad1702c5c0bdb0632c3f3234bb75d7
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/common/5.0/types.hal | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/audio/common/5.0/types.hal b/audio/common/5.0/types.hal index 8f8a888b3..0a8d75bf7 100644 --- a/audio/common/5.0/types.hal +++ b/audio/common/5.0/types.hal @@ -416,9 +416,9 @@ enum AudioChannelMask : uint32_t { OUT_2POINT1POINT2 = (OUT_FRONT_LEFT | OUT_FRONT_RIGHT | OUT_TOP_SIDE_LEFT | OUT_TOP_SIDE_RIGHT | OUT_LOW_FREQUENCY), - OUT_3POINT0POINT2 = (OUT_FRONT_LEFT | OUT_FRONT_CENTER | OUT_FRONT_RIGHT | + OUT_3POINT0POINT2 = (OUT_FRONT_LEFT | OUT_FRONT_RIGHT | OUT_FRONT_CENTER | OUT_TOP_SIDE_LEFT | OUT_TOP_SIDE_RIGHT), - OUT_3POINT1POINT2 = (OUT_FRONT_LEFT | OUT_FRONT_CENTER | OUT_FRONT_RIGHT | + OUT_3POINT1POINT2 = (OUT_FRONT_LEFT | OUT_FRONT_RIGHT | OUT_FRONT_CENTER | OUT_TOP_SIDE_LEFT | OUT_TOP_SIDE_RIGHT | OUT_LOW_FREQUENCY), OUT_QUAD = (OUT_FRONT_LEFT | OUT_FRONT_RIGHT | @@ -517,7 +517,23 @@ enum AudioChannelMask : uint32_t { INDEX_MASK_5 = INDEX_HDR | ((1 << 5) - 1), INDEX_MASK_6 = INDEX_HDR | ((1 << 6) - 1), INDEX_MASK_7 = INDEX_HDR | ((1 << 7) - 1), - INDEX_MASK_8 = INDEX_HDR | ((1 << 8) - 1) + INDEX_MASK_8 = INDEX_HDR | ((1 << 8) - 1), + INDEX_MASK_9 = INDEX_HDR | ((1 << 9) - 1), + INDEX_MASK_10 = INDEX_HDR | ((1 << 10) - 1), + INDEX_MASK_11 = INDEX_HDR | ((1 << 11) - 1), + INDEX_MASK_12 = INDEX_HDR | ((1 << 12) - 1), + INDEX_MASK_13 = INDEX_HDR | ((1 << 13) - 1), + INDEX_MASK_14 = INDEX_HDR | ((1 << 14) - 1), + INDEX_MASK_15 = INDEX_HDR | ((1 << 15) - 1), + INDEX_MASK_16 = INDEX_HDR | ((1 << 16) - 1), + INDEX_MASK_17 = INDEX_HDR | ((1 << 17) - 1), + INDEX_MASK_18 = INDEX_HDR | ((1 << 18) - 1), + INDEX_MASK_19 = INDEX_HDR | ((1 << 19) - 1), + INDEX_MASK_20 = INDEX_HDR | ((1 << 20) - 1), + INDEX_MASK_21 = INDEX_HDR | ((1 << 21) - 1), + INDEX_MASK_22 = INDEX_HDR | ((1 << 22) - 1), + INDEX_MASK_23 = INDEX_HDR | ((1 << 23) - 1), + INDEX_MASK_24 = INDEX_HDR | ((1 << 24) - 1), }; /** |