summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--audio/audio_hw.c4
-rw-r--r--audio/audio_hw.h26
2 files changed, 20 insertions, 10 deletions
diff --git a/audio/audio_hw.c b/audio/audio_hw.c
index e567e38..31aecad 100644
--- a/audio/audio_hw.c
+++ b/audio/audio_hw.c
@@ -2545,9 +2545,13 @@ static int adev_set_parameters(struct audio_hw_device *dev, const char *kvpairs)
if (strcmp(value, "true") == 0) {
ALOGE("%s: enabling two mic control", __func__);
ril_set_two_mic_control(&adev->ril, AUDIENCE, TWO_MIC_SOLUTION_ON);
+ /* sub mic */
+ set_bigroute_by_array(adev->mixer, noise_suppression, 1);
} else {
ALOGE("%s: disabling two mic control", __func__);
ril_set_two_mic_control(&adev->ril, AUDIENCE, TWO_MIC_SOLUTION_OFF);
+ /* sub mic */
+ set_bigroute_by_array(adev->mixer, noise_suppression_disable, 1);
}
}
diff --git a/audio/audio_hw.h b/audio/audio_hw.h
index b4919c4..5ba0e9e 100644
--- a/audio/audio_hw.h
+++ b/audio/audio_hw.h
@@ -133,16 +133,8 @@ struct route_setting default_input[] = {
{ .ctl_name = "AIF1ADCL Source", .intval = 0, },
{ .ctl_name = "AIF2ADCL Source", .intval = 0, },
{ .ctl_name = "MIXINL IN2L Switch", .intval = 1, },
- { .ctl_name = "Sub Mic Switch", .intval = 1, },
- { .ctl_name = "SubMicBias Mode", .intval = 1, },
- { .ctl_name = "AIF1ADCR Source", .intval = 1, },
- { .ctl_name = "AIF2ADCR Source", .intval = 1, },
- { .ctl_name = "MIXINR IN1R Switch", .intval = 1, },
{ .ctl_name = "IN2L Volume", .intval = 25, },
- { .ctl_name = "IN1R Volume", .intval = 25, },
{ .ctl_name = "MIXINL IN2L Volume", .intval = 0, },
- { .ctl_name = "DAC2 Left Sidetone Volume", .intval = 12, },
- { .ctl_name = "DAC2 Right Sidetone Volume", .intval = 12, },
{ .ctl_name = "AIF2ADC Volume", .intval = 96, },
{ .ctl_name = "AIF2ADCL DRC Switch", .intval = 0, },
{ .ctl_name = NULL, },
@@ -152,11 +144,25 @@ struct route_setting default_input_disable[] = {
{ .ctl_name = "Main Mic Switch", .intval = 0, },
{ .ctl_name = "MainMicBias Mode", .intval = 0, },
{ .ctl_name = "MIXINL IN2L Switch", .intval = 0, },
+ { .ctl_name = "AIF2DACL Source", .intval = 0, },
+ { .ctl_name = "AIF2DACR Source", .intval = 1, },
+ { .ctl_name = NULL, },
+};
+
+struct route_setting noise_suppression[] = {
+ { .ctl_name = "Sub Mic Switch", .intval = 1, },
+ { .ctl_name = "SubMicBias Mode", .intval = 1, },
+ { .ctl_name = "IN1R Volume", .intval = 25, },
+ { .ctl_name = "MIXINR IN1R Switch", .intval = 1, },
+ { .ctl_name = "MIXINR IN1R Volume", .intval = 0, },
+ { .ctl_name = "AIF1ADCR Source", .intval = 1, },
+ { .ctl_name = NULL, },
+};
+struct route_setting noise_suppression_disable[] = {
{ .ctl_name = "Sub Mic Switch", .intval = 0, },
{ .ctl_name = "SubMicBias Mode", .intval = 0, },
{ .ctl_name = "MIXINR IN1R Switch", .intval = 0, },
- { .ctl_name = "AIF2DACL Source", .intval = 0, },
- { .ctl_name = "AIF2DACR Source", .intval = 1, },
+ { .ctl_name = "MIXINR IN1R Volume", .intval = 0, },
{ .ctl_name = NULL, },
};