Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f20e3c36 authored by Sujin Panicker's avatar Sujin Panicker
Browse files

config: Add legacy specific default/common audio policy conf file 

Legacy SPs(8953 & 8937) does not support split A2DP.
BT registers with AOSP A2DP HAL rather than with
vendor BT HAL as the common audio policy conf has only
support for split A2dp and a2dp module(for BT input).
Changes is to support vendor BT HAL and remove split A2DP
by localizing audio policy conf files for these targets
rather than using common audio policy conf file. Same
applies for USB HAL as well.
Remove unsupported mixport profiles from policy conf
for these SPs.

Change-Id: Iba83b88480e998fae0c246b5f176ec27d1834578
parent 65d217fd

configs/msm8937/audio_policy_configuration_common.xml

0 → 100644
+181 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>

<!-- Copyright (c) 2016-2017, 2019-2020, The Linux Foundation. All rights reserved

     Not a Contribution.

-->

<!-- Copyright (C) 2015 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->



<audioPolicyConfiguration version="1.0" xmlns:xi="http://www.w3.org/2001/XInclude">

    <!-- version section contains a “version” tag in the form “major.minor” e.g version=”1.0” -->



    <!-- Global configuration Decalaration -->

    <globalConfiguration speaker_drc_enabled="true"/>





    <!-- Modules section:

        There is one section per audio HW module present on the platform.

        Each module section will contains two mandatory tags for audio HAL “halVersion” and “name”.

        The module names are the same as in current .conf file:

                “primary”, “A2DP”, “remote_submix”, “USB”

        Each module will contain the following sections:

        “devicePorts”: a list of device descriptors for all input and output devices accessible via this

        module.

        This contains both permanently attached devices and removable devices.

        “mixPorts”: listing all output and input streams exposed by the audio HAL

        “routes”: list of possible connections between input and output devices or between stream and

        devices.

            "route": is defined by an attribute:

                -"type": <mux|mix> means all sources are mutual exclusive (mux) or can be mixed (mix)

                -"sink": the sink involved in this route

                -"sources": all the sources than can be connected to the sink via vis route

        “attachedDevices”: permanently attached devices.

        The attachedDevices section is a list of devices names. The names correspond to device names

        defined in <devicePorts> section.

        “defaultOutputDevice”: device to be used by default when no policy rule applies

    -->

    <modules>

        <module name="primary" halVersion="2.0">

            <attachedDevices>

                <item>Speaker</item>

                <item>Speaker Safe</item>

                <item>Earpiece</item>

                <item>Telephony Tx</item>

                <item>Built-In Mic</item>

                <item>Built-In Back Mic</item>

                <item>Telephony Rx</item>

            </attachedDevices>

            <defaultOutputDevice>Speaker</defaultOutputDevice>

            <mixPorts>

                <mixPort name="primary output" role="source" flags="AUDIO_OUTPUT_FLAG_PRIMARY|AUDIO_OUTPUT_FLAG_FAST">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>

                </mixPort>

                <mixPort name="raw" role="source" flags="AUDIO_OUTPUT_FLAG_RAW|AUDIO_OUTPUT_FLAG_FAST">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>

                </mixPort>

                <mixPort name="deep_buffer" role="source"

                        flags="AUDIO_OUTPUT_FLAG_DEEP_BUFFER">

                    <profile name="" format="AUDIO_FORMAT_PCM_24_BIT_PACKED"

                             samplingRates="44100,48000"

                             channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>

                </mixPort>

                <mixPort name="compressed_offload" role="source"

                         flags="AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD|AUDIO_OUTPUT_FLAG_NON_BLOCKING">

                    <profile name="" format="AUDIO_FORMAT_MP3"

                             samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000"

                             channelMasks="AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_MONO"/>

                    <profile name="" format="AUDIO_FORMAT_AAC_LC"

                             samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,64000,88200,96000"

                             channelMasks="AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_MONO"/>

                    <profile name="" format="AUDIO_FORMAT_AAC_HE_V1"

                             samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,64000,88200,96000"

                             channelMasks="AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_MONO"/>

                    <profile name="" format="AUDIO_FORMAT_AAC_HE_V2"

                             samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000"

                             channelMasks="AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_MONO"/>

                </mixPort>

                <mixPort name="voice_tx" role="source">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="8000,16000,48000" channelMasks="AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_STEREO"/>

                </mixPort>

                <mixPort name="voip_rx" role="source"

                         flags="AUDIO_OUTPUT_FLAG_VOIP_RX">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                           samplingRates="8000,16000,32000,48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>

                </mixPort>

                <mixPort name="incall_music_uplink" role="source"

                        flags="AUDIO_OUTPUT_FLAG_INCALL_MUSIC">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="8000,16000,48000"

                             channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>

                </mixPort>

                <mixPort name="primary input" role="sink">

                    <profile name="" format="AUDIO_FORMAT_PCM_8_24_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"/>

                </mixPort>

                <mixPort name="voice_rx" role="sink">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="8000,16000,48000" channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO"/>

                </mixPort>

            </mixPorts>

            <devicePorts>

                <devicePort tagName="Earpiece" type="AUDIO_DEVICE_OUT_EARPIECE" role="sink">

                </devicePort>

                <devicePort tagName="Speaker" type="AUDIO_DEVICE_OUT_SPEAKER" role="sink">

                </devicePort>

                <devicePort tagName="Speaker Safe" type="AUDIO_DEVICE_OUT_SPEAKER_SAFE" role="sink">

                </devicePort>

                <devicePort tagName="BT SCO" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO" role="sink">

                </devicePort>

                <devicePort tagName="BT SCO Headset" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO_HEADSET" role="sink">

                </devicePort>

                <devicePort tagName="BT SCO Car Kit" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO_CARKIT" role="sink">

                </devicePort>

                <devicePort tagName="Telephony Tx" type="AUDIO_DEVICE_OUT_TELEPHONY_TX" role="sink">

                </devicePort>

                <devicePort tagName="Built-In Mic" type="AUDIO_DEVICE_IN_BUILTIN_MIC" role="source">

                </devicePort>

                <devicePort tagName="Built-In Back Mic" type="AUDIO_DEVICE_IN_BACK_MIC" role="source">

                </devicePort>

                <devicePort tagName="BT SCO Headset Mic" type="AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET" role="source">

                </devicePort>

                <devicePort tagName="Telephony Rx" type="AUDIO_DEVICE_IN_TELEPHONY_RX" role="source">

                </devicePort>

                <!-- TODO: Enable multi-channel recording -->

            </devicePorts>

            <routes>

                <route type="mix" sink="Earpiece"

                       sources="primary output,raw,deep_buffer"/>

                <route type="mix" sink="Speaker"

                       sources="primary output,raw,deep_buffer,compressed_offload"/>

                <route type="mix" sink="Speaker Safe"

                       sources="primary output,raw,deep_buffer,compressed_offload"/>

                <route type="mix" sink="BT SCO"

                       sources="primary output,raw,deep_buffer,voip_rx"/>

                <route type="mix" sink="BT SCO Headset"

                       sources="primary output,raw,deep_buffer,voip_rx"/>

                <route type="mix" sink="BT SCO Car Kit"

                       sources="primary output,raw,deep_buffer,voip_rx"/>

                <route type="mix" sink="Telephony Tx"

                       sources="voice_tx,incall_music_uplink"/>

                <route type="mix" sink="primary input"

                       sources="Built-In Mic,Built-In Back Mic,BT SCO Headset Mic"/>

                <route type="mix" sink="voice_rx"

                       sources="Telephony Rx"/>

            </routes>

        </module>



        <!-- A2dp Audio HAL -->

        <xi:include href="/vendor/etc/a2dp_audio_policy_configuration.xml"/>



        <!-- Usb Audio HAL -->

        <xi:include href="/vendor/etc/usb_audio_policy_configuration.xml"/>



        <!-- Remote Submix Audio HAL -->

        <xi:include href="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"/>



    <!-- End of Volume section -->



</audioPolicyConfiguration>

configs/msm8937/msm8937.mk

+1 −1
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ PRODUCT_COPY_FILES += \ 
    $(TOPDIR)vendor/qcom/opensource/audio-hal/primary-hal/configs/msm8937/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/audio_policy_configuration.xml

endif

PRODUCT_COPY_FILES += \

    $(TOPDIR)vendor/qcom/opensource/audio-hal/primary-hal/configs/common/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \

    $(TOPDIR)vendor/qcom/opensource/audio-hal/primary-hal/configs/msm8937/audio_policy_configuration_common.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \

    $(TOPDIR)vendor/qcom/opensource/audio-hal/primary-hal/configs/common/bluetooth_qti_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/a2dp_audio_policy_configuration.xml \

    $(TOPDIR)frameworks/av/services/audiopolicy/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \

    $(TOPDIR)frameworks/av/services/audiopolicy/config/default_volume_tables.xml:$(TARGET_COPY_OUT_VENDOR)/etc/default_volume_tables.xml \

configs/msm8953/audio_policy_configuration_common.xml

0 → 100644
+181 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>

<!-- Copyright (c) 2016-2017, 2019-2020, The Linux Foundation. All rights reserved

     Not a Contribution.

-->

<!-- Copyright (C) 2015 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->



