diff options
author | Andy Hung <hunga@google.com> | 2015-05-12 00:36:07 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-12 00:36:07 +0000 |
commit | fedef1384d5ff758285fb19161a0348e1e32ab3f (patch) | |
tree | 659818942c7df772681839a0fbdc0aefe6b69c0e /services/audiopolicy/common | |
parent | af49160aa75d4e1750f3ed56b812ec9cc448fa46 (diff) | |
parent | 18aa27016a94d0fee243637a80fd0741f89e08f2 (diff) | |
download | frameworks_av-fedef1384d5ff758285fb19161a0348e1e32ab3f.zip frameworks_av-fedef1384d5ff758285fb19161a0348e1e32ab3f.tar.gz frameworks_av-fedef1384d5ff758285fb19161a0348e1e32ab3f.tar.bz2 |
Merge "Support channel index masks for output hal" into mnc-dev
Diffstat (limited to 'services/audiopolicy/common')
-rw-r--r-- | services/audiopolicy/common/managerdefinitions/src/AudioPort.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/services/audiopolicy/common/managerdefinitions/src/AudioPort.cpp b/services/audiopolicy/common/managerdefinitions/src/AudioPort.cpp index 64f883a..2e4d423 100644 --- a/services/audiopolicy/common/managerdefinitions/src/AudioPort.cpp +++ b/services/audiopolicy/common/managerdefinitions/src/AudioPort.cpp @@ -272,6 +272,12 @@ void AudioPort::loadOutChannels(char *name) (audio_channel_mask_t)ConfigParsingUtils::stringToEnum(sOutChannelsNameToEnumTable, ARRAY_SIZE(sOutChannelsNameToEnumTable), str); + if (channelMask == 0) { // if not found, check the channel index table + channelMask = (audio_channel_mask_t) + ConfigParsingUtils::stringToEnum(sIndexChannelsNameToEnumTable, + ARRAY_SIZE(sIndexChannelsNameToEnumTable), + str); + } if (channelMask != 0) { mChannelMasks.add(channelMask); } |