hal: reset echo reference at the end of recording/VoIP sessions
Echo reference is not being reset currently at the end of
recording/VoIP session causing the echo reference not to
work in the further instances of recording/VoIP sessions.
Fix this by resetting echo reference while closing the input
stream used for recording/VoIP usecases.
CRs-Fixed: 717973
Change-Id: I761ba112952951777525b1bf102c9d6ccaad3269
diff --git a/hal/msm8916/platform.c b/hal/msm8916/platform.c
index 2cc923d..7b945cf 100644
--- a/hal/msm8916/platform.c
+++ b/hal/msm8916/platform.c
@@ -124,6 +124,7 @@
int fluence_mode;
bool slowtalk;
bool hd_voice;
+ bool ec_ref_enabled;
/* Audio calibration related functions */
void *acdb_handle;
int voice_feature_set;
@@ -472,16 +473,24 @@
}
}
-static void set_echo_reference(struct audio_device *adev, bool enable)
+void platform_set_echo_reference(void *platform, bool enable)
{
- int ret = 0;
+ struct platform_data *my_data = (struct platform_data *)platform;
+ struct audio_device *adev = my_data->adev;
- if (enable)
- ret = audio_route_apply_and_update_path(adev->audio_route, "echo-reference");
- else
- ret = audio_route_reset_and_update_path(adev->audio_route, "echo-reference");
+ if (enable) {
+ my_data->ec_ref_enabled = enable;
+ audio_route_apply_and_update_path(adev->audio_route, "echo-reference");
+ } else {
+ if (my_data->ec_ref_enabled) {
+ audio_route_reset_and_update_path(adev->audio_route, "echo-reference");
+ my_data->ec_ref_enabled = enable;
+ } else {
+ ALOGV("EC reference is already disabled : %d", my_data->ec_ref_enabled);
+ }
+ }
- ALOGV("Setting EC Reference: %d ret: %d", enable, ret);
+ ALOGV("Setting EC Reference: %d", enable);
}
static struct csd_data *open_csd_client()
@@ -1474,14 +1483,16 @@
} else if (my_data->fluence_type == FLUENCE_NONE ||
my_data->fluence_in_voice_call == false) {
snd_device = SND_DEVICE_IN_HANDSET_MIC;
- set_echo_reference(adev, true);
+ if (audio_extn_hfp_is_active(adev))
+ platform_set_echo_reference(adev->platform, true);
} else {
snd_device = SND_DEVICE_IN_VOICE_DMIC;
adev->acdb_settings |= DMIC_FLAG;
}
} else if (out_device & AUDIO_DEVICE_OUT_WIRED_HEADSET) {
snd_device = SND_DEVICE_IN_VOICE_HEADSET_MIC;
- set_echo_reference(adev, true);
+ if (audio_extn_hfp_is_active(adev))
+ platform_set_echo_reference(adev->platform, true);
} else if (out_device & AUDIO_DEVICE_OUT_ALL_SCO) {
if (adev->bt_wb_speech_enabled) {
if (adev->bluetooth_nrec)
@@ -1510,7 +1521,8 @@
}
} else {
snd_device = SND_DEVICE_IN_VOICE_SPEAKER_MIC;
- set_echo_reference(adev, true);
+ if (audio_extn_hfp_is_active(adev))
+ platform_set_echo_reference(adev->platform, true);
}
}
} else if (source == AUDIO_SOURCE_CAMCORDER) {
@@ -1562,7 +1574,7 @@
} else if (in_device & AUDIO_DEVICE_IN_WIRED_HEADSET) {
snd_device = SND_DEVICE_IN_HEADSET_MIC_FLUENCE;
}
- set_echo_reference(adev, true);
+ platform_set_echo_reference(adev->platform, true);
} else if (adev->active_input->enable_aec) {
if (in_device & AUDIO_DEVICE_IN_BACK_MIC) {
if (my_data->fluence_type & FLUENCE_DUAL_MIC &&
@@ -1583,7 +1595,7 @@
} else if (in_device & AUDIO_DEVICE_IN_WIRED_HEADSET) {
snd_device = SND_DEVICE_IN_HEADSET_MIC_FLUENCE;
}
- set_echo_reference(adev, true);
+ platform_set_echo_reference(adev->platform, true);
} else if (adev->active_input->enable_ns) {
if (in_device & AUDIO_DEVICE_IN_BACK_MIC) {
if (my_data->fluence_type & FLUENCE_DUAL_MIC &&
@@ -1604,9 +1616,9 @@
} else if (in_device & AUDIO_DEVICE_IN_WIRED_HEADSET) {
snd_device = SND_DEVICE_IN_HEADSET_MIC_FLUENCE;
}
- set_echo_reference(adev, false);
+ platform_set_echo_reference(adev->platform,false);
} else
- set_echo_reference(adev, false);
+ platform_set_echo_reference(adev->platform, false);
}
} else if (source == AUDIO_SOURCE_MIC) {
if (in_device & AUDIO_DEVICE_IN_BUILTIN_MIC &&