Evolution-X-Tensor/device_google_pantah
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

audio: apply new pcm id for immersive output

Browse source 
Change to use pcm id 30 for immersive output,
which is using raw path in AoC to get lower
roundtrip latency.

Bug: 237677573
Test: spatial audio playback
Change-Id: I6519f75daf2f65dc8f1e2a4a3827f8956f563c35
This commit is contained in:
millerliang 2022-07-14 08:57:31 +00:00
parent 9ed0780a88
commit 6834a1034c
10 changed files with 20 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
audio/cheetah/config/audio_platform_configuration.xml
View file

@ -184,7 +184,7 @@
<!-- dev1: voice-call downlink dev2: voice-clal uplink --> <!-- dev1: voice-call downlink dev2: voice-clal uplink -->
<usecase id="UC_VOICE_CALL" dev1="4" dev2="11"/> <usecase id="UC_VOICE_CALL" dev1="4" dev2="11"/>
<!-- for output with flag AUDIO_OUTPUT_SPATIALIZER --> <!-- for output with flag AUDIO_OUTPUT_SPATIALIZER -->
<usecase id="UC_IMMERSIVE_PLAYBACK" dev1="3"/> <usecase id="UC_IMMERSIVE_PLAYBACK" dev1="30" dyn_path="true" dsp_vol="false" mmap="false" period="10" period_num="3"/>
<!-- for output with AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD, 4 * 128KB buffer --> <!-- for output with AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD, 4 * 128KB buffer -->
<usecase id="UC_COMPRESSED_OFFLOAD_PLAYBACK" dev1="6" dyn_path="true" dsp_vol="true" mmap="false" period="131072" period_num="4" pre_proc_id="14"/> <usecase id="UC_COMPRESSED_OFFLOAD_PLAYBACK" dev1="6" dyn_path="true" dsp_vol="true" mmap="false" period="131072" period_num="4" pre_proc_id="14"/>
<!-- dev1: audio dev2: haptic --> <!-- dev1: audio dev2: haptic -->

2
audio/cheetah/config/audio_policy_configuration.xml
View file

@ -65,7 +65,7 @@
samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
</mixPort> </mixPort>
<mixPort name="immersive_out" role="source" flags="AUDIO_OUTPUT_FLAG_SPATIALIZER"> <mixPort name="immersive_out" role="source" flags="AUDIO_OUTPUT_FLAG_SPATIALIZER">
<profile name="" format="AUDIO_FORMAT_PCM_FLOAT" <profile name="" format="AUDIO_FORMAT_PCM_32_BIT"
samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
</mixPort> </mixPort>
<mixPort name="incall playback" role="source" <mixPort name="incall playback" role="source"

2
audio/cheetah/config/audio_policy_configuration_a2dp_offload_disabled.xml
View file

@ -65,7 +65,7 @@
samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
</mixPort> </mixPort>
<mixPort name="immersive_out" role="source" flags="AUDIO_OUTPUT_FLAG_SPATIALIZER"> <mixPort name="immersive_out" role="source" flags="AUDIO_OUTPUT_FLAG_SPATIALIZER">
<profile name="" format="AUDIO_FORMAT_PCM_FLOAT" <profile name="" format="AUDIO_FORMAT_PCM_32_BIT"
samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
</mixPort> </mixPort>
<mixPort name="incall playback" role="source" <mixPort name="incall playback" role="source"

2
audio/cheetah/config/audio_policy_configuration_le_offload_disabled.xml
View file

@ -65,7 +65,7 @@
samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
</mixPort> </mixPort>
<mixPort name="immersive_out" role="source" flags="AUDIO_OUTPUT_FLAG_SPATIALIZER"> <mixPort name="immersive_out" role="source" flags="AUDIO_OUTPUT_FLAG_SPATIALIZER">
<profile name="" format="AUDIO_FORMAT_PCM_FLOAT" <profile name="" format="AUDIO_FORMAT_PCM_32_BIT"
samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
</mixPort> </mixPort>
<mixPort name="incall playback" role="source" <mixPort name="incall playback" role="source"

9
audio/cheetah/config/mixer_paths.xml
View file

