diff options
| author | Eric Laurent <elaurent@google.com> | 2015-10-15 17:49:04 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-10-15 17:49:04 +0000 |
| commit | be75de5e7363aae0dbef69c016b60e02bb391ff6 (patch) | |
| tree | 6459b52e0c4014b689c069c9a1a2093cbd869f3c | |
| parent | cc99651a39f1740444cb6cd7d75c4422038c7b67 (diff) | |
| parent | 26f06c79dd04fba38a97f2548ead140d25edde78 (diff) | |
| download | android_hardware_qcom_audio-be75de5e7363aae0dbef69c016b60e02bb391ff6.tar.gz android_hardware_qcom_audio-be75de5e7363aae0dbef69c016b60e02bb391ff6.tar.bz2 android_hardware_qcom_audio-be75de5e7363aae0dbef69c016b60e02bb391ff6.zip | |
am 26f06c79: Merge "hal: fix mic selection for IN_COMMUNICATION mode" into mnc-dr-dev
* commit '26f06c79dd04fba38a97f2548ead140d25edde78':
hal: fix mic selection for IN_COMMUNICATION mode
| -rw-r--r-- | hal/audio_hw.c | 10 | ||||
| -rw-r--r-- | hal/msm8960/platform.c | 3 | ||||
| -rw-r--r-- | hal/msm8974/platform.c | 3 |
3 files changed, 11 insertions, 5 deletions
diff --git a/hal/audio_hw.c b/hal/audio_hw.c index 9b5a0950..2e954d67 100644 --- a/hal/audio_hw.c +++ b/hal/audio_hw.c @@ -643,7 +643,8 @@ int select_devices(struct audio_device *adev, usecase->stream.out->devices); if (usecase->stream.out == adev->primary_output && adev->active_input && - adev->active_input->source == AUDIO_SOURCE_VOICE_COMMUNICATION && + (adev->active_input->source == AUDIO_SOURCE_VOICE_COMMUNICATION || + adev->mode == AUDIO_MODE_IN_COMMUNICATION) && out_snd_device != usecase->out_snd_device) { select_devices(adev, adev->active_input->usecase); } @@ -653,7 +654,9 @@ int select_devices(struct audio_device *adev, out_snd_device = SND_DEVICE_NONE; if (in_snd_device == SND_DEVICE_NONE) { audio_devices_t out_device = AUDIO_DEVICE_NONE; - if (adev->active_input->source == AUDIO_SOURCE_VOICE_COMMUNICATION) { + if (adev->active_input && + (adev->active_input->source == AUDIO_SOURCE_VOICE_COMMUNICATION || + adev->mode == AUDIO_MODE_IN_COMMUNICATION)) { platform_set_echo_reference(adev, false, AUDIO_DEVICE_NONE); if (usecase->id == USECASE_AUDIO_RECORD_AFE_PROXY) { out_device = AUDIO_DEVICE_OUT_TELEPHONY_TX; @@ -2058,7 +2061,8 @@ static int add_remove_audio_effect(const struct audio_stream *stream, lock_input_stream(in); pthread_mutex_lock(&in->dev->lock); - if ((in->source == AUDIO_SOURCE_VOICE_COMMUNICATION) && + if ((in->source == AUDIO_SOURCE_VOICE_COMMUNICATION || + adev->mode == AUDIO_MODE_IN_COMMUNICATION) && in->enable_aec != enable && (memcmp(&desc.type, FX_IID_AEC, sizeof(effect_uuid_t)) == 0)) { in->enable_aec = enable; diff --git a/hal/msm8960/platform.c b/hal/msm8960/platform.c index c78d9434..0ffe8a98 100644 --- a/hal/msm8960/platform.c +++ b/hal/msm8960/platform.c @@ -794,7 +794,8 @@ snd_device_t platform_get_input_snd_device(void *platform, audio_devices_t out_d snd_device = SND_DEVICE_IN_VOICE_REC_MIC; } } - } else if (source == AUDIO_SOURCE_VOICE_COMMUNICATION) { + } else if (source == AUDIO_SOURCE_VOICE_COMMUNICATION || + mode == AUDIO_MODE_IN_COMMUNICATION) { if (out_device & AUDIO_DEVICE_OUT_SPEAKER) in_device = AUDIO_DEVICE_IN_BACK_MIC; if (adev->active_input) { diff --git a/hal/msm8974/platform.c b/hal/msm8974/platform.c index cf493952..ab836bd9 100644 --- a/hal/msm8974/platform.c +++ b/hal/msm8974/platform.c @@ -1968,7 +1968,8 @@ snd_device_t platform_get_input_snd_device(void *platform, audio_devices_t out_d } else if (in_device & AUDIO_DEVICE_IN_WIRED_HEADSET) { snd_device = SND_DEVICE_IN_VOICE_REC_HEADSET_MIC; } - } else if (source == AUDIO_SOURCE_VOICE_COMMUNICATION) { + } else if (source == AUDIO_SOURCE_VOICE_COMMUNICATION || + mode == AUDIO_MODE_IN_COMMUNICATION) { if (out_device & (AUDIO_DEVICE_OUT_SPEAKER | AUDIO_DEVICE_OUT_SPEAKER_SAFE)) in_device = AUDIO_DEVICE_IN_BACK_MIC; if (adev->active_input) { |