Support open output stream with haptic channel mask.
When haptic playback is supported according to audio policy
configuration file, try to open the output stream with haptic channel
mask. When trying to creat a track with haptic channel mask, use haptic
output if it is available.
Bug: 111454766
Test: Manually test
Change-Id: Ia8c70dd7f602a134d0509630eb734b8c540dea7d
diff --git a/services/audioflinger/AudioFlinger.h b/services/audioflinger/AudioFlinger.h
index 1b20693..6c698f6 100644
--- a/services/audioflinger/AudioFlinger.h
+++ b/services/audioflinger/AudioFlinger.h
@@ -365,16 +365,17 @@
static inline bool isValidPcmSinkChannelMask(audio_channel_mask_t channelMask) {
switch (audio_channel_mask_get_representation(channelMask)) {
case AUDIO_CHANNEL_REPRESENTATION_POSITION: {
- uint32_t channelCount = FCC_2; // stereo is default
- if (kEnableExtendedChannels) {
- channelCount = audio_channel_count_from_out_mask(channelMask);
- if (channelCount < FCC_2 // mono is not supported at this time
- || channelCount > AudioMixer::MAX_NUM_CHANNELS) {
- return false;
- }
+ // Haptic channel mask is only applicable for channel position mask.
+ const uint32_t channelCount = audio_channel_count_from_out_mask(
+ channelMask & ~AUDIO_CHANNEL_HAPTIC_ALL);
+ const uint32_t maxChannelCount = kEnableExtendedChannels
+ ? AudioMixer::MAX_NUM_CHANNELS : FCC_2;
+ if (channelCount < FCC_2 // mono is not supported at this time
+ || channelCount > maxChannelCount) {
+ return false;
}
// check that channelMask is the "canonical" one we expect for the channelCount.
- return channelMask == audio_channel_out_mask_from_count(channelCount);
+ return audio_channel_position_mask_is_out_canonical(channelMask);
}
case AUDIO_CHANNEL_REPRESENTATION_INDEX:
if (kEnableExtendedChannels) {