From 18aa27016a94d0fee243637a80fd0741f89e08f2 Mon Sep 17 00:00:00 2001 From: Andy Hung Date: Tue, 5 May 2015 23:48:38 -0700 Subject: Support channel index masks for output hal Change-Id: Ib3e61ff6faf91c71b85102b5d77f90f124c08220 --- services/audiopolicy/common/managerdefinitions/src/AudioPort.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'services/audiopolicy/common') 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); } -- cgit v1.1