diff options
| author | yucliu <yucliu@google.com> | 2022-03-17 15:40:31 -0700 |
|---|---|---|
| committer | Yuchen Liu <yucliu@google.com> | 2022-03-18 07:20:42 +0000 |
| commit | 48e736d1da882290c5a2efd63d25becf3405fea7 (patch) | |
| tree | 89f94408f453c3c13879d947a46ed00fb37079a6 /audio_proxy | |
| parent | 433f4a09caef728340101c0dc58f94cb12f4346d (diff) | |
| download | atv-48e736d1da882290c5a2efd63d25becf3405fea7.tar.gz | |
[AudioProxy] Add more channel masks and formats
The new enums come from audio hal 7.0's audio_policy_configuration.xsd
file.
Bug: 222409895
Test: On device test
Change-Id: I00ec882b39d1471bd0b0ce594ce3e40e15f657f1
Diffstat (limited to 'audio_proxy')
| -rw-r--r-- | audio_proxy/public/audio_proxy.h | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/audio_proxy/public/audio_proxy.h b/audio_proxy/public/audio_proxy.h index 097d33b..1096e5d 100644 --- a/audio_proxy/public/audio_proxy.h +++ b/audio_proxy/public/audio_proxy.h @@ -46,7 +46,10 @@ enum { AUDIO_PROXY_FORMAT_INVALID = 0xFFFFFFFFu, AUDIO_PROXY_FORMAT_PCM_16_BIT = 0x1u, AUDIO_PROXY_FORMAT_PCM_8_BIT = 0x2u, + AUDIO_PROXY_FORMAT_PCM_32_BIT = 0x3u, + AUDIO_PROXY_FORMAT_PCM_8_24_BIT = 0x4u, AUDIO_PROXY_FORMAT_PCM_FLOAT = 0x5u, + AUDIO_PROXY_FORMAT_PCM_24_BIT_PACKED = 0x6u, }; typedef uint32_t audio_proxy_format_t; @@ -55,6 +58,35 @@ enum { AUDIO_PROXY_CHANNEL_INVALID = 0xC0000000u, AUDIO_PROXY_CHANNEL_OUT_MONO = 0x1u, AUDIO_PROXY_CHANNEL_OUT_STEREO = 0x3u, + AUDIO_PROXY_CHANNEL_OUT_2POINT1 = 0xBu, + AUDIO_PROXY_CHANNEL_OUT_TRI = 0x7u, + AUDIO_PROXY_CHANNEL_OUT_TRI_BACK = 0x103u, + AUDIO_PROXY_CHANNEL_OUT_3POINT1 = 0xFu, + AUDIO_PROXY_CHANNEL_OUT_2POINT0POINT2 = 0xC0003u, + AUDIO_PROXY_CHANNEL_OUT_2POINT1POINT2 = 0xC000Bu, + AUDIO_PROXY_CHANNEL_OUT_3POINT0POINT2 = 0xC0007u, + AUDIO_PROXY_CHANNEL_OUT_3POINT1POINT2 = 0xC000Fu, + AUDIO_PROXY_CHANNEL_OUT_QUAD = 0x33u, + // AUDIO_PROXY_CHANNEL_OUT_QUAD_BACK = 0x33u, + AUDIO_PROXY_CHANNEL_OUT_QUAD_SIDE = 0x603u, + AUDIO_PROXY_CHANNEL_OUT_SURROUND = 0x107u, + AUDIO_PROXY_CHANNEL_OUT_PENTA = 0x37u, + AUDIO_PROXY_CHANNEL_OUT_5POINT1 = 0x3Fu, + // AUDIO_PROXY_CHANNEL_OUT_5POINT1_BACK = 0x3Fu, + AUDIO_PROXY_CHANNEL_OUT_5POINT1_SIDE = 0x60Fu, + AUDIO_PROXY_CHANNEL_OUT_5POINT1POINT2 = 0xC003Fu, + AUDIO_PROXY_CHANNEL_OUT_5POINT1POINT4 = 0x2D03Fu, + AUDIO_PROXY_CHANNEL_OUT_6POINT1 = 0x13Fu, + AUDIO_PROXY_CHANNEL_OUT_7POINT1 = 0x63Fu, + AUDIO_PROXY_CHANNEL_OUT_7POINT1POINT2 = 0xC063Fu, + AUDIO_PROXY_CHANNEL_OUT_7POINT1POINT4 = 0x2D63Fu, + AUDIO_PROXY_CHANNEL_OUT_13POINT_360RA = 0x72F607u, + AUDIO_PROXY_CHANNEL_OUT_22POINT2 = 0xFFFFFFu, + AUDIO_PROXY_CHANNEL_OUT_MONO_HAPTIC_A = 0x20000001u, + AUDIO_PROXY_CHANNEL_OUT_STEREO_HAPTIC_A = 0x20000003u, + AUDIO_PROXY_CHANNEL_OUT_HAPTIC_AB = 0x30000000u, + AUDIO_PROXY_CHANNEL_OUT_MONO_HAPTIC_AB = 0x30000001u, + AUDIO_PROXY_CHANNEL_OUT_STEREO_HAPTIC_AB = 0x30000003u, }; typedef uint32_t audio_proxy_channel_mask_t; |