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

Commit 3c1fa654 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge 9eaecc7f on remote branch 

Change-Id: Ib3c7453d2cf746956ccda458909df2f3e7ee13f2
parents 9551282c 9eaecc7f

configs/sdm660/audio_policy_configuration.xml

+15 −2
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>

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

<!-- Copyright (c) 2016-2021 The Linux Foundation. All rights reserved

     Not a Contribution.

-->

<!-- Copyright (C) 2015 The Android Open Source Project
@@ -163,6 +163,17 @@ 
                             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="usb_surround_sound" role="sink">

                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

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

                              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,AUDIO_CHANNEL_IN_7POINT1,AUDIO_CHANNEL_INDEX_MASK_8"/>

                     <profile name="" format="AUDIO_FORMAT_PCM_32_BIT"

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

                              channelMasks="AUDIO_CHANNEL_IN_5POINT1,AUDIO_CHANNEL_INDEX_MASK_6,AUDIO_CHANNEL_IN_7POINT1,AUDIO_CHANNEL_INDEX_MASK_8"/>

                     <profile name="" format="AUDIO_FORMAT_PCM_FLOAT"

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

                              channelMasks="AUDIO_CHANNEL_IN_5POINT1,AUDIO_CHANNEL_INDEX_MASK_6,AUDIO_CHANNEL_IN_7POINT1,AUDIO_CHANNEL_INDEX_MASK_8"/>

                </mixPort>

                <mixPort name="voip_tx" role="sink"

                         flags="AUDIO_INPUT_FLAG_VOIP_TX">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
@@ -341,7 +352,9 @@ 
                <route type="mix" sink="voice_rx"

                       sources="Telephony Rx"/>

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

                       sources="Built-In Mic,Built-In Back Mic,Wired Headset Mic,BT SCO Headset Mic,FM Tuner,USB Device In,USB Headset In"/>

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

                 <route type="mix" sink="usb_surround_sound"

                        sources="USB Device In,USB Headset In"/>

                <route type="mix" sink="voip_tx"

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

                <route type="mix" sink="surround_sound"

configs/sdm660/mixer_paths_mtp.xml

+5 −1
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="ISO-8859-1"?>

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

<!-- Copyright (c) 2015-2017, 2020-2021 The Linux Foundation. All rights reserved.    -->

<!--                                                                        -->

<!-- Redistribution and use in source and binary forms, with or without     -->

<!-- modification, are permitted provided that the following conditions are -->
@@ -3020,6 +3020,10 @@ 
        <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia2" value="1" />

    </path>



    <path name="hifi-record">

        <ctl name="MultiMedia2 Mixer INT3_MI2S_TX" value="1" />

    </path>



    <path name="hifi-record usb-headset-mic">

        <ctl name="MultiMedia2 Mixer USB_AUDIO_TX" value="1" />

    </path>

configs/sdm710/audio_policy_configuration.xml

+15 −2
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>

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

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

     Not a Contribution.

-->

<!-- Copyright (C) 2015 The Android Open Source Project
@@ -172,6 +172,17 @@ 
                             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="usb_surround_sound" role="sink">

                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

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

                              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,AUDIO_CHANNEL_IN_7POINT1,AUDIO_CHANNEL_INDEX_MASK_8"/>

                     <profile name="" format="AUDIO_FORMAT_PCM_32_BIT"

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

                              channelMasks="AUDIO_CHANNEL_IN_5POINT1,AUDIO_CHANNEL_INDEX_MASK_6,AUDIO_CHANNEL_IN_7POINT1,AUDIO_CHANNEL_INDEX_MASK_8"/>

                     <profile name="" format="AUDIO_FORMAT_PCM_FLOAT"

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

                              channelMasks="AUDIO_CHANNEL_IN_5POINT1,AUDIO_CHANNEL_INDEX_MASK_6,AUDIO_CHANNEL_IN_7POINT1,AUDIO_CHANNEL_INDEX_MASK_8"/>

                </mixPort>

                <mixPort name="voip_tx" role="sink"

                         flags="AUDIO_INPUT_FLAG_VOIP_TX">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
