diff options
| author | Andy Hung <hunga@google.com> | 2015-04-19 22:35:08 -0700 |
|---|---|---|
| committer | Andy Hung <hunga@google.com> | 2015-04-22 12:41:57 -0700 |
| commit | f27e2fbfc3284c00a60fa68edc51d436f75b1e32 (patch) | |
| tree | 46d089a6f5e37a3ee692679216b351299cc94bc4 /services/audiopolicy/common/managerdefinitions/include | |
| parent | 04f07fd61022dac46ddda9c815d65bc3d3278b84 (diff) | |
| download | frameworks_av-f27e2fbfc3284c00a60fa68edc51d436f75b1e32.zip frameworks_av-f27e2fbfc3284c00a60fa68edc51d436f75b1e32.tar.gz frameworks_av-f27e2fbfc3284c00a60fa68edc51d436f75b1e32.tar.bz2 | |
Add channel index record to AudioPolicyManager
Change-Id: Ic534bee084108a68c7818600df6e1c9dc9258a0d
Diffstat (limited to 'services/audiopolicy/common/managerdefinitions/include')
| -rw-r--r-- | services/audiopolicy/common/managerdefinitions/include/ConfigParsingUtils.h | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/services/audiopolicy/common/managerdefinitions/include/ConfigParsingUtils.h b/services/audiopolicy/common/managerdefinitions/include/ConfigParsingUtils.h index f8c4d08..0b08430 100644 --- a/services/audiopolicy/common/managerdefinitions/include/ConfigParsingUtils.h +++ b/services/audiopolicy/common/managerdefinitions/include/ConfigParsingUtils.h @@ -38,7 +38,8 @@ struct StringToEnum { uint32_t value; }; -#define STRING_TO_ENUM(string) { #string, string } +// TODO: move to a separate file. Should be in sync with audio.h. +#define STRING_TO_ENUM(string) { #string, (uint32_t)string } // uint32_t cast removes warning #define NAME_TO_ENUM(name, value) { name, value } #ifndef ARRAY_SIZE #define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0])) @@ -204,6 +205,17 @@ const StringToEnum sInChannelsNameToEnumTable[] = { STRING_TO_ENUM(AUDIO_CHANNEL_IN_FRONT_BACK), }; +const StringToEnum sIndexChannelsNameToEnumTable[] = { + STRING_TO_ENUM(AUDIO_CHANNEL_INDEX_MASK_1), + STRING_TO_ENUM(AUDIO_CHANNEL_INDEX_MASK_2), + STRING_TO_ENUM(AUDIO_CHANNEL_INDEX_MASK_3), + STRING_TO_ENUM(AUDIO_CHANNEL_INDEX_MASK_4), + STRING_TO_ENUM(AUDIO_CHANNEL_INDEX_MASK_5), + STRING_TO_ENUM(AUDIO_CHANNEL_INDEX_MASK_6), + STRING_TO_ENUM(AUDIO_CHANNEL_INDEX_MASK_7), + STRING_TO_ENUM(AUDIO_CHANNEL_INDEX_MASK_8), +}; + const StringToEnum sGainModeNameToEnumTable[] = { STRING_TO_ENUM(AUDIO_GAIN_MODE_JOINT), STRING_TO_ENUM(AUDIO_GAIN_MODE_CHANNELS), |