From 1b93fdd73094fcbea2f7dd017968adbdeb2e93c6 Mon Sep 17 00:00:00 2001
From: Tai Kuo <taikuo@google.com>
Date: Wed, 16 Feb 2022 19:09:24 +0800
Subject: [PATCH] haptics: enable hapitcs sink and slot setting

Bug: 220068530
Test: trigger audio coupled haptics via sound picker app
Change-Id: I08885ae97e6f47a2840680481c3f9fb56cbe3c47
---
 .../config/audio_policy_configuration.xml     | 26 +++++++++----------
 ...cy_configuration_a2dp_offload_disabled.xml | 20 +++++++-------
 ...icy_configuration_bluetooth_legacy_hal.xml | 20 +++++++-------
 audio/lynx/config/mixer_paths.xml             |  1 +
 4 files changed, 34 insertions(+), 33 deletions(-)

diff --git a/audio/lynx/config/audio_policy_configuration.xml b/audio/lynx/config/audio_policy_configuration.xml
index b593985..1fd5cfa 100644
--- a/audio/lynx/config/audio_policy_configuration.xml
+++ b/audio/lynx/config/audio_policy_configuration.xml
@@ -50,11 +50,11 @@
                              samplingRates="8000 16000 24000 32000 44100 48000"
                              channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/>
                 </mixPort-->
-                <!--mixPort name="haptic" role="source">
+                <mixPort name="haptic" role="source">
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
                              samplingRates="48000"
                              channelMasks="AUDIO_CHANNEL_OUT_STEREO_HAPTIC_A" />
-                </mixPort-->
+                </mixPort>
                 <!--mixPort name="raw" role="source" flags="AUDIO_OUTPUT_FLAG_RAW AUDIO_OUTPUT_FLAG_FAST">
                     <profile name="" format="AUDIO_FORMAT_PCM_32_BIT"
                              samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
@@ -185,27 +185,27 @@
             <!-- route declaration, i.e. list all available sources for a given sink -->
             <routes>
                 <route type="mix" sink="Speaker"
-                       sources="primary output,deep buffer"/>
+                       sources="primary output,deep buffer,haptic"/>
                 <route type="mix" sink="Speaker Safe"
-                       sources="primary output,deep buffer"/>
+                       sources="primary output,deep buffer,haptic"/>
                 <route type="mix" sink="Earpiece"
-                       sources="primary output,deep buffer"/>
+                       sources="primary output,deep buffer,haptic"/>
                 <route type="mix" sink="BT A2DP Out"
-                       sources="primary output,deep buffer"/>
+                       sources="primary output,deep buffer,haptic"/>
                 <route type="mix" sink="BT A2DP Headphones"
-                       sources="primary output,deep buffer"/>
+                       sources="primary output,deep buffer,haptic"/>
                 <route type="mix" sink="BT A2DP Speaker"
-                       sources="primary output,deep buffer"/>
+                       sources="primary output,deep buffer,haptic"/>
                 <route type="mix" sink="USB Device Out"
-                       sources="primary output,deep buffer"/>
+                       sources="primary output,deep buffer,haptic"/>
                 <route type="mix" sink="USB Headset Out"
-                       sources="primary output,deep buffer"/>
+                       sources="primary output,deep buffer,haptic"/>
                 <route type="mix" sink="BT SCO"
-                       sources="primary output,deep buffer"/>
+                       sources="primary output,deep buffer,haptic"/>
                 <route type="mix" sink="BT SCO Headset"
-                       sources="primary output,deep buffer"/>
+                       sources="primary output,deep buffer,haptic"/>
                 <route type="mix" sink="BT SCO Car Kit"
-                       sources="primary output,deep buffer"/>
+                       sources="primary output,deep buffer,haptic"/>
                 <!--route type="mix" sink="Telephony Tx" sources="incall playback,voice call tx" /-->
                 <route type="mix" sink="primary input"
                        sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
diff --git a/audio/lynx/config/audio_policy_configuration_a2dp_offload_disabled.xml b/audio/lynx/config/audio_policy_configuration_a2dp_offload_disabled.xml
index aa9bac8..5e1dd84 100644
--- a/audio/lynx/config/audio_policy_configuration_a2dp_offload_disabled.xml
+++ b/audio/lynx/config/audio_policy_configuration_a2dp_offload_disabled.xml
@@ -50,11 +50,11 @@
                              samplingRates="8000 16000 24000 32000 44100 48000"
                              channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/>
                 </mixPort-->
-                <!--mixPort name="haptic" role="source">
+                <mixPort name="haptic" role="source">
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
                              samplingRates="48000"
                              channelMasks="AUDIO_CHANNEL_OUT_STEREO_HAPTIC_A" />
-                </mixPort-->
+                </mixPort>
                 <!--mixPort name="raw" role="source" flags="AUDIO_OUTPUT_FLAG_RAW AUDIO_OUTPUT_FLAG_FAST">
                     <profile name="" format="AUDIO_FORMAT_PCM_32_BIT"
                              samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