@@ -349,7 +360,9 @@ 
                <route type="mix" sink="voice_rx"

                       sources="Telephony Rx"/>

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

                       sources="Built-In Mic,Built-In Back Mic,Wired Headset Mic,BT SCO Headset Mic,FM Tuner,USB Device In,USB Headset In"/>

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

                 <route type="mix" sink="usb_surround_sound"

                        sources="USB Device In,USB Headset In"/>

                <route type="mix" sink="voip_tx"

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

                <route type="mix" sink="surround_sound"

configs/sdm845/audio_platform_info.xml

+3 −1
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="ISO-8859-1"?>

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

<!-- Copyright (c) 2014, 2016-2021, The Linux Foundation. All rights reserved. -->

<!--                                                                        -->

<!-- Redistribution and use in source and binary forms, with or without     -->

<!-- modification, are permitted provided that the following conditions are -->
@@ -99,6 +99,8 @@ 
        <usecase name="USECASE_INCALL_REC_UPLINK" type="in" id="27" />

        <usecase name="USECASE_INCALL_REC_DOWNLINK" type="in" id="27" />

        <usecase name="USECASE_INCALL_REC_UPLINK_AND_DOWNLINK" type="in" id="27" />

        <usecase name="USECASE_INCALL_MUSIC_UPLINK" type="out" id="27" />

        <usecase name="USECASE_INCALL_MUSIC_UPLINK2" type="out" id="27" />

    </pcm_ids>

    <config_params>

        <param key="spkr_1_tz_name" value="wsatz.13"/>

configs/sdm845/audio_policy_configuration.xml

+22 −4
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>

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

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

     Not a Contribution.

-->

<!-- Copyright (C) 2015 The Android Open Source Project
@@ -21,7 +21,7 @@ 
    <!-- version section contains a “version” tag in the form “major.minor” e.g version=”1.0” -->



    <!-- Global configuration Decalaration -->

    <globalConfiguration speaker_drc_enabled="true"/>

    <globalConfiguration speaker_drc_enabled="true" call_screen_mode_supported="true"/>





    <!-- Modules section:
@@ -161,6 +161,22 @@ 
                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

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

                </mixPort>

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

                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

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

                              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,AUDIO_CHANNEL_IN_7POINT1,AUDIO_CHANNEL_INDEX_MASK_8"/>

                     <profile name="" format="AUDIO_FORMAT_PCM_32_BIT"

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

                              channelMasks="AUDIO_CHANNEL_IN_5POINT1,AUDIO_CHANNEL_INDEX_MASK_6,AUDIO_CHANNEL_IN_7POINT1,AUDIO_CHANNEL_INDEX_MASK_8"/>

                     <profile name="" format="AUDIO_FORMAT_PCM_FLOAT"

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

                              channelMasks="AUDIO_CHANNEL_IN_5POINT1,AUDIO_CHANNEL_INDEX_MASK_6,AUDIO_CHANNEL_IN_7POINT1,AUDIO_CHANNEL_INDEX_MASK_8"/>

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

                             samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000"
@@ -332,11 +348,13 @@ 
                <route type="mix" sink="USB Headset Out"

                       sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx,mmap_no_irq_out,hifi_playback"/>

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

                       sources="voice_tx"/>

                       sources="voice_tx,incall_music_uplink"/>

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

                       sources="Telephony Rx"/>

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

                       sources="Built-In Mic,Built-In Back Mic,Wired Headset Mic,BT SCO Headset Mic,FM Tuner,USB Device In,USB Headset In"/>

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

                 <route type="mix" sink="usb_surround_sound"

                        sources="USB Device In,USB Headset In"/>

                <route type="mix" sink="voip_tx"

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

                <route type="mix" sink="record_24"