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

Commit 35e88e03 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 c17cf041 f8f6a0ca

configs/msm8937/mixer_paths.xml

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

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

<!-- Copyright (c) 2015-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 -->
@@ -143,6 +143,9 @@ 
    <ctl name="VoiceMMode1_Tx Mixer INT_BT_SCO_TX_MMode1" value="0" />

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

    <ctl name="VoiceMMode1_Tx Mixer AFE_PCM_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" />

    <!-- Multimode Voice1 end -->



    <!-- Multimode Voice2 -->
@@ -152,6 +155,9 @@ 
    <ctl name="VoiceMMode2_Tx Mixer INT_BT_SCO_TX_MMode2" value="0" />

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

    <ctl name="VoiceMMode2_Tx Mixer AFE_PCM_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 -->



    <!-- Voip -->
@@ -185,6 +191,7 @@ 
    <!-- Incall Music -->

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

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

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

    <!-- Incall Music End -->



    <!-- QCHAT -->
@@ -833,6 +840,11 @@ 
        <path name="voicemmode1-call" />

    </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="PRI_MI2S_RX_Voice Mixer VoiceMMode2" value="1" />

        <ctl name="VoiceMMode2_Tx Mixer TERT_MI2S_TX_MMode2" value="1" />
@@ -861,6 +873,10 @@ 
        <path name="voicemmode2-call" />

    </path>



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

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

    </path>



    <path name="hfp-sco">

        <ctl name="PRI_MI2S_RX Port Mixer INTERNAL_BT_SCO_TX" value="1" />

        <ctl name="INTERNAL_BT_SCO_RX Audio Mixer MultiMedia6" value="1" />
@@ -909,6 +925,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>
@@ -945,6 +965,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" />
@@ -1083,6 +1107,11 @@ 
        <path name="compress-voip-call" />

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



    <path name="qchat-call">

        <ctl name="PRI_MI2S_RX_Voice Mixer QCHAT" value="1" />

        <ctl name="QCHAT_Tx Mixer TERT_MI2S_TX_QCHAT" value="1" />

configs/msm8937/mixer_paths_mtp.xml

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

<!--

    Copyright (c) 2015-2016, 2018, 2019, The Linux Foundation. All rights reserved.

   Copyright (c) 2015-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
@@ -170,6 +170,9 @@ 
    <ctl name="VoiceMMode1_Tx Mixer INT_BT_SCO_TX_MMode1" value="0" />

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

    <ctl name="VoiceMMode1_Tx Mixer AFE_PCM_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" />

    <!-- Multimode Voice1 end -->



    <!-- Multimode Voice2 -->
@@ -179,6 +182,9 @@ 
    <ctl name="VoiceMMode2_Tx Mixer INT_BT_SCO_TX_MMode2" value="0" />

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

    <ctl name="VoiceMMode2_Tx Mixer AFE_PCM_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 -->



    <!-- Voip -->
@@ -212,6 +218,7 @@ 
    <!-- Incall Music -->

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

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

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

    <!-- Incall Music End -->



    <!-- QCHAT -->
@@ -958,6 +965,11 @@ 
        <path name="voicemmode1-call" />

    </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="PRI_MI2S_RX_Voice Mixer VoiceMMode2" value="1" />

        <ctl name="VoiceMMode2_Tx Mixer TERT_MI2S_TX_MMode2" value="1" />
@@ -986,6 +998,10 @@ 
        <path name="voicemmode2-call" />

    </path>



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

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

    </path>



    <path name="hfp-sco">

        <ctl name="PRI_MI2S_RX Port Mixer INTERNAL_BT_SCO_TX" value="1" />

        <ctl name="INTERNAL_BT_SCO_RX Audio Mixer MultiMedia6" value="1" />