@@ -170,21 +170,21 @@
             <!-- route declaration, i.e. list all available sources for a given sink -->
             <routes>
                 <route type="mix" sink="Speaker"
-                       sources="primary output,deep buffer"/>
+                       sources="primary output,deep buffer,haptic"/>
                 <route type="mix" sink="Speaker Safe"
-                       sources="primary output,deep buffer"/>
+                       sources="primary output,deep buffer,haptic"/>
                 <route type="mix" sink="Earpiece"
-                       sources="primary output,deep buffer"/>
+                       sources="primary output,deep buffer,haptic"/>
                 <route type="mix" sink="USB Device Out"
-                       sources="primary output,deep buffer"/>
+                       sources="primary output,deep buffer,haptic"/>
                 <route type="mix" sink="USB Headset Out"
-                       sources="primary output,deep buffer"/>
+                       sources="primary output,deep buffer,haptic"/>
                 <route type="mix" sink="BT SCO"
-                       sources="primary output,deep buffer"/>
+                       sources="primary output,deep buffer,haptic"/>
                 <route type="mix" sink="BT SCO Headset"
-                       sources="primary output,deep buffer"/>
+                       sources="primary output,deep buffer,haptic"/>
                 <route type="mix" sink="BT SCO Car Kit"
-                       sources="primary output,deep buffer"/>
+                       sources="primary output,deep buffer,haptic"/>
                 <!--route type="mix" sink="Telephony Tx" sources="incall playback,voice call tx" /-->
                 <route type="mix" sink="primary input"
                        sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
diff --git a/audio/lynx/config/audio_policy_configuration_bluetooth_legacy_hal.xml b/audio/lynx/config/audio_policy_configuration_bluetooth_legacy_hal.xml
index 9b1a1cd..72a6e62 100644
--- a/audio/lynx/config/audio_policy_configuration_bluetooth_legacy_hal.xml
+++ b/audio/lynx/config/audio_policy_configuration_bluetooth_legacy_hal.xml
@@ -50,11 +50,11 @@
                              samplingRates="8000 16000 24000 32000 44100 48000"
                              channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/>
                 </mixPort-->
-                <!--mixPort name="haptic" role="source">
+                <mixPort name="haptic" role="source">
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
                              samplingRates="48000"
                              channelMasks="AUDIO_CHANNEL_OUT_STEREO_HAPTIC_A" />
-                </mixPort-->
+                </mixPort>
                 <!--mixPort name="raw" role="source" flags="AUDIO_OUTPUT_FLAG_RAW AUDIO_OUTPUT_FLAG_FAST">
                     <profile name="" format="AUDIO_FORMAT_PCM_32_BIT"
                              samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
@@ -170,21 +170,21 @@
             <!-- route declaration, i.e. list all available sources for a given sink -->
             <routes>
                 <route type="mix" sink="Speaker"
-                       sources="primary output,deep buffer"/>
+                       sources="primary output,deep buffer,haptic"/>
                 <route type="mix" sink="Speaker Safe"
-                       sources="primary output,deep buffer"/>
+                       sources="primary output,deep buffer,haptic"/>
                 <route type="mix" sink="Earpiece"
-                       sources="primary output,deep buffer"/>
+                       sources="primary output,deep buffer,haptic"/>
                 <route type="mix" sink="USB Device Out"
-                       sources="primary output,deep buffer"/>
+                       sources="primary output,deep buffer,haptic"/>
                 <route type="mix" sink="USB Headset Out"
-                       sources="primary output,deep buffer"/>
+                       sources="primary output,deep buffer,haptic"/>
                 <route type="mix" sink="BT SCO"
-                       sources="primary output,deep buffer"/>
+                       sources="primary output,deep buffer,haptic"/>
                 <route type="mix" sink="BT SCO Headset"
-                       sources="primary output,deep buffer"/>
+                       sources="primary output,deep buffer,haptic"/>
                 <route type="mix" sink="BT SCO Car Kit"
-                       sources="primary output,deep buffer"/>
+                       sources="primary output,deep buffer,haptic"/>
                 <!--route type="mix" sink="Telephony Tx" sources="incall playback,voice call tx" /-->
                 <route type="mix" sink="primary input"
                        sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
diff --git a/audio/lynx/config/mixer_paths.xml b/audio/lynx/config/mixer_paths.xml
index c2065f9..1584810 100644
--- a/audio/lynx/config/mixer_paths.xml
+++ b/audio/lynx/config/mixer_paths.xml
@@ -39,6 +39,7 @@
     <ctl name="TDM_0_TX Sample Rate" value="SR_48K" />
 
     <!-- Haptic setting -->
+    <ctl name="Haptics Source" value="PCM"/>
     <ctl name="HAPTIC_RX Format" value="S32_LE"/>
     <ctl name="HAPTIC_RX SlotFmt" value="S32_LE"/>
     <ctl name="HAPTIC_RX Chan" value="Four"/>