Snap for 8282142 from edfc5e86bd
to sc-qpr3-release
Change-Id: I0d662b430b4529ebd379394aacbbc64f6d7e22b7
This commit is contained in:
commit
4ab5bd21b8
16 changed files with 156 additions and 184 deletions
|
@ -23,7 +23,8 @@ PRODUCT_COPY_FILES += \
|
||||||
device/google/raviole/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_configuration_a2dp_offload_disabled.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration_a2dp_offload_disabled.xml \
|
device/google/raviole/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_configuration_a2dp_offload_disabled.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration_a2dp_offload_disabled.xml \
|
||||||
device/google/raviole/audio/$(AUDIO_TABLE_FOLDER)/config/audio_platform_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_configuration.xml \
|
device/google/raviole/audio/$(AUDIO_TABLE_FOLDER)/config/audio_platform_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_configuration.xml \
|
||||||
device/google/raviole/audio/$(AUDIO_TABLE_FOLDER)/config/sound_trigger_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_configuration.xml \
|
device/google/raviole/audio/$(AUDIO_TABLE_FOLDER)/config/sound_trigger_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_configuration.xml \
|
||||||
device/google/raviole/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml
|
device/google/raviole/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \
|
||||||
|
device/google/raviole/audio/$(AUDIO_TABLE_FOLDER)/config/bluetooth_audio_policy_configuration_7_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_audio_policy_configuration_7_0.xml
|
||||||
|
|
||||||
# AudioEffectHAL Configuration
|
# AudioEffectHAL Configuration
|
||||||
PRODUCT_COPY_FILES += \
|
PRODUCT_COPY_FILES += \
|
||||||
|
|
|
@ -10,6 +10,7 @@
|
||||||
<library name="proxy" path="libeffectproxy.so"/>
|
<library name="proxy" path="libeffectproxy.so"/>
|
||||||
<library name="offload_effect" path="liboffloadeffect.so"/>
|
<library name="offload_effect" path="liboffloadeffect.so"/>
|
||||||
<library name="haptic_generator" path="libhapticgenerator.so"/>
|
<library name="haptic_generator" path="libhapticgenerator.so"/>
|
||||||
|
<library name="spatializer" path="libspatialaudio.so"/>
|
||||||
</libraries>
|
</libraries>
|
||||||
<effects>
|
<effects>
|
||||||
<effectProxy name="bassboost" library="proxy" uuid="2f0871a2-c93c-4824-9664-42eb2909f2ef">
|
<effectProxy name="bassboost" library="proxy" uuid="2f0871a2-c93c-4824-9664-42eb2909f2ef">
|
||||||
|
@ -51,6 +52,7 @@
|
||||||
<effect name="ns" library="offload_effect" uuid="62ff2836-d050-43c3-9c2d-94a73dad2c64"/>
|
<effect name="ns" library="offload_effect" uuid="62ff2836-d050-43c3-9c2d-94a73dad2c64"/>
|
||||||
<effect name="haptic_generator" library="haptic_generator" uuid="97c4acd1-8b82-4f2f-832e-c2fe5d7a9931"/>
|
<effect name="haptic_generator" library="haptic_generator" uuid="97c4acd1-8b82-4f2f-832e-c2fe5d7a9931"/>
|
||||||
<effect name="dynamics_processing" library="dynamics_processing" uuid="e0e6539b-1781-7261-676f-6d7573696340"/>
|
<effect name="dynamics_processing" library="dynamics_processing" uuid="e0e6539b-1781-7261-676f-6d7573696340"/>
|
||||||
|
<effect name="spatializer" library="spatializer" uuid="cc4677de-ff72-11eb-9a03-0242ac130003"/>
|
||||||
</effects>
|
</effects>
|
||||||
<postprocess>
|
<postprocess>
|
||||||
</postprocess>
|
</postprocess>
|
||||||
|
|
|
@ -182,6 +182,7 @@
|
||||||
<usecase id="UC_DEEP_BUFFER_PLAYBACK" dev1="5" dyn_path="true" dsp_vol="false" mmap="false" period="20" period_num="4"/>
|
<usecase id="UC_DEEP_BUFFER_PLAYBACK" dev1="5" dyn_path="true" dsp_vol="false" mmap="false" period="20" period_num="4"/>
|
||||||
<!-- 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"/>
|
||||||
|
<usecase id="UC_IMMERSIVE_PLAYBACK" dev1="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 -->
|
||||||
|
|
|
@ -63,6 +63,10 @@
|
||||||
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
|
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
|
||||||
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_FAST AUDIO_OUTPUT_FLAG_DEEP_BUFFER">
|
||||||
|
<profile name="" format="AUDIO_FORMAT_PCM_FLOAT"
|
||||||
|
samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
|
||||||
|
</mixPort>
|
||||||
<mixPort name="incall playback" role="source"
|
<mixPort name="incall playback" role="source"
|
||||||
flags="AUDIO_OUTPUT_FLAG_INCALL_MUSIC">
|
flags="AUDIO_OUTPUT_FLAG_INCALL_MUSIC">
|
||||||
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
|
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
|
||||||
|
@ -185,21 +189,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,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
|
sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,immersive_out"/>
|
||||||
<route type="mix" sink="Speaker Safe"
|
<route type="mix" sink="Speaker Safe"
|
||||||
sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
|
sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
|
||||||
<route type="mix" sink="Earpiece"
|
<route type="mix" sink="Earpiece"
|
||||||
sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
|
sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
|
||||||
<route type="mix" sink="BT A2DP Out"
|
<route type="mix" sink="BT A2DP Out"
|
||||||
sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/>
|
sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out"/>
|
||||||
<route type="mix" sink="BT A2DP Headphones"
|
<route type="mix" sink="BT A2DP Headphones"
|
||||||
sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/>
|
sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out"/>
|
||||||
<route type="mix" sink="BT A2DP Speaker"
|
<route type="mix" sink="BT A2DP Speaker"
|
||||||
sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/>
|
sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out"/>
|
||||||
<route type="mix" sink="USB Device Out"
|
<route type="mix" sink="USB Device Out"
|
||||||
sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback"/>
|
sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback,immersive_out"/>
|
||||||
<route type="mix" sink="USB Headset Out"
|
<route type="mix" sink="USB Headset Out"
|
||||||
sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback"/>
|
sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback,immersive_out"/>
|
||||||
<route type="mix" sink="BT SCO"
|
<route type="mix" sink="BT SCO"
|
||||||
sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/>
|
sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/>
|
||||||
<route type="mix" sink="BT SCO Headset"
|
<route type="mix" sink="BT SCO Headset"
|
||||||
|
|
|
@ -63,6 +63,10 @@
|
||||||
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
|
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
|
||||||
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_FAST AUDIO_OUTPUT_FLAG_DEEP_BUFFER">
|
||||||
|
<profile name="" format="AUDIO_FORMAT_PCM_FLOAT"
|
||||||
|
samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
|
||||||
|
</mixPort>
|
||||||
<mixPort name="incall playback" role="source"
|
<mixPort name="incall playback" role="source"
|
||||||
flags="AUDIO_OUTPUT_FLAG_INCALL_MUSIC">
|
flags="AUDIO_OUTPUT_FLAG_INCALL_MUSIC">
|
||||||
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
|
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
|
||||||
|
@ -170,15 +174,15 @@
|
||||||
<!-- 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,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
|
sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,immersive_out"/>
|
||||||
<route type="mix" sink="Speaker Safe"
|
<route type="mix" sink="Speaker Safe"
|
||||||
sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
|
sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
|
||||||
<route type="mix" sink="Earpiece"
|
<route type="mix" sink="Earpiece"
|
||||||
sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
|
sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
|
||||||
<route type="mix" sink="USB Device Out"
|
<route type="mix" sink="USB Device Out"
|
||||||
sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback"/>
|
sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback,immersive_out"/>
|
||||||
<route type="mix" sink="USB Headset Out"
|
<route type="mix" sink="USB Headset Out"
|
||||||
sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback"/>
|
sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback,immersive_out"/>
|
||||||
<route type="mix" sink="BT SCO"
|
<route type="mix" sink="BT SCO"
|
||||||
sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/>
|
sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/>
|
||||||
<route type="mix" sink="BT SCO Headset"
|
<route type="mix" sink="BT SCO Headset"
|
||||||
|
|
|
@ -0,0 +1,44 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<!-- Bluetooth Audio HAL Audio Policy Configuration file -->
|
||||||
|
<module name="bluetooth" halVersion="2.0">
|
||||||
|
<mixPorts>
|
||||||
|
<!-- A2DP Audio Ports -->
|
||||||
|
<mixPort name="a2dp output" role="source" flags="AUDIO_OUTPUT_FLAG_DEEP_BUFFER AUDIO_OUTPUT_FLAG_FAST"/>
|
||||||
|
<!-- Hearing AIDs Audio Ports -->
|
||||||
|
<mixPort name="hearing aid output" role="source">
|
||||||
|
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
|
||||||
|
samplingRates="24000 16000"
|
||||||
|
channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
|
||||||
|
</mixPort>
|
||||||
|
</mixPorts>
|
||||||
|
<devicePorts>
|
||||||
|
<!-- A2DP Audio Ports -->
|
||||||
|
<devicePort tagName="BT A2DP Out" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP" role="sink">
|
||||||
|
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
|
||||||
|
samplingRates="44100 48000 88200 96000"
|
||||||
|
channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
|
||||||
|
</devicePort>
|
||||||
|
<devicePort tagName="BT A2DP Headphones" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_HEADPHONES" role="sink">
|
||||||
|
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
|
||||||
|
samplingRates="44100 48000 88200 96000"
|
||||||
|
channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
|
||||||
|
</devicePort>
|
||||||
|
<devicePort tagName="BT A2DP Speaker" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_SPEAKER" role="sink">
|
||||||
|
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
|
||||||
|
samplingRates="44100 48000 88200 96000"
|
||||||
|
channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
|
||||||
|
</devicePort>
|
||||||
|
<!-- Hearing AIDs Audio Ports -->
|
||||||
|
<devicePort tagName="BT Hearing Aid Out" type="AUDIO_DEVICE_OUT_HEARING_AID" role="sink"/>
|
||||||
|
</devicePorts>
|
||||||
|
<routes>
|
||||||
|
<route type="mix" sink="BT A2DP Out"
|
||||||
|
sources="a2dp output"/>
|
||||||
|
<route type="mix" sink="BT A2DP Headphones"
|
||||||
|
sources="a2dp output"/>
|
||||||
|
<route type="mix" sink="BT A2DP Speaker"
|
||||||
|
sources="a2dp output"/>
|
||||||
|
<route type="mix" sink="BT Hearing Aid Out"
|
||||||
|
sources="hearing aid output"/>
|
||||||
|
</routes>
|
||||||
|
</module>
|
|
@ -429,6 +429,18 @@
|
||||||
<path name="compress-offload-playback" />
|
<path name="compress-offload-playback" />
|
||||||
</path>
|
</path>
|
||||||
|
|
||||||
|
<path name="immersive-playbackP">
|
||||||
|
<ctl name="TDM_0_RX Mixer EP4" value="1"/>
|
||||||
|
</path>
|
||||||
|
|
||||||
|
<path name="immersive-playbackP bt">
|
||||||
|
<ctl name="BT_RX Mixer EP4" value="1"/>
|
||||||
|
</path>
|
||||||
|
|
||||||
|
<path name="immersive-playbackP usb-headphone">
|
||||||
|
<ctl name="USB_RX Mixer EP4" value="1"/>
|
||||||
|
</path>
|
||||||
|
|
||||||
<path name="voip-playbackP">
|
<path name="voip-playbackP">
|
||||||
<ctl name="TDM_0_RX Mixer VOIP" value="1"/>
|
<ctl name="TDM_0_RX Mixer VOIP" value="1"/>
|
||||||
</path>
|
</path>
|
||||||
|
|
|
@ -23,7 +23,8 @@ PRODUCT_COPY_FILES += \
|
||||||
device/google/raviole/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_configuration_a2dp_offload_disabled.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration_a2dp_offload_disabled.xml \
|
device/google/raviole/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_configuration_a2dp_offload_disabled.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration_a2dp_offload_disabled.xml \
|
||||||
device/google/raviole/audio/$(AUDIO_TABLE_FOLDER)/config/audio_platform_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_configuration.xml \
|
device/google/raviole/audio/$(AUDIO_TABLE_FOLDER)/config/audio_platform_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_configuration.xml \
|
||||||
device/google/raviole/audio/$(AUDIO_TABLE_FOLDER)/config/sound_trigger_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_configuration.xml \
|
device/google/raviole/audio/$(AUDIO_TABLE_FOLDER)/config/sound_trigger_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_configuration.xml \
|
||||||
device/google/raviole/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml
|
device/google/raviole/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \
|
||||||
|
device/google/raviole/audio/$(AUDIO_TABLE_FOLDER)/config/bluetooth_audio_policy_configuration_7_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_audio_policy_configuration_7_0.xml
|
||||||
|
|
||||||
# AudioEffectHAL Configuration
|
# AudioEffectHAL Configuration
|
||||||
PRODUCT_COPY_FILES += \
|
PRODUCT_COPY_FILES += \
|
||||||
|
|
|
@ -10,6 +10,7 @@
|
||||||
<library name="proxy" path="libeffectproxy.so"/>
|
<library name="proxy" path="libeffectproxy.so"/>
|
||||||
<library name="offload_effect" path="liboffloadeffect.so"/>
|
<library name="offload_effect" path="liboffloadeffect.so"/>
|
||||||
<library name="haptic_generator" path="libhapticgenerator.so"/>
|
<library name="haptic_generator" path="libhapticgenerator.so"/>
|
||||||
|
<library name="spatializer" path="libspatialaudio.so"/>
|
||||||
</libraries>
|
</libraries>
|
||||||
<effects>
|
<effects>
|
||||||
<effectProxy name="bassboost" library="proxy" uuid="2f0871a2-c93c-4824-9664-42eb2909f2ef">
|
<effectProxy name="bassboost" library="proxy" uuid="2f0871a2-c93c-4824-9664-42eb2909f2ef">
|
||||||
|
@ -51,6 +52,7 @@
|
||||||
<effect name="ns" library="offload_effect" uuid="62ff2836-d050-43c3-9c2d-94a73dad2c64"/>
|
<effect name="ns" library="offload_effect" uuid="62ff2836-d050-43c3-9c2d-94a73dad2c64"/>
|
||||||
<effect name="haptic_generator" library="haptic_generator" uuid="97c4acd1-8b82-4f2f-832e-c2fe5d7a9931"/>
|
<effect name="haptic_generator" library="haptic_generator" uuid="97c4acd1-8b82-4f2f-832e-c2fe5d7a9931"/>
|
||||||
<effect name="dynamics_processing" library="dynamics_processing" uuid="e0e6539b-1781-7261-676f-6d7573696340"/>
|
<effect name="dynamics_processing" library="dynamics_processing" uuid="e0e6539b-1781-7261-676f-6d7573696340"/>
|
||||||
|
<effect name="spatializer" library="spatializer" uuid="cc4677de-ff72-11eb-9a03-0242ac130003"/>
|
||||||
</effects>
|
</effects>
|
||||||
<postprocess>
|
<postprocess>
|
||||||
</postprocess>
|
</postprocess>
|
||||||
|
|
|
@ -182,6 +182,7 @@
|
||||||
<usecase id="UC_DEEP_BUFFER_PLAYBACK" dev1="5" dyn_path="true" dsp_vol="false" mmap="false" period="20" period_num="4"/>
|
<usecase id="UC_DEEP_BUFFER_PLAYBACK" dev1="5" dyn_path="true" dsp_vol="false" mmap="false" period="20" period_num="4"/>
|
||||||
<!-- 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"/>
|
||||||
|
<usecase id="UC_IMMERSIVE_PLAYBACK" dev1="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 -->
|
||||||
|
|
|
@ -63,6 +63,10 @@
|
||||||
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
|
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
|
||||||
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_FAST AUDIO_OUTPUT_FLAG_DEEP_BUFFER">
|
||||||
|
<profile name="" format="AUDIO_FORMAT_PCM_FLOAT"
|
||||||
|
samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
|
||||||
|
</mixPort>
|
||||||
<mixPort name="incall playback" role="source"
|
<mixPort name="incall playback" role="source"
|
||||||
flags="AUDIO_OUTPUT_FLAG_INCALL_MUSIC">
|
flags="AUDIO_OUTPUT_FLAG_INCALL_MUSIC">
|
||||||
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
|
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
|
||||||
|
@ -185,21 +189,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,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
|
sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,immersive_out"/>
|
||||||
<route type="mix" sink="Speaker Safe"
|
<route type="mix" sink="Speaker Safe"
|
||||||
sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
|
sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
|
||||||
<route type="mix" sink="Earpiece"
|
<route type="mix" sink="Earpiece"
|
||||||
sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
|
sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
|
||||||
<route type="mix" sink="BT A2DP Out"
|
<route type="mix" sink="BT A2DP Out"
|
||||||
sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/>
|
sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out"/>
|
||||||
<route type="mix" sink="BT A2DP Headphones"
|
<route type="mix" sink="BT A2DP Headphones"
|
||||||
sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/>
|
sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out"/>
|
||||||
<route type="mix" sink="BT A2DP Speaker"
|
<route type="mix" sink="BT A2DP Speaker"
|
||||||
sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/>
|
sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out"/>
|
||||||
<route type="mix" sink="USB Device Out"
|
<route type="mix" sink="USB Device Out"
|
||||||
sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback"/>
|
sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback,immersive_out"/>
|
||||||
<route type="mix" sink="USB Headset Out"
|
<route type="mix" sink="USB Headset Out"
|
||||||
sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback"/>
|
sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback,immersive_out"/>
|
||||||
<route type="mix" sink="BT SCO"
|
<route type="mix" sink="BT SCO"
|
||||||
sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/>
|
sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/>
|
||||||
<route type="mix" sink="BT SCO Headset"
|
<route type="mix" sink="BT SCO Headset"
|
||||||
|
|
|
@ -63,6 +63,10 @@
|
||||||
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
|
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
|
||||||
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_FAST AUDIO_OUTPUT_FLAG_DEEP_BUFFER">
|
||||||
|
<profile name="" format="AUDIO_FORMAT_PCM_FLOAT"
|
||||||
|
samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
|
||||||
|
</mixPort>
|
||||||
<mixPort name="incall playback" role="source"
|
<mixPort name="incall playback" role="source"
|
||||||
flags="AUDIO_OUTPUT_FLAG_INCALL_MUSIC">
|
flags="AUDIO_OUTPUT_FLAG_INCALL_MUSIC">
|
||||||
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
|
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
|
||||||
|
@ -170,15 +174,15 @@
|
||||||
<!-- 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,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
|
sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,immersive_out"/>
|
||||||
<route type="mix" sink="Speaker Safe"
|
<route type="mix" sink="Speaker Safe"
|
||||||
sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
|
sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
|
||||||
<route type="mix" sink="Earpiece"
|
<route type="mix" sink="Earpiece"
|
||||||
sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
|
sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
|
||||||
<route type="mix" sink="USB Device Out"
|
<route type="mix" sink="USB Device Out"
|
||||||
sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback"/>
|
sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback,immersive_out"/>
|
||||||
<route type="mix" sink="USB Headset Out"
|
<route type="mix" sink="USB Headset Out"
|
||||||
sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback"/>
|
sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback,immersive_out"/>
|
||||||
<route type="mix" sink="BT SCO"
|
<route type="mix" sink="BT SCO"
|
||||||
sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/>
|
sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/>
|
||||||
<route type="mix" sink="BT SCO Headset"
|
<route type="mix" sink="BT SCO Headset"
|
||||||
|
|
|
@ -0,0 +1,44 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<!-- Bluetooth Audio HAL Audio Policy Configuration file -->
|
||||||
|
<module name="bluetooth" halVersion="2.0">
|
||||||
|
<mixPorts>
|
||||||
|
<!-- A2DP Audio Ports -->
|
||||||
|
<mixPort name="a2dp output" role="source" flags="AUDIO_OUTPUT_FLAG_DEEP_BUFFER AUDIO_OUTPUT_FLAG_FAST"/>
|
||||||
|
<!-- Hearing AIDs Audio Ports -->
|
||||||
|
<mixPort name="hearing aid output" role="source">
|
||||||
|
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
|
||||||
|
samplingRates="24000 16000"
|
||||||
|
channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
|
||||||
|
</mixPort>
|
||||||
|
</mixPorts>
|
||||||
|
<devicePorts>
|
||||||
|
<!-- A2DP Audio Ports -->
|
||||||
|
<devicePort tagName="BT A2DP Out" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP" role="sink">
|
||||||
|
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
|
||||||
|
samplingRates="44100 48000 88200 96000"
|
||||||
|
channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
|
||||||
|
</devicePort>
|
||||||
|
<devicePort tagName="BT A2DP Headphones" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_HEADPHONES" role="sink">
|
||||||
|
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
|
||||||
|
samplingRates="44100 48000 88200 96000"
|
||||||
|
channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
|
||||||
|
</devicePort>
|
||||||
|
<devicePort tagName="BT A2DP Speaker" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_SPEAKER" role="sink">
|
||||||
|
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
|
||||||
|
samplingRates="44100 48000 88200 96000"
|
||||||
|
channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
|
||||||
|
</devicePort>
|
||||||
|
<!-- Hearing AIDs Audio Ports -->
|
||||||
|
<devicePort tagName="BT Hearing Aid Out" type="AUDIO_DEVICE_OUT_HEARING_AID" role="sink"/>
|
||||||
|
</devicePorts>
|
||||||
|
<routes>
|
||||||
|
<route type="mix" sink="BT A2DP Out"
|
||||||
|
sources="a2dp output"/>
|
||||||
|
<route type="mix" sink="BT A2DP Headphones"
|
||||||
|
sources="a2dp output"/>
|
||||||
|
<route type="mix" sink="BT A2DP Speaker"
|
||||||
|
sources="a2dp output"/>
|
||||||
|
<route type="mix" sink="BT Hearing Aid Out"
|
||||||
|
sources="hearing aid output"/>
|
||||||
|
</routes>
|
||||||
|
</module>
|
|
@ -429,6 +429,18 @@
|
||||||
<path name="compress-offload-playback" />
|
<path name="compress-offload-playback" />
|
||||||
</path>
|
</path>
|
||||||
|
|
||||||
|
<path name="immersive-playbackP">
|
||||||
|
<ctl name="TDM_0_RX Mixer EP4" value="1"/>
|
||||||
|
</path>
|
||||||
|
|
||||||
|
<path name="immersive-playbackP bt">
|
||||||
|
<ctl name="BT_RX Mixer EP4" value="1"/>
|
||||||
|
</path>
|
||||||
|
|
||||||
|
<path name="immersive-playbackP usb-headphone">
|
||||||
|
<ctl name="USB_RX Mixer EP4" value="1"/>
|
||||||
|
</path>
|
||||||
|
|
||||||
<path name="voip-playbackP">
|
<path name="voip-playbackP">
|
||||||
<ctl name="TDM_0_RX Mixer VOIP" value="1"/>
|
<ctl name="TDM_0_RX Mixer VOIP" value="1"/>
|
||||||
</path>
|
</path>
|
||||||
|
|
|
@ -227,88 +227,6 @@
|
||||||
non-zero amplitudes, to bring the vibrator amplitude down to zero using this timing. -->
|
non-zero amplitudes, to bring the vibrator amplitude down to zero using this timing. -->
|
||||||
<integer name="config_vibrationWaveformRampDownDuration">50</integer>
|
<integer name="config_vibrationWaveformRampDownDuration">50</integer>
|
||||||
|
|
||||||
<!-- A vibration waveform for notifications that specify DEFAULT_VIBRATE.
|
|
||||||
This value is a float array with values grouped as
|
|
||||||
{ targetAmplitude (within [0,1]), targetFrequency [-1,1], duration (in milliseconds) }
|
|
||||||
This is only applied on devices with vibration frequency control. If the device doesn't
|
|
||||||
support frequency control, then the vibration specified in
|
|
||||||
config_defaultNotificationVibePattern is used instead.
|
|
||||||
-->
|
|
||||||
<array name="config_defaultNotificationVibeWaveform">
|
|
||||||
<item>0.0</item>
|
|
||||||
<item>-0.85</item>
|
|
||||||
<item>0.0</item>
|
|
||||||
|
|
||||||
<item>0.4</item>
|
|
||||||
<item>-0.25</item>
|
|
||||||
<item>100.0</item>
|
|
||||||
|
|
||||||
<item>0.4</item>
|
|
||||||
<item>-0.25</item>
|
|
||||||
<item>100.0</item>
|
|
||||||
|
|
||||||
<item>0.0</item>
|
|
||||||
<item>-0.85</item>
|
|
||||||
<item>100.0</item>
|
|
||||||
|
|
||||||
<item>0.0</item>
|
|
||||||
<item>-0.85</item>
|
|
||||||
<item>100.0</item>
|
|
||||||
|
|
||||||
<item>0.4</item>
|
|
||||||
<item>-0.25</item>
|
|
||||||
<item>100.0</item>
|
|
||||||
|
|
||||||
<item>0.4</item>
|
|
||||||
<item>-0.25</item>
|
|
||||||
<item>100.0</item>
|
|
||||||
|
|
||||||
<item>0.0</item>
|
|
||||||
<item>-0.85</item>
|
|
||||||
<item>100.0</item>
|
|
||||||
</array>
|
|
||||||
|
|
||||||
<!-- A vibration waveform for notifications that do not specify vibration but vibrate anyway,
|
|
||||||
because the device is in vibrate mode. This value is a float array with values grouped as
|
|
||||||
{ targetAmplitude (within [0,1]), targetFrequency [-1,1], duration (in milliseconds) }
|
|
||||||
This is only applied on devices with vibration frequency control. If the device doesn't
|
|
||||||
support frequency control, then the vibration specified in
|
|
||||||
config_notificationFallbackVibePattern is used instead.
|
|
||||||
-->
|
|
||||||
<array name="config_notificationFallbackVibeWaveform">
|
|
||||||
<item>0.0</item>
|
|
||||||
<item>-0.85</item>
|
|
||||||
<item>0.0</item>
|
|
||||||
|
|
||||||
<item>0.4</item>
|
|
||||||
<item>-0.25</item>
|
|
||||||
<item>50.0</item>
|
|
||||||
|
|
||||||
<item>0.4</item>
|
|
||||||
<item>-0.25</item>
|
|
||||||
<item>100.0</item>
|
|
||||||
|
|
||||||
<item>0.0</item>
|
|
||||||
<item>-0.85</item>
|
|
||||||
<item>50.0</item>
|
|
||||||
|
|
||||||
<item>0.0</item>
|
|
||||||
<item>-0.85</item>
|
|
||||||
<item>100.0</item>
|
|
||||||
|
|
||||||
<item>0.4</item>
|
|
||||||
<item>-0.25</item>
|
|
||||||
<item>50.0</item>
|
|
||||||
|
|
||||||
<item>0.4</item>
|
|
||||||
<item>-0.25</item>
|
|
||||||
<item>100.0</item>
|
|
||||||
|
|
||||||
<item>0.0</item>
|
|
||||||
<item>-0.85</item>
|
|
||||||
<item>50.0</item>
|
|
||||||
</array>
|
|
||||||
|
|
||||||
<!-- the number of the max cached processes in the system. -->
|
<!-- the number of the max cached processes in the system. -->
|
||||||
<integer name="config_customizedMaxCachedProcesses">64</integer>
|
<integer name="config_customizedMaxCachedProcesses">64</integer>
|
||||||
|
|
||||||
|
|
|
@ -195,88 +195,6 @@
|
||||||
non-zero amplitudes, to bring the vibrator amplitude down to zero using this timing. -->
|
non-zero amplitudes, to bring the vibrator amplitude down to zero using this timing. -->
|
||||||
<integer name="config_vibrationWaveformRampDownDuration">50</integer>
|
<integer name="config_vibrationWaveformRampDownDuration">50</integer>
|
||||||
|
|
||||||
<!-- A vibration waveform for notifications that specify DEFAULT_VIBRATE.
|
|
||||||
This value is a float array with values grouped as
|
|
||||||
{ targetAmplitude (within [0,1]), targetFrequency [-1,1], duration (in milliseconds) }
|
|
||||||
This is only applied on devices with vibration frequency control. If the device doesn't
|
|
||||||
support frequency control, then the vibration specified in
|
|
||||||
config_defaultNotificationVibePattern is used instead.
|
|
||||||
-->
|
|
||||||
<array name="config_defaultNotificationVibeWaveform">
|
|
||||||
<item>0.0</item>
|
|
||||||
<item>-0.85</item>
|
|
||||||
<item>0.0</item>
|
|
||||||
|
|
||||||
<item>0.4</item>
|
|
||||||
<item>-0.25</item>
|
|
||||||
<item>100.0</item>
|
|
||||||
|
|
||||||
<item>0.4</item>
|
|
||||||
<item>-0.25</item>
|
|
||||||
<item>100.0</item>
|
|
||||||
|
|
||||||
<item>0.0</item>
|
|
||||||
<item>-0.85</item>
|
|
||||||
<item>100.0</item>
|
|
||||||
|
|
||||||
<item>0.0</item>
|
|
||||||
<item>-0.85</item>
|
|
||||||
<item>100.0</item>
|
|
||||||
|
|
||||||
<item>0.4</item>
|
|
||||||
<item>-0.25</item>
|
|
||||||
<item>100.0</item>
|
|
||||||
|
|
||||||
<item>0.4</item>
|
|
||||||
<item>-0.25</item>
|
|
||||||
<item>100.0</item>
|
|
||||||
|
|
||||||
<item>0.0</item>
|
|
||||||
<item>-0.85</item>
|
|
||||||
<item>100.0</item>
|
|
||||||
</array>
|
|
||||||
|
|
||||||
<!-- A vibration waveform for notifications that do not specify vibration but vibrate anyway,
|
|
||||||
because the device is in vibrate mode. This value is a float array with values grouped as
|
|
||||||
{ targetAmplitude (within [0,1]), targetFrequency [-1,1], duration (in milliseconds) }
|
|
||||||
This is only applied on devices with vibration frequency control. If the device doesn't
|
|
||||||
support frequency control, then the vibration specified in
|
|
||||||
config_notificationFallbackVibePattern is used instead.
|
|
||||||
-->
|
|
||||||
<array name="config_notificationFallbackVibeWaveform">
|
|
||||||
<item>0.0</item>
|
|
||||||
<item>-0.85</item>
|
|
||||||
<item>0.0</item>
|
|
||||||
|
|
||||||
<item>0.4</item>
|
|
||||||
<item>-0.25</item>
|
|
||||||
<item>50.0</item>
|
|
||||||
|
|
||||||
<item>0.4</item>
|
|
||||||
<item>-0.25</item>
|
|
||||||
<item>100.0</item>
|
|
||||||
|
|
||||||
<item>0.0</item>
|
|
||||||
<item>-0.85</item>
|
|
||||||
<item>50.0</item>
|
|
||||||
|
|
||||||
<item>0.0</item>
|
|
||||||
<item>-0.85</item>
|
|
||||||
<item>100.0</item>
|
|
||||||
|
|
||||||
<item>0.4</item>
|
|
||||||
<item>-0.25</item>
|
|
||||||
<item>50.0</item>
|
|
||||||
|
|
||||||
<item>0.4</item>
|
|
||||||
<item>-0.25</item>
|
|
||||||
<item>100.0</item>
|
|
||||||
|
|
||||||
<item>0.0</item>
|
|
||||||
<item>-0.85</item>
|
|
||||||
<item>50.0</item>
|
|
||||||
</array>
|
|
||||||
|
|
||||||
<!-- Height of the status bar.
|
<!-- Height of the status bar.
|
||||||
Do not read this dimen directly. Use {@link SystemBarUtils#getStatusBarHeight} instead.
|
Do not read this dimen directly. Use {@link SystemBarUtils#getStatusBarHeight} instead.
|
||||||
-->
|
-->
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue