diff options
| author | Benjamin Legrand <dev@legrand.ws> | 2017-10-20 08:16:05 +0200 |
|---|---|---|
| committer | dd3boh <dade.garberi@gmail.com> | 2017-10-31 12:34:43 +0100 |
| commit | f5f0e4950533f0e0c89a1699535c3dfc9a2be47e (patch) | |
| tree | bef6c043ec19ca58e9aad35d31e3a15fd2acf4a2 /audio/audio_policy_configuration.xml | |
| parent | 1756d408a19719cbd1549a0480b95701c1c536d8 (diff) | |
z2_plus: Update Audio to CAF version
Signed-off-by: dd3boh <dade.garberi@gmail.com>
Diffstat (limited to 'audio/audio_policy_configuration.xml')
| -rw-r--r-- | audio/audio_policy_configuration.xml | 35 |
1 files changed, 15 insertions, 20 deletions
diff --git a/audio/audio_policy_configuration.xml b/audio/audio_policy_configuration.xml index ea4b140..7b8dbae 100644 --- a/audio/audio_policy_configuration.xml +++ b/audio/audio_policy_configuration.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<!-- Copyright (c) 2016, The Linux Foundation. All rights reserved +<!-- Copyright (c) 2016-2017, The Linux Foundation. All rights reserved Not a Contribution. --> <!-- Copyright (C) 2015 The Android Open Source Project @@ -73,21 +73,16 @@ <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> </mixPort> - <mixPort name="multichannel" role="source" - flags="AUDIO_OUTPUT_FLAG_DIRECT"> - <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" - samplingRates="8000,11025,16000,22050,32000,44100,48000,64000,88200,96000,128000,176400,192000" channelMasks="dynamic"/> - </mixPort> <mixPort name="direct_pcm" role="source" - flags="AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_DIRECT_PCM"> + flags="AUDIO_OUTPUT_FLAG_DIRECT"> <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" - samplingRates="8000,11025,16000,22050,32000,44100,48000,64000,88200,96000,128000,176400,192000" + samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,64000,88200,96000,128000,176400,192000" channelMasks="AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_2POINT1,AUDIO_CHANNEL_OUT_QUAD,AUDIO_CHANNEL_OUT_PENTA,AUDIO_CHANNEL_OUT_5POINT1,AUDIO_CHANNEL_OUT_6POINT1,AUDIO_CHANNEL_OUT_7POINT1"/> <profile name="" format="AUDIO_FORMAT_PCM_8_24_BIT" - samplingRates="8000,11025,16000,22050,32000,44100,48000,64000,88200,96000,128000,176400,192000" + samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,64000,88200,96000,128000,176400,192000" channelMasks="AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_2POINT1,AUDIO_CHANNEL_OUT_QUAD,AUDIO_CHANNEL_OUT_PENTA,AUDIO_CHANNEL_OUT_5POINT1,AUDIO_CHANNEL_OUT_6POINT1,AUDIO_CHANNEL_OUT_7POINT1"/> <profile name="" format="AUDIO_FORMAT_PCM_24_BIT_PACKED" - samplingRates="8000,11025,16000,22050,32000,44100,48000,64000,88200,96000,128000,176400,192000" + samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,64000,88200,96000,128000,176400,192000" channelMasks="AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_2POINT1,AUDIO_CHANNEL_OUT_QUAD,AUDIO_CHANNEL_OUT_PENTA,AUDIO_CHANNEL_OUT_5POINT1,AUDIO_CHANNEL_OUT_6POINT1,AUDIO_CHANNEL_OUT_7POINT1"/> </mixPort> <mixPort name="compressed_offload" role="source" @@ -139,7 +134,7 @@ <mixPort name="voip_rx" role="source" flags="AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_VOIP_RX"> <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" - samplingRates="8000,16000" channelMasks="AUDIO_CHANNEL_OUT_MONO"/> + samplingRates="8000,16000,32000" channelMasks="AUDIO_CHANNEL_OUT_MONO"/> </mixPort> <mixPort name="primary input" role="sink"> @@ -150,7 +145,7 @@ <mixPort name="surround_sound" role="sink"> <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000" - channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_IN_FRONT_BACK,AUDIO_CHANNEL_INDEX_MASK_3,AUDIO_CHANNEL_INDEX_MASK_4,AUDIO_CHANNEL_IN_5POINT1"/> + channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_IN_FRONT_BACK,AUDIO_CHANNEL_INDEX_MASK_3,AUDIO_CHANNEL_INDEX_MASK_4,AUDIO_CHANNEL_IN_5POINT1,AUDIO_CHANNEL_INDEX_MASK_6"/> </mixPort> <mixPort name="record_24" role="sink"> <profile name="" format="AUDIO_FORMAT_PCM_24_BIT_PACKED" @@ -266,9 +261,9 @@ <route type="mix" sink="Line" sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx"/> <route type="mix" sink="HDMI" - sources="primary output,raw,deep_buffer,multichannel,direct_pcm,compressed_offload"/> + sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload"/> <route type="mix" sink="Proxy" - sources="primary output,raw,deep_buffer,multichannel,direct_pcm,compressed_offload"/> + sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload"/> <route type="mix" sink="FM" sources="primary output"/> <route type="mix" sink="BT SCO All" @@ -276,7 +271,7 @@ <route type="mix" sink="Telephony Tx" sources="voice_tx"/> <route type="mix" sink="primary input" - sources="Wired Headset Mic,BT SCO Headset Mic,FM Tuner,Telephony Rx"/> + sources="Built-In Mic,Wired Headset Mic,BT SCO Headset Mic,FM Tuner,Telephony Rx"/> <route type="mix" sink="surround_sound" sources="Built-In Mic,Built-In Back Mic"/> <route type="mix" sink="record_24" @@ -288,21 +283,21 @@ </module> <!-- A2dp Audio HAL --> - <xi:include href="a2dp_audio_policy_configuration.xml"/> + <xi:include href="/vendor/etc/a2dp_audio_policy_configuration.xml"/> <!-- Usb Audio HAL --> - <xi:include href="usb_audio_policy_configuration.xml"/> + <xi:include href="/vendor/etc/usb_audio_policy_configuration.xml"/> <!-- Remote Submix Audio HAL --> - <xi:include href="r_submix_audio_policy_configuration.xml"/> + <xi:include href="/vendor/etc/r_submix_audio_policy_configuration.xml"/> </modules> <!-- End of Modules section --> <!-- Volume section --> - <xi:include href="audio_policy_volumes.xml"/> - <xi:include href="default_volume_tables.xml"/> + <xi:include href="/vendor/etc/audio_policy_volumes.xml"/> + <xi:include href="/vendor/etc/default_volume_tables.xml"/> <!-- End of Volume section --> |