@ -130,6 +130,7 @@
<ctl name="TDM_0_RX Mixer NoHost1" value="0"/> <ctl name="TDM_0_RX Mixer NoHost1" value="0"/>
<ctl name="TDM_0_RX Mixer VOIP" value="0"/> <ctl name="TDM_0_RX Mixer VOIP" value="0"/>
<ctl name="TDM_0_RX Mixer RAW" value="0"/> <ctl name="TDM_0_RX Mixer RAW" value="0"/>
<ctl name="TDM_0_RX Mixer IMSV" value="0"/>
<ctl name="TDM_1_RX Mixer EP1" value="0"/> <ctl name="TDM_1_RX Mixer EP1" value="0"/>
<ctl name="TDM_1_RX Mixer EP2" value="0"/> <ctl name="TDM_1_RX Mixer EP2" value="0"/>
@ -152,6 +153,7 @@
<ctl name="USB_RX Mixer VOIP" value="0"/> <ctl name="USB_RX Mixer VOIP" value="0"/>
<ctl name="USB_RX Mixer HIFI" value="0"/> <ctl name="USB_RX Mixer HIFI" value="0"/>
<ctl name="USB_RX Mixer RAW" value="0"/> <ctl name="USB_RX Mixer RAW" value="0"/>
<ctl name="USB_RX Mixer IMSV" value="0"/>
<ctl name="BT_RX Mixer EP1" value="0"/> <ctl name="BT_RX Mixer EP1" value="0"/>
<ctl name="BT_RX Mixer EP2" value="0"/> <ctl name="BT_RX Mixer EP2" value="0"/>
@ -163,6 +165,7 @@
<ctl name="BT_RX Mixer NoHost1" value="0"/> <ctl name="BT_RX Mixer NoHost1" value="0"/>
<ctl name="BT_RX Mixer VOIP" value="0"/> <ctl name="BT_RX Mixer VOIP" value="0"/>
<ctl name="BT_RX Mixer RAW" value="0"/> <ctl name="BT_RX Mixer RAW" value="0"/>
<ctl name="BT_RX Mixer IMSV" value="0"/>
<ctl name="INCALL_RX Mixer EP1" value="0"/> <ctl name="INCALL_RX Mixer EP1" value="0"/>
<ctl name="INCALL_RX Mixer EP2" value="0"/> <ctl name="INCALL_RX Mixer EP2" value="0"/>
@ -450,15 +453,15 @@
</path> </path>
<path name="immersive-playbackP"> <path name="immersive-playbackP">
<ctl name="TDM_0_RX Mixer EP4" value="1"/> <ctl name="TDM_0_RX Mixer IMSV" value="1"/>
</path> </path>
<path name="immersive-playbackP bt"> <path name="immersive-playbackP bt">
<ctl name="BT_RX Mixer EP4" value="1"/> <ctl name="BT_RX Mixer IMSV" value="1"/>
</path> </path>
<path name="immersive-playbackP usb-headphone"> <path name="immersive-playbackP usb-headphone">
<ctl name="USB_RX Mixer EP4" value="1"/> <ctl name="USB_RX Mixer IMSV" value="1"/>
</path> </path>
<path name="voip-playbackP"> <path name="voip-playbackP">

2
audio/panther/config/audio_platform_configuration.xml
View file

@ -184,7 +184,7 @@
<!-- dev1: voice-call downlink dev2: voice-clal uplink --> <!-- dev1: voice-call downlink dev2: voice-clal uplink -->
<usecase id="UC_VOICE_CALL" dev1="4" dev2="11"/> <usecase id="UC_VOICE_CALL" dev1="4" dev2="11"/>
<!-- for output with flag AUDIO_OUTPUT_SPATIALIZER --> <!-- for output with flag AUDIO_OUTPUT_SPATIALIZER -->
<usecase id="UC_IMMERSIVE_PLAYBACK" dev1="3"/> <usecase id="UC_IMMERSIVE_PLAYBACK" dev1="30" dyn_path="true" dsp_vol="false" mmap="false" period="10" period_num="3"/>
<!-- for output with AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD, 4 * 128KB buffer --> <!-- for output with AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD, 4 * 128KB buffer -->
<usecase id="UC_COMPRESSED_OFFLOAD_PLAYBACK" dev1="6" dyn_path="true" dsp_vol="true" mmap="false" period="131072" period_num="4" pre_proc_id="14"/> <usecase id="UC_COMPRESSED_OFFLOAD_PLAYBACK" dev1="6" dyn_path="true" dsp_vol="true" mmap="false" period="131072" period_num="4" pre_proc_id="14"/>
<!-- dev1: audio dev2: haptic --> <!-- dev1: audio dev2: haptic -->

2
audio/panther/config/audio_policy_configuration.xml
View file

@ -65,7 +65,7 @@
samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
</mixPort> </mixPort>
<mixPort name="immersive_out" role="source" flags="AUDIO_OUTPUT_FLAG_SPATIALIZER"> <mixPort name="immersive_out" role="source" flags="AUDIO_OUTPUT_FLAG_SPATIALIZER">
<profile name="" format="AUDIO_FORMAT_PCM_FLOAT" <profile name="" format="AUDIO_FORMAT_PCM_32_BIT"
samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
</mixPort> </mixPort>
<mixPort name="incall playback" role="source" <mixPort name="incall playback" role="source"

