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

Commit b1ca9aae authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "configs: Add mixer controls for call screen support"

parents 62c0b82f 75776e50

configs/msmnile/audio_policy_configuration.xml

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

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

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

configs/msmnile/mixer_paths_pahu.xml

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

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

<!-- Copyright (c) 2016-2018, 2020 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 -->
@@ -229,6 +229,9 @@ 
    <ctl name="VoiceMMode1_Tx Mixer AFE_PCM_TX_MMode1" value="0" />

    <ctl name="USB_AUDIO_RX_Voice Mixer VoiceMMode1" value="0" />

    <ctl name="VoiceMMode1_Tx Mixer USB_AUDIO_TX_MMode1" value="0" />

    <!-- Multimode Voice1 proxy-Port -->

    <ctl name="PROXY_RX_Voice Mixer VoiceMMode1" value="0" />

    <ctl name="VoiceMMode1_Tx Mixer PROXY_TX_MMode1" value="0" />

    <!-- Miltimode Voice1 end-->



    <!-- Multimode Voice2 -->
@@ -243,6 +246,9 @@ 
    <ctl name="VoiceMMode2_Tx Mixer AFE_PCM_TX_MMode2" value="0" />

    <ctl name="USB_AUDIO_RX_Voice Mixer VoiceMMode2" value="0" />

    <ctl name="VoiceMMode2_Tx Mixer USB_AUDIO_TX_MMode2" value="0" />

    <!-- Multimode Voice2 proxy-Port -->

    <ctl name="PROXY_RX_Voice Mixer VoiceMMode2" value="0" />

    <ctl name="VoiceMMode2_Tx Mixer PROXY_TX_MMode2" value="0" />

    <!-- Multimode Voice2 end-->



    <!-- Voice external ec. reference -->
@@ -265,6 +271,7 @@ 


    <!-- Incall Music -->

    <ctl name="Incall_Music Audio Mixer MultiMedia2" value="0" />

    <ctl name="Incall_Music Audio Mixer MultiMedia9" value="0" />

    <!-- Incall Music End -->



    <!-- compress-voip-call start -->
@@ -1369,6 +1376,10 @@ 
        <path name="incall-rec-uplink-compress" />

    </path>



    <path name="incall-rec-uplink call-proxy-in">

        <path name="incall-rec-uplink" />

    </path>



    <path name="incall-rec-downlink">

        <ctl name="MultiMedia1 Mixer VOC_REC_DL"  value="1" />

    </path>
@@ -1409,6 +1420,10 @@ 
        <path name="incall-rec-downlink-compress" />

    </path>



    <path name="incall-rec-downlink call-proxy-in">

        <path name="incall-rec-downlink" />

    </path>



    <path name="incall-rec-uplink-and-downlink">

        <path name="incall-rec-uplink" />

        <path name="incall-rec-downlink" />
@@ -1451,6 +1466,10 @@ 
        <path name="incall-rec-uplink-and-downlink-compress" />

    </path>



    <path name="incall-rec-uplink-and-downlink call-proxy-in">

        <path name="incall-rec-uplink-and-downlink" />

    </path>



    <path name="hfp-sco">

    </path>
@@ -1537,6 +1556,11 @@ 
        <ctl name="VoiceMMode1_Tx Mixer USB_AUDIO_TX_MMode1" value="1" />

    </path>



    <path name="voicemmode1-call call-proxy">

        <ctl name="PROXY_RX_Voice Mixer VoiceMMode1" value="1" />

        <ctl name="VoiceMMode1_Tx Mixer PROXY_TX_MMode1" value="1" />

    </path>



    <path name="voicemmode2-call">

        <ctl name="SLIM_0_RX_Voice Mixer VoiceMMode2" value="1" />

        <ctl name="VoiceMMode2_Tx Mixer SLIM_0_TX_MMode2" value="1" />
@@ -1570,6 +1594,11 @@ 
        <ctl name="VoiceMMode2_Tx Mixer USB_AUDIO_TX_MMode2" value="1" />

    </path>



    <path name="voicemmode2-call call-proxy">

        <ctl name="PROXY_RX_Voice Mixer VoiceMMode2" value="1" />

        <ctl name="VoiceMMode2_Tx Mixer PROXY_TX_MMode2" value="1" />

    </path>



    <!-- VoIP Rx settings -->

    <path name="audio-playback-voip">

        <ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia10" value="1" />
@@ -2594,4 +2623,181 @@ 
        <ctl name="MultiMedia2 Mixer USB_AUDIO_TX" value="1" />

    </path>



    <path name="incall_music_uplink">

        <ctl name="Incall_Music Audio Mixer MultiMedia9" value="1" />

    </path>



    <path name="incall_music_uplink speaker">

        <path name="incall_music_uplink" />

    </path>



    <path name="incall_music_uplink handset">

        <path name="incall_music_uplink" />

    </path>



    <path name="incall_music_uplink handset-hac">

        <path name="incall_music_uplink" />

    </path>



    <path name="incall_music_uplink display-port">

        <path name="incall_music_uplink" />

    </path>



    <path name="incall_music_uplink bt-sco">

        <path name="incall_music_uplink" />

    </path>



    <path name="incall_music_uplink bt-sco-wb">

        <path name="incall_music_uplink" />

    </path>



    <path name="incall_music_uplink speaker-and-display-port">

        <path name="incall_music_uplink" />

    </path>



    <path name="incall_music_uplink afe-proxy">

        <path name="incall_music_uplink" />

    </path>



    <path name="incall_music_uplink usb-headphones">

        <path name="incall_music_uplink" />

    </path>



    <path name="incall_music_uplink usb-headset">

        <path name="incall_music_uplink" />

    </path>



    <path name="incall_music_uplink speaker-and-usb-headphones">

        <path name="incall_music_uplink" />

    </path>



    <path name="incall_music_uplink speaker-safe-and-usb-headphones">

        <path name="incall_music_uplink" />

    </path>



    <path name="incall_music_uplink headphones">

        <path name="incall_music_uplink" />

    </path>



    <path name="incall_music_uplink speaker-and-headphones">

        <path name="incall_music_uplink" />

    </path>



<path name="incall_music_uplink speaker-safe-and-headphones">

        <path name="incall_music_uplink" />

    </path>



    <path name="incall_music_uplink speaker-and-bt-sco">

        <path name="incall_music_uplink" />

    </path>



    <path name="incall_music_uplink speaker-safe-and-bt-sco">

        <path name="incall_music_uplink" />

    </path>



    <path name="incall_music_uplink voice-tty-hco-handset">

        <path name="incall_music_uplink" />

    </path>



    <path name="incall_music_uplink speaker-and-bt-a2dp">

        <path name="incall_music_uplink" />

    </path>



    <path name="incall_music_uplink speaker-safe-and-bt-a2dp">

        <path name="incall_music_uplink" />

    </path>



    <path name="incall_music_uplink bt-a2dp">

        <path name="incall_music_uplink" />

    </path>



    <path name="incall_music_uplink afe-proxy">

        <path name="incall_music_uplink" />

    </path>



    <path name="incall_music_uplink call-proxy">

        <path name="incall_music_uplink" />

    </path>



    <path name="incall_music_uplink2">

        <ctl name="Incall_Music_2 Audio Mixer MultiMedia9" value="1" />

    </path>



    <path name="incall_music_uplink2 speaker">

        <path name="incall_music_uplink2" />

    </path>



    <path name="incall_music_uplink2 handset">

        <path name="incall_music_uplink2" />

    </path>



    <path name="incall_music_uplink2 handset-hac">

        <path name="incall_music_uplink2" />

    </path>



    <path name="incall_music_uplink2 display-port">

        <path name="incall_music_uplink2" />

    </path>



    <path name="incall_music_uplink2 bt-sco">

        <path name="incall_music_uplink2" />

    </path>



    <path name="incall_music_uplink2 bt-sco-wb">

        <path name="incall_music_uplink2" />

    </path>



    <path name="incall_music_uplink2 speaker-and-display-port">

        <path name="incall_music_uplink2" />

    </path>



    <path name="incall_music_uplink2 afe-proxy">

        <path name="incall_music_uplink2" />

    </path>



    <path name="incall_music_uplink2 usb-headphones">

        <path name="incall_music_uplink2" />

    </path>



    <path name="incall_music_uplink2 usb-headset">

        <path name="incall_music_uplink2" />

    </path>



    <path name="incall_music_uplink2 speaker-and-usb-headphones">

        <path name="incall_music_uplink2" />

    </path>



    <path name="incall_music_uplink2 headphones">

        <path name="incall_music_uplink2" />

    </path>



    <path name="incall_music_uplink2 speaker-and-headphones">

        <path name="incall_music_uplink2" />

    </path>



    <path name="incall_music_uplink2 speaker-and-bt-sco">

        <path name="incall_music_uplink2" />

    </path>



    <path name="incall_music_uplink2 voice-tty-hco-handset">

        <path name="incall_music_uplink2" />

    </path>



    <path name="incall_music_uplink2 speaker-and-bt-a2dp">

        <path name="incall_music_uplink2" />

    </path>



    <path name="incall_music_uplink2 bt-a2dp">

        <path name="incall_music_uplink2" />

    </path>



    <path name="incall_music_uplink2 afe-proxy">

        <path name="incall_music_uplink2" />

    </path>



    <path name="call-proxy">

    </path>



    <path name="call-proxy-in">

    </path>