<audioPolicyConfiguration version="1.0" xmlns:xi="http://www.w3.org/2001/XInclude">

    <!-- version section contains a “version” tag in the form “major.minor” e.g version=”1.0” -->



    <!-- Global configuration Decalaration -->

    <globalConfiguration speaker_drc_enabled="true"/>





    <!-- Modules section:

        There is one section per audio HW module present on the platform.

        Each module section will contains two mandatory tags for audio HAL “halVersion” and “name”.

        The module names are the same as in current .conf file:

                “primary”, “A2DP”, “remote_submix”, “USB”

        Each module will contain the following sections:

        “devicePorts”: a list of device descriptors for all input and output devices accessible via this

        module.

        This contains both permanently attached devices and removable devices.

        “mixPorts”: listing all output and input streams exposed by the audio HAL

        “routes”: list of possible connections between input and output devices or between stream and

        devices.

            "route": is defined by an attribute:

                -"type": <mux|mix> means all sources are mutual exclusive (mux) or can be mixed (mix)

                -"sink": the sink involved in this route

                -"sources": all the sources than can be connected to the sink via vis route

        “attachedDevices”: permanently attached devices.

        The attachedDevices section is a list of devices names. The names correspond to device names

        defined in <devicePorts> section.

        “defaultOutputDevice”: device to be used by default when no policy rule applies

    -->

    <modules>

        <module name="primary" halVersion="2.0">

            <attachedDevices>

                <item>Speaker</item>

                <item>Speaker Safe</item>

                <item>Earpiece</item>

                <item>Telephony Tx</item>

                <item>Built-In Mic</item>

                <item>Built-In Back Mic</item>

                <item>Telephony Rx</item>

            </attachedDevices>

            <defaultOutputDevice>Speaker</defaultOutputDevice>

            <mixPorts>

                <mixPort name="primary output" role="source" flags="AUDIO_OUTPUT_FLAG_PRIMARY|AUDIO_OUTPUT_FLAG_FAST">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>

                </mixPort>

                <mixPort name="raw" role="source" flags="AUDIO_OUTPUT_FLAG_RAW|AUDIO_OUTPUT_FLAG_FAST">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>

                </mixPort>

                <mixPort name="deep_buffer" role="source"

                        flags="AUDIO_OUTPUT_FLAG_DEEP_BUFFER">

                    <profile name="" format="AUDIO_FORMAT_PCM_24_BIT_PACKED"

                             samplingRates="44100,48000"

                             channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>

                </mixPort>

                <mixPort name="compressed_offload" role="source"

                         flags="AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD|AUDIO_OUTPUT_FLAG_NON_BLOCKING">

                    <profile name="" format="AUDIO_FORMAT_MP3"

                             samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000"

                             channelMasks="AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_MONO"/>

                    <profile name="" format="AUDIO_FORMAT_AAC_LC"

                             samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,64000,88200,96000"

                             channelMasks="AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_MONO"/>

                    <profile name="" format="AUDIO_FORMAT_AAC_HE_V1"

                             samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,64000,88200,96000"

                             channelMasks="AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_MONO"/>

                    <profile name="" format="AUDIO_FORMAT_AAC_HE_V2"

                             samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000"

                             channelMasks="AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_MONO"/>

                </mixPort>

                <mixPort name="voice_tx" role="source">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="8000,16000,48000" channelMasks="AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_STEREO"/>

                </mixPort>

                <mixPort name="voip_rx" role="source"

                         flags="AUDIO_OUTPUT_FLAG_VOIP_RX">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                           samplingRates="8000,16000,32000,48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>

                </mixPort>

                <mixPort name="incall_music_uplink" role="source"

                        flags="AUDIO_OUTPUT_FLAG_INCALL_MUSIC">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="8000,16000,48000"

                             channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>

                </mixPort>

                <mixPort name="primary input" role="sink">

                    <profile name="" format="AUDIO_FORMAT_PCM_8_24_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"/>

                </mixPort>

                <mixPort name="voice_rx" role="sink">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="8000,16000,48000" channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO"/>

                </mixPort>

            </mixPorts>

            <devicePorts>

                <devicePort tagName="Earpiece" type="AUDIO_DEVICE_OUT_EARPIECE" role="sink">

                </devicePort>

                <devicePort tagName="Speaker" type="AUDIO_DEVICE_OUT_SPEAKER" role="sink">

                </devicePort>

                <devicePort tagName="Speaker Safe" type="AUDIO_DEVICE_OUT_SPEAKER_SAFE" role="sink">

                </devicePort>

                <devicePort tagName="BT SCO" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO" role="sink">

                </devicePort>

                <devicePort tagName="BT SCO Headset" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO_HEADSET" role="sink">

                </devicePort>

                <devicePort tagName="BT SCO Car Kit" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO_CARKIT" role="sink">

                </devicePort>

                <devicePort tagName="Telephony Tx" type="AUDIO_DEVICE_OUT_TELEPHONY_TX" role="sink">

                </devicePort>

                <devicePort tagName="Built-In Mic" type="AUDIO_DEVICE_IN_BUILTIN_MIC" role="source">

                </devicePort>

                <devicePort tagName="Built-In Back Mic" type="AUDIO_DEVICE_IN_BACK_MIC" role="source">

                </devicePort>

                <devicePort tagName="BT SCO Headset Mic" type="AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET" role="source">

                </devicePort>

                <devicePort tagName="Telephony Rx" type="AUDIO_DEVICE_IN_TELEPHONY_RX" role="source">

                </devicePort>

                <!-- TODO: Enable multi-channel recording -->

            </devicePorts>

            <routes>

                <route type="mix" sink="Earpiece"

                       sources="primary output,raw,deep_buffer"/>

                <route type="mix" sink="Speaker"

                       sources="primary output,raw,deep_buffer,compressed_offload"/>

                <route type="mix" sink="Speaker Safe"

                       sources="primary output,raw,deep_buffer,compressed_offload"/>

                <route type="mix" sink="BT SCO"

                       sources="primary output,raw,deep_buffer,voip_rx"/>

                <route type="mix" sink="BT SCO Headset"

                       sources="primary output,raw,deep_buffer,voip_rx"/>

                <route type="mix" sink="BT SCO Car Kit"

                       sources="primary output,raw,deep_buffer,voip_rx"/>

                <route type="mix" sink="Telephony Tx"

                       sources="voice_tx,incall_music_uplink"/>

                <route type="mix" sink="primary input"

                       sources="Built-In Mic,Built-In Back Mic,BT SCO Headset Mic"/>

                <route type="mix" sink="voice_rx"

                       sources="Telephony Rx"/>

            </routes>

        </module>



        <!-- A2dp Audio HAL -->

        <xi:include href="/vendor/etc/a2dp_audio_policy_configuration.xml"/>



        <!-- Usb Audio HAL -->

        <xi:include href="/vendor/etc/usb_audio_policy_configuration.xml"/>



        <!-- Remote Submix Audio HAL -->

        <xi:include href="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"/>



    <!-- End of Volume section -->



</audioPolicyConfiguration>

configs/msm8953/msm8953.mk

+1 −1
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ PRODUCT_COPY_FILES += \ 
    $(TOPDIR)vendor/qcom/opensource/audio-hal/primary-hal/configs/msm8953/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/audio_policy_configuration.xml

endif

PRODUCT_COPY_FILES += \

    $(TOPDIR)vendor/qcom/opensource/audio-hal/primary-hal/configs/common/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \

    $(TOPDIR)vendor/qcom/opensource/audio-hal/primary-hal/configs/msm8953/audio_policy_configuration_common.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \

    $(TOPDIR)vendor/qcom/opensource/audio-hal/primary-hal/configs/common/bluetooth_qti_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/a2dp_audio_policy_configuration.xml \

    $(TOPDIR)frameworks/av/services/audiopolicy/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \

    $(TOPDIR)frameworks/av/services/audiopolicy/config/default_volume_tables.xml:$(TARGET_COPY_OUT_VENDOR)/etc/default_volume_tables.xml \