@@ -1034,6 +1050,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>
@@ -1070,6 +1090,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" />
@@ -1208,6 +1232,11 @@ 
        <path name="compress-voip-call" />

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



    <path name="qchat-call">

        <ctl name="PRI_MI2S_RX_Voice Mixer QCHAT" value="1" />

        <ctl name="QCHAT_Tx Mixer TERT_MI2S_TX_QCHAT" value="1" />

configs/msm8937/mixer_paths_sku1.xml

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

<!--

    Copyright (c) 2018, The Linux Foundation. All rights reserved.

    Copyright (c) 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
@@ -170,6 +170,9 @@ 
    <ctl name="VoiceMMode1_Tx Mixer INT_BT_SCO_TX_MMode1" value="0" />

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

    <ctl name="VoiceMMode1_Tx Mixer AFE_PCM_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" />

    <!-- Multimode Voice1 end -->



    <!-- Multimode Voice2 -->
@@ -179,6 +182,9 @@ 
    <ctl name="VoiceMMode2_Tx Mixer INT_BT_SCO_TX_MMode2" value="0" />

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

    <ctl name="VoiceMMode2_Tx Mixer AFE_PCM_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 -->



    <!-- Voip -->
@@ -212,6 +218,7 @@ 
    <!-- Incall Music -->

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

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

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

    <!-- Incall Music End -->



    <!-- QCHAT -->
@@ -910,6 +917,11 @@ 
       <path name="voicemmode1-call usb-headphones" />

    </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="PRI_MI2S_RX_Voice Mixer VoiceMMode2" value="1" />

        <ctl name="VoiceMMode2_Tx Mixer TERT_MI2S_TX_MMode2" value="1" />
@@ -934,6 +946,10 @@ 
       <path name="voicemmode2-call usb-headphones" />

    </path>



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

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

    </path>



    <path name="hfp-sco">

        <ctl name="PRI_MI2S_RX Port Mixer INTERNAL_BT_SCO_TX" value="1" />

        <ctl name="INTERNAL_BT_SCO_RX Audio Mixer MultiMedia6" value="1" />
@@ -982,6 +998,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>
@@ -1018,6 +1038,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" />
@@ -1148,6 +1172,11 @@ 
        <ctl name="Voip_Tx Mixer AFE_PCM_TX_Voip" 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>



    <path name="qchat-call">

        <ctl name="PRI_MI2S_RX_Voice Mixer QCHAT" value="1" />

        <ctl name="QCHAT_Tx Mixer TERT_MI2S_TX_QCHAT" value="1" />

configs/msm8937/mixer_paths_tasha.xml

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

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

<!-- Copyright (c) 2015-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 -->
@@ -410,6 +410,9 @@ 
    <!-- Multimode Voice1 USB headset -->

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

    <ctl name="VoiceMMode1_Tx Mixer AFE_PCM_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 -->
@@ -424,6 +427,9 @@ 
    <!-- Multimode Voice2 USB headset -->

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

    <ctl name="VoiceMMode2_Tx Mixer AFE_PCM_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 -->
@@ -442,6 +448,7 @@ 
    <!-- Incall Music -->

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

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

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

    <!-- Incall Music End -->



    <!-- compress-voip-call start -->
@@ -1618,6 +1625,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>
@@ -1658,6 +1669,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" />
@@ -1700,6 +1715,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">

        <ctl name="HFP_INT_UL_HL Switch" value="1" />

        <ctl name="SLIMBUS_0_RX Port Mixer INTERNAL_BT_SCO_TX" value="1" />
@@ -1805,6 +1824,11 @@ 
        <path name="compress-voip-call"/>

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



    <path name="qchat-call">

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

        <ctl name="QCHAT_Tx Mixer SLIM_0_TX_QCHAT" value="1" />
@@ -1925,6 +1949,11 @@ 
        <path name="voicemmode1-call"/>

    </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" />
@@ -2700,4 +2729,183 @@ 
          <path name="speaker-and-headphones" />

    </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/msm8937/mixer_paths_tashalite.xml

+209 −1

File changed.

Preview size limit exceeded, changes collapsed.