2
audio/panther/config/audio_policy_configuration_a2dp_offload_disabled.xml
View file

@ -65,7 +65,7 @@
samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
</mixPort> </mixPort>
<mixPort name="immersive_out" role="source" flags="AUDIO_OUTPUT_FLAG_SPATIALIZER"> <mixPort name="immersive_out" role="source" flags="AUDIO_OUTPUT_FLAG_SPATIALIZER">
<profile name="" format="AUDIO_FORMAT_PCM_FLOAT" <profile name="" format="AUDIO_FORMAT_PCM_32_BIT"
samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
</mixPort> </mixPort>
<mixPort name="incall playback" role="source" <mixPort name="incall playback" role="source"

2
audio/panther/config/audio_policy_configuration_le_offload_disabled.xml
View file

@ -65,7 +65,7 @@
samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
</mixPort> </mixPort>
<mixPort name="immersive_out" role="source" flags="AUDIO_OUTPUT_FLAG_SPATIALIZER"> <mixPort name="immersive_out" role="source" flags="AUDIO_OUTPUT_FLAG_SPATIALIZER">
<profile name="" format="AUDIO_FORMAT_PCM_FLOAT" <profile name="" format="AUDIO_FORMAT_PCM_32_BIT"
samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
</mixPort> </mixPort>
<mixPort name="incall playback" role="source" <mixPort name="incall playback" role="source"

9
audio/panther/config/mixer_paths.xml
View file

@ -130,6 +130,7 @@
<ctl name="TDM_0_RX Mixer NoHost1" value="0"/> <ctl name="TDM_0_RX Mixer NoHost1" value="0"/>
<ctl name="TDM_0_RX Mixer VOIP" value="0"/> <ctl name="TDM_0_RX Mixer VOIP" value="0"/>
<ctl name="TDM_0_RX Mixer RAW" value="0"/> <ctl name="TDM_0_RX Mixer RAW" value="0"/>
<ctl name="TDM_0_RX Mixer IMSV" value="0"/>
<ctl name="TDM_1_RX Mixer EP1" value="0"/> <ctl name="TDM_1_RX Mixer EP1" value="0"/>
<ctl name="TDM_1_RX Mixer EP2" value="0"/> <ctl name="TDM_1_RX Mixer EP2" value="0"/>
@ -152,6 +153,7 @@
<ctl name="USB_RX Mixer VOIP" value="0"/> <ctl name="USB_RX Mixer VOIP" value="0"/>
<ctl name="USB_RX Mixer HIFI" value="0"/> <ctl name="USB_RX Mixer HIFI" value="0"/>
<ctl name="USB_RX Mixer RAW" value="0"/> <ctl name="USB_RX Mixer RAW" value="0"/>
<ctl name="USB_RX Mixer IMSV" value="0"/>
<ctl name="BT_RX Mixer EP1" value="0"/> <ctl name="BT_RX Mixer EP1" value="0"/>
<ctl name="BT_RX Mixer EP2" value="0"/> <ctl name="BT_RX Mixer EP2" value="0"/>
@ -163,6 +165,7 @@
<ctl name="BT_RX Mixer NoHost1" value="0"/> <ctl name="BT_RX Mixer NoHost1" value="0"/>
<ctl name="BT_RX Mixer VOIP" value="0"/> <ctl name="BT_RX Mixer VOIP" value="0"/>
<ctl name="BT_RX Mixer RAW" value="0"/> <ctl name="BT_RX Mixer RAW" value="0"/>
<ctl name="BT_RX Mixer IMSV" value="0"/>
<ctl name="INCALL_RX Mixer EP1" value="0"/> <ctl name="INCALL_RX Mixer EP1" value="0"/>
<ctl name="INCALL_RX Mixer EP2" value="0"/> <ctl name="INCALL_RX Mixer EP2" value="0"/>
@ -450,15 +453,15 @@
</path> </path>
<path name="immersive-playbackP"> <path name="immersive-playbackP">
<ctl name="TDM_0_RX Mixer EP4" value="1"/> <ctl name="TDM_0_RX Mixer IMSV" value="1"/>
</path> </path>
<path name="immersive-playbackP bt"> <path name="immersive-playbackP bt">
<ctl name="BT_RX Mixer EP4" value="1"/> <ctl name="BT_RX Mixer IMSV" value="1"/>
</path> </path>
<path name="immersive-playbackP usb-headphone"> <path name="immersive-playbackP usb-headphone">
<ctl name="USB_RX Mixer EP4" value="1"/> <ctl name="USB_RX Mixer IMSV" value="1"/>
</path> </path>
<path name="voip-playbackP"> <path name="voip-playbackP">