google-gs201/android_device_google_lynx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

haptics: enable hapitcs sink and slot setting am: 1b93fdd730

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/lynx/+/18015285

Change-Id: Ic4abd96391568f5d4e1d85f259e53549b1b90228
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Tai Kuo
2022-05-03 16:45:14 +00:00
committed by Automerger Merge Worker
parent 9f02336f69 1b93fdd730
commit c40284b802
4 changed files with 34 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
audio/lynx/config/audio_policy_configuration.xml
View File

@@ -50,11 +50,11 @@
samplingRates="8000 16000 24000 32000 44100 48000" samplingRates="8000 16000 24000 32000 44100 48000"
channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/> channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/>
</mixPort--> </mixPort-->
<!--mixPort name="haptic" role="source"> <mixPort name="haptic" role="source">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT" <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
samplingRates="48000" samplingRates="48000"
channelMasks="AUDIO_CHANNEL_OUT_STEREO_HAPTIC_A" /> channelMasks="AUDIO_CHANNEL_OUT_STEREO_HAPTIC_A" />
</mixPort--> </mixPort>
<!--mixPort name="raw" role="source" flags="AUDIO_OUTPUT_FLAG_RAW AUDIO_OUTPUT_FLAG_FAST"> <!--mixPort name="raw" role="source" flags="AUDIO_OUTPUT_FLAG_RAW AUDIO_OUTPUT_FLAG_FAST">
<profile name="" format="AUDIO_FORMAT_PCM_32_BIT" <profile name="" format="AUDIO_FORMAT_PCM_32_BIT"
samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
@@ -185,27 +185,27 @@
<!-- route declaration, i.e. list all available sources for a given sink --> <!-- route declaration, i.e. list all available sources for a given sink -->
<routes> <routes>
<route type="mix" sink="Speaker" <route type="mix" sink="Speaker"
sources="primary output,deep buffer"/> sources="primary output,deep buffer,haptic"/>
<route type="mix" sink="Speaker Safe" <route type="mix" sink="Speaker Safe"
sources="primary output,deep buffer"/> sources="primary output,deep buffer,haptic"/>
<route type="mix" sink="Earpiece" <route type="mix" sink="Earpiece"
sources="primary output,deep buffer"/> sources="primary output,deep buffer,haptic"/>
<route type="mix" sink="BT A2DP Out" <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" <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" <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" <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" <route type="mix" sink="USB Headset Out"
sources="primary output,deep buffer"/> sources="primary output,deep buffer,haptic"/>
<route type="mix" sink="BT SCO" <route type="mix" sink="BT SCO"
sources="primary output,deep buffer"/> sources="primary output,deep buffer,haptic"/>
<route type="mix" sink="BT SCO Headset" <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" <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="Telephony Tx" sources="incall playback,voice call tx" /-->
<route type="mix" sink="primary input" <route type="mix" sink="primary input"
sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/> sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>

20
audio/lynx/config/audio_policy_configuration_a2dp_offload_disabled.xml
View File

@@ -50,11 +50,11 @@
samplingRates="8000 16000 24000 32000 44100 48000" samplingRates="8000 16000 24000 32000 44100 48000"
channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/> channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/>
</mixPort--> </mixPort-->
<!--mixPort name="haptic" role="source"> <mixPort name="haptic" role="source">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT" <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
samplingRates="48000" samplingRates="48000"
channelMasks="AUDIO_CHANNEL_OUT_STEREO_HAPTIC_A" /> channelMasks="AUDIO_CHANNEL_OUT_STEREO_HAPTIC_A" />
</mixPort--> </mixPort>
<!--mixPort name="raw" role="source" flags="AUDIO_OUTPUT_FLAG_RAW AUDIO_OUTPUT_FLAG_FAST"> <!--mixPort name="raw" role="source" flags="AUDIO_OUTPUT_FLAG_RAW AUDIO_OUTPUT_FLAG_FAST">
<profile name="" format="AUDIO_FORMAT_PCM_32_BIT" <profile name="" format="AUDIO_FORMAT_PCM_32_BIT"
samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
@@ -170,21 +170,21 @@
<!-- route declaration, i.e. list all available sources for a given sink --> <!-- route declaration, i.e. list all available sources for a given sink -->
<routes> <routes>
<route type="mix" sink="Speaker" <route type="mix" sink="Speaker"
sources="primary output,deep buffer"/> sources="primary output,deep buffer,haptic"/>
<route type="mix" sink="Speaker Safe" <route type="mix" sink="Speaker Safe"
sources="primary output,deep buffer"/> sources="primary output,deep buffer,haptic"/>
<route type="mix" sink="Earpiece" <route type="mix" sink="Earpiece"
sources="primary output,deep buffer"/> sources="primary output,deep buffer,haptic"/>
<route type="mix" sink="USB Device Out" <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" <route type="mix" sink="USB Headset Out"
sources="primary output,deep buffer"/> sources="primary output,deep buffer,haptic"/>
<route type="mix" sink="BT SCO" <route type="mix" sink="BT SCO"
sources="primary output,deep buffer"/> sources="primary output,deep buffer,haptic"/>
<route type="mix" sink="BT SCO Headset" <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" <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="Telephony Tx" sources="incall playback,voice call tx" /-->
<route type="mix" sink="primary input" <route type="mix" sink="primary input"
sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/> sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>

20
audio/lynx/config/audio_policy_configuration_bluetooth_legacy_hal.xml
View File

@@ -50,11 +50,11 @@
samplingRates="8000 16000 24000 32000 44100 48000" samplingRates="8000 16000 24000 32000 44100 48000"
channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/> channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/>
</mixPort--> </mixPort-->
<!--mixPort name="haptic" role="source"> <mixPort name="haptic" role="source">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT" <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
samplingRates="48000" samplingRates="48000"
channelMasks="AUDIO_CHANNEL_OUT_STEREO_HAPTIC_A" /> channelMasks="AUDIO_CHANNEL_OUT_STEREO_HAPTIC_A" />
</mixPort--> </mixPort>
<!--mixPort name="raw" role="source" flags="AUDIO_OUTPUT_FLAG_RAW AUDIO_OUTPUT_FLAG_FAST"> <!--mixPort name="raw" role="source" flags="AUDIO_OUTPUT_FLAG_RAW AUDIO_OUTPUT_FLAG_FAST">
<profile name="" format="AUDIO_FORMAT_PCM_32_BIT" <profile name="" format="AUDIO_FORMAT_PCM_32_BIT"
samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
@@ -170,21 +170,21 @@
<!-- route declaration, i.e. list all available sources for a given sink --> <!-- route declaration, i.e. list all available sources for a given sink -->
<routes> <routes>
<route type="mix" sink="Speaker" <route type="mix" sink="Speaker"
sources="primary output,deep buffer"/> sources="primary output,deep buffer,haptic"/>
<route type="mix" sink="Speaker Safe" <route type="mix" sink="Speaker Safe"
sources="primary output,deep buffer"/> sources="primary output,deep buffer,haptic"/>
<route type="mix" sink="Earpiece" <route type="mix" sink="Earpiece"
sources="primary output,deep buffer"/> sources="primary output,deep buffer,haptic"/>
<route type="mix" sink="USB Device Out" <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" <route type="mix" sink="USB Headset Out"
sources="primary output,deep buffer"/> sources="primary output,deep buffer,haptic"/>
<route type="mix" sink="BT SCO" <route type="mix" sink="BT SCO"
sources="primary output,deep buffer"/> sources="primary output,deep buffer,haptic"/>
<route type="mix" sink="BT SCO Headset" <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" <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="Telephony Tx" sources="incall playback,voice call tx" /-->
<route type="mix" sink="primary input" <route type="mix" sink="primary input"
sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/> sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>

1
audio/lynx/config/mixer_paths.xml
View File

@@ -39,6 +39,7 @@
<ctl name="TDM_0_TX Sample Rate" value="SR_48K" /> <ctl name="TDM_0_TX Sample Rate" value="SR_48K" />
<!-- Haptic setting --> <!-- Haptic setting -->
<ctl name="Haptics Source" value="PCM"/>
<ctl name="HAPTIC_RX Format" value="S32_LE"/> <ctl name="HAPTIC_RX Format" value="S32_LE"/>
<ctl name="HAPTIC_RX SlotFmt" value="S32_LE"/> <ctl name="HAPTIC_RX SlotFmt" value="S32_LE"/>
<ctl name="HAPTIC_RX Chan" value="Four"/> <ctl name="HAPTIC_RX Chan" value="Four"/>