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

Commit 92022f97 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Promotion of av-userspace.lnx.2.0-00010. 

CRs      Change ID                                   Subject
--------------------------------------------------------------------------------------------------------------
996510   I480bb14899d678a47df8a61fbdd208b75ef7b395   hal: fix no sound issue in voice call
1015136   Ifcaa780e0f47df74e1476bb2dc0584bd54f0206b   audio: configs: add target specific audio policy configu
1015136   If1c5d9abc6d6c882092c91c15546e25e9f7ae634   audio: configs: add default xml audio policy configurati
1005434   I7ab60c3947a81c98758081708c96de6afe56f207   hal: Add support to reload ACDB files
1015277   I68076524ccccbf9f0be3c88bb01180ae7e4fd8b1   hal: changes to support 24 bit record
1011718 1014521   I9556c47507752d9e4ac054c1cfa4aae6740d69ec   configs: add support for 32/48KHz in voip o/p
1015200   If8aad263e08f40768cdebad296a0c759b017a440   configs: Set default audio sink latency to fix audio tra

Change-Id: Iaab8698426a5abf055c25fe09b024225e3434933
CRs-Fixed: 1014521, 1015200, 1011718, 1015277, 1015136, 1005434, 996510
parents b044e18d 4763180e

configs/common/audio_policy_configuration.xml

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

<!-- Copyright (c) 2016, 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>

        <!-- Primary Audio HAL -->

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

            <attachedDevices>

                <item>Speaker</item>

                <item>Built-In Mic</item>

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

            </attachedDevices>

            <defaultOutputDevice>Speaker</defaultOutputDevice>

            <mixPorts>

                <mixPort name="primary output" role="source"

                        flags="AUDIO_OUTPUT_FLAG_FAST|AUDIO_OUTPUT_FLAG_PRIMARY">

                    <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_16_BIT"

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

                </mixPort>

                <mixPort name="hdmi" 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="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,64000,88200,96000"

                             channelMasks="AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_MONO"/>

                    <profile name="" format="AUDIO_FORMAT_AAC_ADTS_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_ADTS_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_ADTS_HE_V2"

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

                             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" channelMasks="AUDIO_CHANNEL_OUT_MONO"/>

                </mixPort>

                <mixPort name="primary input" 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"/>

                </mixPort>

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

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

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

                </mixPort>

            </mixPorts>

            <devicePorts>

                <!-- Output devices declaration, i.e. Sink DEVICE PORT -->

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

                   <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                            samplingRates="48000" channelMasks="AUDIO_CHANNEL_IN_MONO"/>

                </devicePort>

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

                    <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="BT SCO" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO" role="sink">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

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

                </devicePort>

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

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

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

                </devicePort>

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

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

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

                </devicePort>

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

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

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

                </devicePort>

                <devicePort tagName="HDMI" type="AUDIO_DEVICE_OUT_AUX_DIGITAL" role="sink">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="8000,11025,16000,22050,32000,44100,48000,64000,88200,96000,128000,176400,192000"

                             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,12000,16000,22050,24000,32000,44100,48000"

                             channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_IN_FRONT_BACK"/>

                </devicePort>

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

                    <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"/>

                </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,12000,16000,22050,24000,32000,44100,48000"

                             channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_IN_FRONT_BACK"/>

                </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,16000" channelMasks="AUDIO_CHANNEL_IN_MONO"/>

                </devicePort>

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

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

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

                </devicePort>

            </devicePorts>

            <!-- route declaration, i.e. list all available sources for a given sink -->

            <routes>

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

                       sources="primary output,deep_buffer,BT SCO Headset Mic"/>

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

                       sources="primary output,deep_buffer,compressed_offload,BT SCO Headset Mic,Telephony Rx"/>

                <route type="mix" sink="Wired Headset"

                       sources="primary output,deep_buffer,compressed_offload,BT SCO Headset Mic,Telephony Rx"/>

                <route type="mix" sink="Wired Headphones"

                       sources="primary output,deep_buffer,compressed_offload,BT SCO Headset Mic,Telephony Rx"/>

                <route type="mix" sink="HDMI"

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

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

                       sources="voice_tx"/>

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

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

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

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

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

                       sources="Telephony Rx"/>

            </routes>



        </module>



        <!-- A2dp Audio HAL -->

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



        <!-- Usb Audio HAL -->

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

0 → 100644
+298 −0

File added.

Preview size limit exceeded, changes collapsed.

configs/msm8937/msm8937.mk

+22 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
#BOARD_USES_GENERIC_AUDIO := true

BOARD_USES_ALSA_AUDIO := true

USE_CUSTOM_AUDIO_POLICY := 1

USE_XML_AUDIO_POLICY_CONF := 1

BOARD_SUPPORTS_SOUND_TRIGGER := true

AUDIO_USE_LL_AS_PRIMARY_OUTPUT := true

