From 3183354f352beee41dff372af9c67443b88050d6 Mon Sep 17 00:00:00 2001
From: Haynes Mathew George <hgeorge@codeaurora.org>
Date: Thu, 25 May 2017 11:38:18 -0700
Subject: [PATCH] muskie: voip rx controls

mixer path additions
audio_platform info updates

Bug: 62393776
Test: hangout call
Change-Id: I7af811856846d8075e16ff8f540a7931d31581c9
Signed-off-by: David Lin <dtwlin@google.com>
---
 audio_platform_info_tavil.xml | 13 ++++---
 mixer_paths_tavil.xml         | 66 +++++++++++++++++++++++++++++++----
 2 files changed, 68 insertions(+), 11 deletions(-)

diff --git a/audio_platform_info_tavil.xml b/audio_platform_info_tavil.xml
index ebd49e6..c010d19 100644
--- a/audio_platform_info_tavil.xml
+++ b/audio_platform_info_tavil.xml
@@ -73,6 +73,8 @@
         <usecase name="USECASE_AUDIO_RECORD_AFE_PROXY" type="in" id="7" />
         <usecase name="USECASE_AUDIO_RECORD_MMAP" type="in" id="18" />
         <usecase name="USECASE_AUDIO_PLAYBACK_MMAP" type="out" id="18" />
+        <usecase name="USECASE_AUDIO_PLAYBACK_VOIP" type="out" id="16" />
+        <usecase name="USECASE_AUDIO_RECORD_VOIP" type="in" id="16" />
     </pcm_ids>
     <config_params>
         <param key="input_mic_max_count" value="3"/>
@@ -104,11 +106,12 @@
         <gain_level_map db="0" level="0"/>
     </gain_db_to_level_mapping>
     <app_types>
-      <app uc_type="PCM_PLAYBACK" bit_width="16" id="69936" max_rate="96000" />
-      <app uc_type="PCM_PLAYBACK" bit_width="24" id="69940" max_rate="192000" />
-      <app uc_type="PCM_PLAYBACK" bit_width="32" id="69942" max_rate="192000" />
-      <app uc_type="PCM_CAPTURE"  bit_width="16" id="69938" max_rate="96000" />
-      <app uc_type="PCM_CAPTURE"  bit_width="24" id="69940" max_rate="96000" />
+      <app uc_type="PCM_PLAYBACK" mode="default" bit_width="16" id="69936" max_rate="96000" />
+      <app uc_type="PCM_PLAYBACK" mode="default" bit_width="24" id="69940" max_rate="192000" />
+      <app uc_type="PCM_PLAYBACK" mode="voip" bit_width="16" id="69945" max_rate="48000" />
+      <app uc_type="PCM_CAPTURE"  mode="default" bit_width="16" id="69938" max_rate="96000" />
+      <app uc_type="PCM_CAPTURE"  mode="default" bit_width="24" id="69940" max_rate="96000" />
+      <app uc_type="PCM_CAPTURE"  mode="voip" bit_width="16" id="69945" max_rate="48000" />
     </app_types>
 </audio_platform_info>
 
diff --git a/mixer_paths_tavil.xml b/mixer_paths_tavil.xml
index 26f08e1..043c1bb 100644
--- a/mixer_paths_tavil.xml
+++ b/mixer_paths_tavil.xml
@@ -116,6 +116,7 @@
     <ctl name="MultiMedia1 Mixer SLIM_0_TX" value="0" />
     <ctl name="MultiMedia1 Mixer SLIM_4_TX" value="0" />
     <ctl name="MultiMedia1 Mixer SLIM_7_TX" value="0" />
+    <ctl name="MultiMedia10 Mixer SLIM_7_TX" value="0" />
     <ctl name="HDMI Mixer MultiMedia1" value="0" />
     <ctl name="HDMI Mixer MultiMedia2" value="0" />
     <ctl name="HDMI Mixer MultiMedia3" value="0" />
@@ -197,6 +198,7 @@
     <ctl name="MultiMedia1 Mixer USB_AUDIO_TX" value="0" />
     <ctl name="MultiMedia5 Mixer USB_AUDIO_TX" value="0" />
     <ctl name="MultiMedia8 Mixer USB_AUDIO_TX" value="0" />
+    <ctl name="MultiMedia10 Mixer USB_AUDIO_TX" value="0" />
     <ctl name="USB_AUDIO_RX Channels" value="Two" />
     <ctl name="USB_AUDIO_RX SampleRate" value="KHZ_48" />
     <ctl name="USB_AUDIO_RX Format" value="S16_LE" />
@@ -204,6 +206,7 @@
     <ctl name="USB_AUDIO_TX SampleRate" value="KHZ_48" />
     <ctl name="USB_AUDIO_TX Format" value="S16_LE" />
     <ctl name="MultiMedia6 Mixer SLIM_0_TX" value="0" />
+    <ctl name="MultiMedia10 Mixer SLIM_0_TX" value="0" />
     <ctl name="QUAT_MI2S_RX Audio Mixer MultiMedia1" value="0" />
     <ctl name="QUAT_MI2S_RX Audio Mixer MultiMedia4" value="0" />
     <ctl name="QUAT_MI2S_RX Audio Mixer MultiMedia5" value="0" />
@@ -401,7 +404,7 @@
     <ctl name="SLIMBUS_0_RX Port Mixer SLIM_7_TX" value="0" />
     <!-- HFP end -->
     <!-- echo reference -->
-    <ctl name="AUDIO_REF_EC_UL1 MUX" value="None" />
+    <ctl name="AUDIO_REF_EC_UL10 MUX" value="None" />
     <!-- usb headset -->
     <ctl name="AFE_PCM_RX Audio Mixer MultiMedia1" value="0" />
     <ctl name="AFE_PCM_RX Audio Mixer MultiMedia4" value="0" />
@@ -611,23 +614,23 @@
 
     <!-- These are audio route (FE to BE) specific mixer settings -->
     <path name="echo-reference">
-        <ctl name="AUDIO_REF_EC_UL1 MUX" value="QUAT_MI2S_TX" />
+        <ctl name="AUDIO_REF_EC_UL10 MUX" value="QUAT_MI2S_TX" />
     </path>
 
     <path name="echo-reference speaker">
-        <ctl name="AUDIO_REF_EC_UL1 MUX" value="QUAT_MI2S_TX" />
+        <ctl name="AUDIO_REF_EC_UL10 MUX" value="QUAT_MI2S_TX" />
     </path>
 
     <path name="echo-reference handset">
-        <ctl name="AUDIO_REF_EC_UL1 MUX" value="QUAT_MI2S_RX" />
+        <ctl name="AUDIO_REF_EC_UL10 MUX" value="QUAT_MI2S_RX" />
     </path>
 
     <path name="echo-reference usb-headset">
-        <ctl name="AUDIO_REF_EC_UL1 MUX" value="USB_AUDIO_RX" />
+        <ctl name="AUDIO_REF_EC_UL10 MUX" value="USB_AUDIO_RX" />
     </path>
 
     <path name="echo-reference usb-headphones">
-        <ctl name="AUDIO_REF_EC_UL1 MUX" value="USB_AUDIO_RX" />
+        <ctl name="AUDIO_REF_EC_UL10 MUX" value="USB_AUDIO_RX" />
     </path>
 
     <path name="deep-buffer-playback">
@@ -1936,4 +1939,55 @@
         <path name="incall-rec-uplink-and-downlink" />
     </path>
 
+<!-- VoIP Rx settings -->
+    <path name="audio-playback-voip">
+      <ctl name="QUAT_MI2S_RX Audio Mixer MultiMedia10" value="1" />
+    </path>
+
+    <path name="audio-playback-voip speaker">
+      <ctl name="QUAT_MI2S_RX Audio Mixer MultiMedia10" value="1" />
+    </path>
+
+    <path name="audio-playback-voip handset">
+        <ctl name="QUAT_MI2S_RX Audio Mixer MultiMedia10" value="1" />
+    </path>
+
+    <path name="audio-playback-voip bt-sco">
+      <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia10" value="1" />
+    </path>
+
+    <path name="audio-playback-voip bt-sco-wb">
+      <ctl name="BT SampleRate" value="KHZ_16" />
+      <path name="audio-playback-voip bt-sco" />
+    </path>
+
+    <path name="audio-playback-voip afe-proxy">
+      <ctl name="AFE_PCM_RX Audio Mixer MultiMedia10" value="1" />
+    </path>
+
+    <path name="audio-playback-voip usb-headphones">
+      <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia10" value="1" />
+    </path>
+
+    <path name="audio-playback-voip usb-headset">
+      <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia10" value="1" />
+    </path>
+
+<!-- VoIP Tx settings -->
+    <path name="audio-record-voip">
+      <ctl name="MultiMedia10 Mixer SLIM_0_TX" value="1" />
+    </path>
+
+    <path name="audio-record-voip usb-headset-mic">
+      <ctl name="MultiMedia10 Mixer USB_AUDIO_TX" value="1" />
+    </path>
+
+    <path name="audio-record-voip bt-sco">
+      <ctl name="MultiMedia10 Mixer SLIM_7_TX" value="1" />
+    </path>
+
+    <path name="audio-record-voip bt-sco-wb">
+      <ctl name="BT SampleRate" value="KHZ_16" />
+      <path name="audio-record-voip bt-sco" />
+    </path>
 </mixer>