commit 078b660460fdfafe9b03f1c4971530edda1dd842
author Carter Hsu <carterhsu@google.com> Tue May 29 10:57:23 2018 +0800
committer Carter Hsu <carterhsu@google.com> Tue May 29 14:01:04 2018 +0800
tree 4a6013366685c937fc6534dfa1f80c4624c3b253
parent 0db0c9519402e43d2aa6d89386d227282d23e015

taimen: fix voip on voice-hac-handset

1. add voip/playback path for voice-hac-handset
2. clean up below error
05-29 10:50:06.501   747  1309 E audio_route: unable to find sub path 'bt-sco-headset'
05-29 10:50:06.501   747  1309 E audio_route: unable to find sub path 'bt-sco-headset-wb'
05-29 10:50:06.501   747  1309 E audio_route: unable to find sub path 'bt-sco-headset'
05-29 10:50:06.501   747  1309 E audio_route: unable to find sub path 'bt-sco-headset-wb'
3. fix btsco path for mmap-playback

Bug: 79728803
Test: enable HAC in VOIP call and no error log
Change-Id: I6c85315a39d505b09d6ed9f900ead17dc78e0084
Signed-off-by: Carter Hsu <carterhsu@google.com>

mixer_paths_tavil.xml

diff --git a/mixer_paths_tavil.xml b/mixer_paths_tavil.xml
index 46c5a68..1151590 100644
--- a/mixer_paths_tavil.xml
+++ b/mixer_paths_tavil.xml
@@ -886,6 +886,10 @@
         <ctl name="QUAT_MI2S_RX Audio Mixer MultiMedia2" value="1" />
     </path>
 
+    <path name="hifi-playback handset-hac">
+        <ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia2" value="1" />
+    </path>
+
     <path name="hifi-playback display-port">
         <ctl name="DISPLAY_PORT Mixer MultiMedia2" value="1" />
     </path>
@@ -940,6 +944,10 @@
         <ctl name="QUAT_MI2S_RX Audio Mixer MultiMedia4" value="1" />
     </path>
 
+    <path name="compress-offload-playback handset-hac">
+        <ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia4" value="1" />
+    </path>
+
     <path name="compress-offload-playback display-port">
         <ctl name="DISPLAY_PORT Mixer MultiMedia4" value="1" />
     </path>
@@ -1006,17 +1014,21 @@
         <ctl name="QUAT_MI2S_RX Audio Mixer MultiMedia3" value="1" />
     </path>
 
+    <path name="mmap-playback handset-hac">
+        <ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia3" value="1" />
+    </path>
+
     <path name="mmap-playback speaker-and-headphones">
         <path name="mmap-playback speaker" />
         <path name="mmap-playback" />
     </path>
 
     <path name="mmap-playback bt-sco">
-        <ctl name="AUX_PCM_RX Audio Mixer MultiMedia3" value="1" />
+        <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia3" value="1" />
     </path>
 
     <path name="mmap-playback bt-sco-wb">
-        <ctl name="AUX PCM SampleRate" value="16000" />
+        <ctl name="BT SampleRate" value="KHZ_16" />
         <path name="mmap-playback bt-sco" />
     </path>
 
@@ -1861,6 +1873,12 @@
         <path name="handset-mic" />
     </path>
 
+    <path name="bt-sco-headset">
+    </path>
+
+    <path name="bt-sco-headset-wb">
+    </path>
+
     <path name="speaker-and-bt-sco">
         <path name="speaker"/>
         <path name="bt-sco-headset"/>
@@ -1881,15 +1899,9 @@
         <path name="bt-sco-headset-wb"/>
     </path>
 
-    <path name="bt-sco-headset">
-    </path>
-
     <path name="bt-sco-mic">
     </path>
 
-    <path name="bt-sco-headset-wb">
-    </path>
-
     <path name="bt-sco-mic-wb">
     </path>
 
@@ -2118,6 +2130,10 @@
       <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia10" value="1" />
     </path>
 
+    <path name="audio-playback-voip handset-hac">
+      <ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia10" value="1" />
+    </path>
+
 <!-- VoIP Tx settings -->
     <path name="audio-record-voip">
       <ctl name="MultiMedia10 Mixer SLIM_0_TX" value="1" />