AUDIO_FEATURE_ENABLED_HIFI_AUDIO := true
@@ -82,6 +83,23 @@ hardware/qcom/audio/configs/msm8937/audio_platform_info.xml:system/etc/audio_pla 
hardware/qcom/audio/configs/msm8937/audio_platform_info_extcodec.xml:system/etc/audio_platform_info_extcodec.xml \

hardware/qcom/audio/configs/msm8937/aanc_tuning_mixer.txt:system/etc/aanc_tuning_mixer.txt



#XML Audio configuration files

ifeq ($(USE_XML_AUDIO_POLICY_CONF), 1)

ifeq ($(TARGET_USES_AOSP), true)

PRODUCT_COPY_FILES += \

    $(TOPDIR)hardware/qcom/audio/configs/common/audio_policy_configuration.xml:/system/etc/audio_policy_configuration.xml

else

PRODUCT_COPY_FILES += \

    $(TOPDIR)hardware/qcom/audio/configs/msm8937/audio_policy_configuration.xml:system/etc/audio_policy_configuration.xml

endif

PRODUCT_COPY_FILES += \

    $(TOPDIR)frameworks/av/services/audiopolicy/config/a2dp_audio_policy_configuration.xml:/system/etc/a2dp_audio_policy_configuration.xml \

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

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

    $(TOPDIR)frameworks/av/services/audiopolicy/config/r_submix_audio_policy_configuration.xml:/system/etc/r_submix_audio_policy_configuration.xml \

    $(TOPDIR)frameworks/av/services/audiopolicy/config/usb_audio_policy_configuration.xml:/system/etc/usb_audio_policy_configuration.xml

endif



# Reduce client buffer size for fast audio output tracks

PRODUCT_PROPERTY_OVERRIDES += \

     af.fast_track_multiplier=1
@@ -129,6 +147,10 @@ audio.offload.track.enable=true 
PRODUCT_PROPERTY_OVERRIDES += \

audio.deep_buffer.media=true



#Default pcm audio sink buffer size in msec. This is used in calculating framecount

PRODUCT_PROPERTY_OVERRIDES += \

media.stagefright.audio.sink=280



#enable voice path for PCM VoIP by default

PRODUCT_PROPERTY_OVERRIDES += \

use.voice.path.for.pcm.voip=true

configs/msm8953/audio_policy_configuration.xml

0 → 100644
+298 −0

File added.

Preview size limit exceeded, changes collapsed.

configs/msm8953/msm8953.mk

+22 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
#BOARD_USES_GENERIC_AUDIO := true

BOARD_USES_ALSA_AUDIO := true

USE_CUSTOM_AUDIO_POLICY := 1

USE_XML_AUDIO_POLICY_CONF := 1

BOARD_SUPPORTS_SOUND_TRIGGER := true

AUDIO_USE_LL_AS_PRIMARY_OUTPUT := true

AUDIO_FEATURE_ENABLED_HIFI_AUDIO := true
@@ -82,6 +83,23 @@ hardware/qcom/audio/configs/msm8953/audio_platform_info.xml:system/etc/audio_pla 
hardware/qcom/audio/configs/msm8953/audio_platform_info_extcodec.xml:system/etc/audio_platform_info_extcodec.xml \

hardware/qcom/audio/configs/msm8953/aanc_tuning_mixer.txt:system/etc/aanc_tuning_mixer.txt



#XML Audio configuration files

ifeq ($(USE_XML_AUDIO_POLICY_CONF), 1)

ifeq ($(TARGET_USES_AOSP), true)

PRODUCT_COPY_FILES += \

    $(TOPDIR)hardware/qcom/audio/configs/common/audio_policy_configuration.xml:/system/etc/audio_policy_configuration.xml

else

PRODUCT_COPY_FILES += \

    $(TOPDIR)hardware/qcom/audio/configs/msm8953/audio_policy_configuration.xml:system/etc/audio_policy_configuration.xml

endif

PRODUCT_COPY_FILES += \

    $(TOPDIR)frameworks/av/services/audiopolicy/config/a2dp_audio_policy_configuration.xml:/system/etc/a2dp_audio_policy_configuration.xml \

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

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

    $(TOPDIR)frameworks/av/services/audiopolicy/config/r_submix_audio_policy_configuration.xml:/system/etc/r_submix_audio_policy_configuration.xml \

    $(TOPDIR)frameworks/av/services/audiopolicy/config/usb_audio_policy_configuration.xml:/system/etc/usb_audio_policy_configuration.xml

endif



# Reduce client buffer size for fast audio output tracks

PRODUCT_PROPERTY_OVERRIDES += \

af.fast_track_multiplier=1
@@ -129,6 +147,10 @@ audio.offload.track.enable=true 
PRODUCT_PROPERTY_OVERRIDES += \

audio.deep_buffer.media=true



#Default pcm audio sink buffer size in msec. This is used in calculating framecount

PRODUCT_PROPERTY_OVERRIDES += \

media.stagefright.audio.sink=280



#enable voice path for PCM VoIP by default

PRODUCT_PROPERTY_OVERRIDES += \

use.voice.path.for.pcm.voip=true