From e1635ec096d1110c33a5aa46847af59c261fb7fa Mon Sep 17 00:00:00 2001 From: Glenn Kasten Date: Mon, 8 Jun 2015 15:46:49 -0700 Subject: Take advantage of audio_channel_in_mask_from_count Bug: 21375533 Bug: 21721483 Change-Id: I1ccd5d1d68a25f415dc4a62bf7a44d9db12a256b --- services/audioflinger/Threads.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'services/audioflinger/Threads.cpp') diff --git a/services/audioflinger/Threads.cpp b/services/audioflinger/Threads.cpp index dc6710f..ad445a5 100644 --- a/services/audioflinger/Threads.cpp +++ b/services/audioflinger/Threads.cpp @@ -743,7 +743,8 @@ void AudioFlinger::ThreadBase::processConfigEvents_l() String8 channelMaskToString(audio_channel_mask_t mask, bool output) { String8 s; - const audio_channel_representation_t representation = audio_channel_mask_get_representation(mask); + const audio_channel_representation_t representation = + audio_channel_mask_get_representation(mask); switch (representation) { case AUDIO_CHANNEL_REPRESENTATION_POSITION: { @@ -6709,11 +6710,8 @@ bool AudioFlinger::RecordThread::checkForNewParameter_l(const String8& keyValueP audio_format_t reqFormat = mFormat; uint32_t samplingRate = mSampleRate; + // TODO this may change if we want to support capture from HDMI PCM multi channel (e.g on TVs). audio_channel_mask_t channelMask = audio_channel_in_mask_from_count(mChannelCount); - // possible that we are > 2 channels, use channel index mask - if (channelMask == AUDIO_CHANNEL_INVALID && mChannelCount <= FCC_8) { - audio_channel_mask_for_index_assignment_from_count(mChannelCount); - } AudioParameter param = AudioParameter(keyValuePair); int value; -- cgit v1.1