diff options
author | Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> | 2020-11-19 18:02:09 +0100 |
---|---|---|
committer | Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> | 2020-11-19 18:02:36 +0100 |
commit | cf651fb0b33892fb6d17f40a5a52cfc966ff75e0 (patch) | |
tree | e50662a7492d4be4a815357fe8cc02f0994c9867 | |
parent | 5fc046bbc8f73b353f9e8bad93a2be9c5eecc397 (diff) | |
download | platform_hardware_libaudio-cf651fb0b33892fb6d17f40a5a52cfc966ff75e0.tar.gz platform_hardware_libaudio-cf651fb0b33892fb6d17f40a5a52cfc966ff75e0.tar.bz2 platform_hardware_libaudio-cf651fb0b33892fb6d17f40a5a52cfc966ff75e0.zip |
policy configs: sync with framework/av
Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
-rw-r--r-- | audio_policy_configuration.xml | 8 | ||||
-rw-r--r-- | primary_audio_policy_configuration.xml | 59 |
2 files changed, 9 insertions, 58 deletions
diff --git a/audio_policy_configuration.xml b/audio_policy_configuration.xml index a399a94..8f0dc98 100644 --- a/audio_policy_configuration.xml +++ b/audio_policy_configuration.xml @@ -21,12 +21,11 @@ <globalConfiguration speaker_drc_enabled="false"/> <modules> - <!-- Primary Audio HAL --> <xi:include href="primary_audio_policy_configuration.xml"/> - <!-- A2dp Audio HAL --> - <xi:include href="a2dp_audio_policy_configuration.xml"/> + <!-- A2dp Input Audio HAL --> + <xi:include href="a2dp_in_audio_policy_configuration.xml"/> <!-- Usb Audio HAL --> <xi:include href="usb_audio_policy_configuration.xml"/> @@ -34,6 +33,9 @@ <!-- Remote Submix Audio HAL --> <xi:include href="r_submix_audio_policy_configuration.xml"/> + <!-- Bluetooth Audio HAL --> + <xi:include href="bluetooth_audio_policy_configuration.xml"/> + </modules> <!-- End of Modules section --> diff --git a/primary_audio_policy_configuration.xml b/primary_audio_policy_configuration.xml index 652dfcc..eedc96b 100644 --- a/primary_audio_policy_configuration.xml +++ b/primary_audio_policy_configuration.xml @@ -9,75 +9,24 @@ <mixPorts> <mixPort name="primary output" role="source" flags="AUDIO_OUTPUT_FLAG_PRIMARY"> <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" - samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> + samplingRates="44100" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> </mixPort> <mixPort name="primary input" role="sink"> <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" - samplingRates="8000,11025,16000,22050,24000,32000,44100,48000" - channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO"/> + samplingRates="8000,16000" channelMasks="AUDIO_CHANNEL_IN_MONO"/> </mixPort> </mixPorts> <devicePorts> <devicePort tagName="Speaker" type="AUDIO_DEVICE_OUT_SPEAKER" role="sink"> - <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" - samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> - </devicePort> - <devicePort tagName="Wired Headset" type="AUDIO_DEVICE_OUT_WIRED_HEADSET" role="sink"> - <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" - samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> - </devicePort> - <devicePort tagName="Wired Headphones" type="AUDIO_DEVICE_OUT_WIRED_HEADPHONE" role="sink"> - <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" - samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> - </devicePort> - <devicePort tagName="Dock Headset" type="AUDIO_DEVICE_OUT_ANLG_DOCK_HEADSET" role="sink"> - <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" - samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> - </devicePort> - <devicePort tagName="BT SCO" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO" role="sink"> - <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" - samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> - </devicePort> - <devicePort tagName="BT SCO Headset" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO_HEADSET" role="sink"> - <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" - samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> - </devicePort> - <devicePort tagName="HDMI Out" type="AUDIO_DEVICE_OUT_AUX_DIGITAL" role="sink"> - <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" - samplingRates="48000" channelMasks="dynamic"/> </devicePort> + <devicePort tagName="Built-In Mic" type="AUDIO_DEVICE_IN_BUILTIN_MIC" role="source"> - <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" - samplingRates="8000,11025,16000,22050,24000,32000,44100,48000" - channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO"/> - </devicePort> - <devicePort tagName="Wired Headset Mic" type="AUDIO_DEVICE_IN_WIRED_HEADSET" role="source"> - <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" - samplingRates="8000,11025,16000,22050,24000,32000,44100,48000" - channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO"/> - </devicePort> - <devicePort tagName="BT SCO Headset Mic" type="AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET" role="source"> - <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" - samplingRates="8000,11025,16000,22050,24000,32000,44100,48000" - channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO"/> </devicePort> </devicePorts> <routes> <route type="mix" sink="Speaker" sources="primary output"/> - <route type="mix" sink="Wired Headset" - sources="primary output"/> - <route type="mix" sink="Wired Headphones" - sources="primary output"/> - <route type="mix" sink="Dock Headset" - sources="primary output"/> - <route type="mix" sink="BT SCO" - sources="primary output"/> - <route type="mix" sink="BT SCO Headset" - sources="primary output"/> <route type="mix" sink="primary input" - sources="Built-In Mic,Wired Headset Mic,BT SCO Headset Mic"/> - <route type="mix" sink="HDMI Out" - sources="primary output"/> + sources="Built-In Mic"/> </routes> </module> |