diff options
| author | Jasmine Cha <chajasmine@google.com> | 2020-04-10 18:37:00 +0800 |
|---|---|---|
| committer | Jasmine Cha <chajasmine@google.com> | 2020-04-14 13:24:52 +0000 |
| commit | 5ffccff5470271504bdd3e495167051525eda35a (patch) | |
| tree | d02dd9b47a3c0c3f5aad4f32f004c64f47dca9dc /hal | |
| parent | b8c5a0f93636821804b03144a7a91426b69005ff (diff) | |
| download | audio-5ffccff5470271504bdd3e495167051525eda35a.tar.gz | |
audio: support more channel condition for stereo recording
- To select correct sound device for recording with
AUDIO_SOURCE_VOICE_RECOGNITION and AUDIO_SOURCE_UNPROCESSED, adding more
conditions to determine sound device.
Bug: 153704905
Bug: 153854533
Test: solotester for unprocessed with ch mask 2,3,4
Test: solotester for voice_recognition with ch mask 2,3,4
Signed-off-by: Jasmine Cha <chajasmine@google.com>
Change-Id: I87ffaacd54ca2a5a5b9918948d73a9583e74b0dd
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) && |