t0lte: boost audio incall

-speakerphone was being clipped, scale back the index
and increase the overall boost (includes out-of-call audio)
-increase the other incall outputs

Change-Id: I7a9748afd5c9ace41909a02c842bda946687b9b9

3 files changed, 10 insertions, 11 deletions

diff --git a/audio/audio_hw.c b/audio/audio_hw.c
index 5dac457..d4aca93 100755
--- a/audio/audio_hw.c
+++ b/audio/audio_hw.c
@@ -211,6 +211,7 @@ static int (*csd_wide_voice)(uint8_t);
 static int (*csd_slow_talk)(uint8_t);
 static int (*csd_fens)(uint8_t);
 static int (*csd_volume_index)(int);
+static int (*csd_volume)(int);
 static int (*csd_start_voice)(int,int,int);
 static int (*csd_stop_voice)(int);
 static int (*csd_client_volume)(int);
@@ -533,7 +534,7 @@ static void set_incall_device(struct m0_audio_device *adev)
         case AUDIO_DEVICE_OUT_EARPIECE:
             rx_dev_id = DEVICE_HANDSET_RX_ACDB_ID;
             tx_dev_id = DEVICE_HANDSET_TX_ACDB_ID;
-            voice_index = 5;
+            voice_index = 6;
             break;
         case AUDIO_DEVICE_OUT_SPEAKER:
         case AUDIO_DEVICE_OUT_ANLG_DOCK_HEADSET:
@@ -541,13 +542,13 @@ static void set_incall_device(struct m0_audio_device *adev)
         case AUDIO_DEVICE_OUT_AUX_DIGITAL:
             rx_dev_id = DEVICE_SPEAKER_MONO_RX_ACDB_ID;
             tx_dev_id = DEVICE_SPEAKER_TX_ACDB_ID;
-            voice_index = 9;
+            voice_index = 7;
             break;
         case AUDIO_DEVICE_OUT_WIRED_HEADSET:
         case AUDIO_DEVICE_OUT_WIRED_HEADPHONE:
             rx_dev_id = DEVICE_HEADSET_RX_ACDB_ID;
             tx_dev_id = DEVICE_HEADSET_TX_ACDB_ID;
-            voice_index = 5;
+            voice_index = 6;
             break;
         case AUDIO_DEVICE_OUT_BLUETOOTH_SCO:
         case AUDIO_DEVICE_OUT_BLUETOOTH_SCO_HEADSET:
@@ -564,7 +565,7 @@ static void set_incall_device(struct m0_audio_device *adev)
         default:
             rx_dev_id = DEVICE_HANDSET_RX_ACDB_ID;
             tx_dev_id = DEVICE_HANDSET_TX_ACDB_ID;
-            voice_index = 5;
+            voice_index = 6;
             break;
     }
 
@@ -2720,9 +2721,7 @@ static int adev_set_voice_volume(struct audio_hw_device *dev, float volume)
 {
     struct m0_audio_device *adev = (struct m0_audio_device *)dev;
 
-    adev->voice_volume = volume;
-
-    ALOGD("%s: Voice Index: %i", __func__, voice_index);
+    ALOGD("%s: Voice Index: %i  Volume: %f", __func__, voice_index, volume);
 
     if (adev->mode == AUDIO_MODE_IN_CALL) {
         if (csd_volume_index == NULL) {
diff --git a/audio/audio_hw.h b/audio/audio_hw.h
index a35fd5a..a02360f 100644
--- a/audio/audio_hw.h
+++ b/audio/audio_hw.h
@@ -228,7 +228,7 @@ struct route_setting headset_input[] = {
     { .ctl_name = "MIXINL IN2L Switch", .intval = 0, },
     { .ctl_name = "MIXINR IN1R Switch", .intval = 0, },
     { .ctl_name = "Headset Mic Switch", .intval = 1, },
-    { .ctl_name = "IN1L Volume", .intval = 18, },
+    { .ctl_name = "IN1L Volume", .intval = 28, },
     { .ctl_name = "MIXINL IN1L Switch", .intval = 1, },
     { .ctl_name = "MIXINL IN1L Volume", .intval = 0, },
     { .ctl_name = "AIF1ADC1 HPF Mode", .intval = 1, },
@@ -259,8 +259,8 @@ struct route_setting bt_output[] = {
     { .ctl_name = "AIF2DAC2R Mixer AIF1.1 Switch", .intval = 1, },
     { .ctl_name = "AIF2DAC Volume", .intval = 96, },
     { .ctl_name = "MIXINL IN1L Volume", .intval = 1, },
-    { .ctl_name = "IN2L Volume", .intval = 25, },
-    { .ctl_name = "IN1R Volume", .intval = 25, },
+    { .ctl_name = "IN2L Volume", .intval = 28, },
+    { .ctl_name = "IN1R Volume", .intval = 28, },
     { .ctl_name = "LINEOUT1N Switch", .intval = 0, },
     { .ctl_name = "LINEOUT1P Switch", .intval = 0, },
     { .ctl_name = "AIF1ADC1 HPF Switch", .intval = 0, },
diff --git a/configs/tiny_hw.xml b/configs/tiny_hw.xml
index 07a6164..72d2b94 100644
--- a/configs/tiny_hw.xml
+++ b/configs/tiny_hw.xml
@@ -131,7 +131,7 @@ We are able to have most of our routing static so do that
         <ctl name="SPKL DAC1 Volume" val="1"/>
         <ctl name="SPKR DAC1 Volume" val="1"/>
         <ctl name="Speaker Mixer Volume" val="3"/>
-        <ctl name="Speaker Boost Volume" val="4"/>
+        <ctl name="Speaker Boost Volume" val="7"/>
         <ctl name="Speaker Volume" val="57"/>
         <ctl name="AIF1DAC1 EQ Switch" val="1"/>
         <ctl name="AIF1DAC1 EQ1 Volume" val="9"/>