diff options
| author | Glenn Kasten <gkasten@google.com> | 2015-06-08 15:46:49 -0700 |
|---|---|---|
| committer | Glenn Kasten <gkasten@google.com> | 2015-06-09 08:56:37 -0700 |
| commit | e1635ec096d1110c33a5aa46847af59c261fb7fa (patch) | |
| tree | 440b1c8f000d3a7d6eebf92f48e49e9376fa3a5f /services/audioflinger | |
| parent | d16a8ef26fd1f7a86061c396c5865564af2f1abb (diff) | |
| download | frameworks_av-e1635ec096d1110c33a5aa46847af59c261fb7fa.zip frameworks_av-e1635ec096d1110c33a5aa46847af59c261fb7fa.tar.gz frameworks_av-e1635ec096d1110c33a5aa46847af59c261fb7fa.tar.bz2 | |
Take advantage of audio_channel_in_mask_from_count
Bug: 21375533
Bug: 21721483
Change-Id: I1ccd5d1d68a25f415dc4a62bf7a44d9db12a256b
Diffstat (limited to 'services/audioflinger')
| -rw-r--r-- | services/audioflinger/Threads.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
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; |