diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-04-30 02:22:10 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-04-30 02:22:10 +0000 |
| commit | 16d62912f3ed88ca948c2a1da33d6731844cff87 (patch) | |
| tree | 18536acb2763142b78a407daab4ea32e5f38e087 | |
| parent | ba4eb0125f23c0d3f0764de1d0b361e7dee6db25 (diff) | |
| parent | 129fa9a43d0f51af0caa563aea00ce3735a4be29 (diff) | |
| download | audio-16d62912f3ed88ca948c2a1da33d6731844cff87.tar.gz | |
Merge "audio: support more channel condition for stereo recording" into rvc-dev am: d1fcbb752c am: 129fa9a43d
Change-Id: Idd4719ba03b9727055522f85dc9e401b3df2bed5
| -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) && |