</mixer>

configs/msmnile/mixer_paths_tavil.xml

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

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

<!-- Copyright (c) 2016-2020, 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 -->
@@ -246,6 +246,9 @@ 
    <ctl name="VoiceMMode1_Tx Mixer USB_AUDIO_TX_MMode1" value="0" />

    <!-- Multimode Voice1 Display-Port -->

    <ctl name="DISPLAY_PORT_RX_Voice Mixer VoiceMMode1" value="0" />

    <!-- Multimode Voice1 proxy-Port -->

    <ctl name="PROXY_RX_Voice Mixer VoiceMMode1" value="0" />

    <ctl name="VoiceMMode1_Tx Mixer PROXY_TX_MMode1" value="0" />

    <!-- Miltimode Voice1 end-->



    <!-- Multimode Voice2 -->
@@ -263,6 +266,9 @@ 
    <ctl name="VoiceMMode2_Tx Mixer USB_AUDIO_TX_MMode2" value="0" />

    <!-- Multimode Voice2 Display-Port -->

    <ctl name="DISPLAY_PORT_RX_Voice Mixer VoiceMMode2" value="0" />

    <!-- Multimode Voice2 proxy-Port -->

    <ctl name="PROXY_RX_Voice Mixer VoiceMMode2" value="0" />

    <ctl name="VoiceMMode2_Tx Mixer PROXY_TX_MMode2" value="0" />

    <!-- Multimode Voice2 end-->



    <!-- Voice external ec. reference -->
@@ -1710,6 +1716,10 @@ 
        <path name="incall-rec-uplink-compress" />

    </path>



    <path name="incall-rec-uplink call-proxy-in">

        <path name="incall-rec-uplink" />

    </path>



    <path name="incall-rec-downlink">

        <ctl name="MultiMedia1 Mixer VOC_REC_DL"  value="1" />

    </path>
@@ -1758,6 +1768,10 @@ 
        <path name="incall-rec-downlink-compress" />

    </path>



    <path name="incall-rec-downlink call-proxy-in">

        <path name="incall-rec-downlink" />

    </path>



    <path name="incall-rec-uplink-and-downlink">

        <path name="incall-rec-uplink" />

        <path name="incall-rec-downlink" />
@@ -1808,6 +1822,10 @@ 
        <path name="incall-rec-uplink-and-downlink-compress" />

    </path>



    <path name="incall-rec-uplink-and-downlink call-proxy-in">

        <path name="incall-rec-uplink-and-downlink" />

    </path>



    <path name="hfp-sco">

    </path>
@@ -1925,6 +1943,11 @@ 
        <ctl name="VoiceMMode1_Tx Mixer SLIM_0_TX_MMode1" value="1" />

    </path>



    <path name="voicemmode1-call call-proxy">

        <ctl name="PROXY_RX_Voice Mixer VoiceMMode1" value="1" />

        <ctl name="VoiceMMode1_Tx Mixer PROXY_TX_MMode1" value="1" />

    </path>



    <path name="voicemmode2-call">

        <ctl name="SLIM_0_RX_Voice Mixer VoiceMMode2" value="1" />

        <ctl name="VoiceMMode2_Tx Mixer SLIM_0_TX_MMode2" value="1" />
@@ -1975,6 +1998,11 @@ 
        <ctl name="VoiceMMode2_Tx Mixer SLIM_0_TX_MMode2" value="1" />

    </path>



    <path name="voicemmode2-call call-proxy">

        <ctl name="PROXY_RX_Voice Mixer VoiceMMode2" value="1" />

        <ctl name="VoiceMMode2_Tx Mixer PROXY_TX_MMode2" value="1" />

    </path>



    <!-- VoIP Rx settings -->

    <path name="audio-playback-voip">

        <ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia10" value="1" />
@@ -3454,6 +3482,10 @@ 
        <path name="incall_music_uplink" />

    </path>



    <path name="incall_music_uplink call-proxy">

        <path name="incall_music_uplink" />

    </path>



    <path name="incall_music_uplink2">

        <ctl name="Incall_Music_2 Audio Mixer MultiMedia9" value="1" />

    </path>
@@ -3529,4 +3561,10 @@ 
    <path name="incall_music_uplink2 afe-proxy">

        <path name="incall_music_uplink2" />

    </path>



    <path name="call-proxy">

    </path>



    <path name="call-proxy-in">

    </path>

</mixer>

configs/msmsteppe/audio_policy_configuration.xml

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

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

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

configs/msmsteppe/audio_policy_configuration_odm.xml

+1 −1
Original line number Diff line number Diff line
@@ -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: