diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-04-30 01:55:05 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-04-30 01:55:05 +0000 |
commit | d1fcbb752c91b6fba9a9054c28f0cc362e0db1b4 (patch) | |
tree | 18536acb2763142b78a407daab4ea32e5f38e087 /hal | |
parent | 63f76ad9a5ae7578b238813fe2eec356b560bd30 (diff) | |
parent | 5ffccff5470271504bdd3e495167051525eda35a (diff) | |
download | audio-d1fcbb752c91b6fba9a9054c28f0cc362e0db1b4.tar.gz |
Merge "audio: support more channel condition for stereo recording" into rvc-dev
Diffstat (limited to 'hal')
-rw-r--r-- | hal/msm8974/platform.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/hal/msm8974/platform.c b/hal/msm8974/platform.c index 8a2fc18..d8ec06a 100644 --- a/hal/msm8974/platform.c +++ b/hal/msm8974/platform.c @@ -3370,7 +3370,9 @@ snd_device_t platform_get_input_snd_device(void *platform, snd_device = SND_DEVICE_IN_VOICE_REC_DMIC_FLUENCE; } in->enable_ec_port = true; - } else if ((channel_mask == AUDIO_CHANNEL_IN_FRONT_BACK) && + } else if (((channel_mask == AUDIO_CHANNEL_IN_FRONT_BACK) || + (channel_mask == AUDIO_CHANNEL_IN_STEREO) || + (channel_mask == AUDIO_CHANNEL_INDEX_MASK_2)) && (my_data->source_mic_type & SOURCE_DUAL_MIC)) { snd_device = SND_DEVICE_IN_VOICE_REC_DMIC_STEREO; } else if ((channel_mask == AUDIO_CHANNEL_INDEX_MASK_3) && @@ -3401,7 +3403,8 @@ snd_device_t platform_get_input_snd_device(void *platform, } else if (source == AUDIO_SOURCE_UNPROCESSED) { if (in_device & AUDIO_DEVICE_IN_BUILTIN_MIC) { if (((channel_mask == AUDIO_CHANNEL_IN_FRONT_BACK) || - (channel_mask == AUDIO_CHANNEL_IN_STEREO)) && + (channel_mask == AUDIO_CHANNEL_IN_STEREO) || + (channel_mask == AUDIO_CHANNEL_INDEX_MASK_2)) && (my_data->source_mic_type & SOURCE_DUAL_MIC)) { snd_device = SND_DEVICE_IN_UNPROCESSED_STEREO_MIC; } else if ((channel_mask == AUDIO_CHANNEL_INDEX_MASK_3) && |