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

Commit d0d780d4 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "config: update pri pcm sample rate for hfp-sco-wb"

parents d3328d3c ccf24898

configs/msmnile_au/mixer_paths_adp.xml

+4 −2
Original line number Diff line number Diff line
@@ -1617,6 +1617,8 @@ 
    </path>



    <path name="hfp-sco-wb">

        <ctl name="PRIM_AUX_PCM_TX SampleRate" value="KHZ_16" />

        <ctl name="PRIM_AUX_PCM_RX SampleRate" value="KHZ_16" />

        <path name="hfp-sco" />

    </path>

configs/msmnile_au/mixer_paths_custom.xml

+17 −16
Original line number Diff line number Diff line
@@ -576,7 +576,7 @@ 
    </path>



    <path name="deep-buffer-playback">

        <ctl name="TERT_TDM_RX_0 Channels" value="Two" />

        <ctl name="TERT_TDM_RX_0 Channels" value="Six" />

        <ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia1" value="1" />

    </path>
@@ -639,7 +639,7 @@ 
    </path>



    <path name="low-latency-playback">

        <ctl name="TERT_TDM_RX_0 Channels" value="Two" />

        <ctl name="TERT_TDM_RX_0 Channels" value="Six" />

        <ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia5" value="1" />

    </path>
@@ -706,7 +706,7 @@ 
    </path>



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

        <ctl name="TERT_TDM_RX_0 Channels" value="Two" />

        <ctl name="TERT_TDM_RX_0 Channels" value="Six" />

        <ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia8" value="1" />

    </path>
@@ -772,7 +772,7 @@ 
    </path>



    <path name="compress-offload-playback">

        <ctl name="TERT_TDM_RX_0 Channels" value="Two" />

        <ctl name="TERT_TDM_RX_0 Channels" value="Six" />

        <ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia4" value="1" />

    </path>
@@ -847,7 +847,7 @@ 
    </path>



    <path name="compress-offload-playback2">

        <ctl name="TERT_TDM_RX_0 Channels" value="Two" />

        <ctl name="TERT_TDM_RX_0 Channels" value="Six" />

        <ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia7" value="1" />

    </path>
@@ -914,7 +914,7 @@ 
    </path>



    <path name="compress-offload-playback3">

        <ctl name="TERT_TDM_RX_0 Channels" value="Two" />

        <ctl name="TERT_TDM_RX_0 Channels" value="Six" />

        <ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia10" value="1" />

    </path>
@@ -981,7 +981,7 @@ 
    </path>



    <path name="compress-offload-playback4">

        <ctl name="TERT_TDM_RX_0 Channels" value="Two" />

        <ctl name="TERT_TDM_RX_0 Channels" value="Six" />

        <ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia11" value="1" />

    </path>
@@ -1049,7 +1049,7 @@ 
    </path>



    <path name="compress-offload-playback5">

        <ctl name="TERT_TDM_RX_0 Channels" value="Two" />

        <ctl name="TERT_TDM_RX_0 Channels" value="Six" />

        <ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia12" value="1" />

    </path>
@@ -1116,7 +1116,7 @@ 
    </path>



    <path name="compress-offload-playback6">

        <ctl name="TERT_TDM_RX_0 Channels" value="Two" />

        <ctl name="TERT_TDM_RX_0 Channels" value="Six" />

        <ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia13" value="1" />

    </path>
@@ -1183,7 +1183,7 @@ 
    </path>



    <path name="compress-offload-playback7">

        <ctl name="TERT_TDM_RX_0 Channels" value="Two" />

        <ctl name="TERT_TDM_RX_0 Channels" value="Six" />

        <ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia14" value="1" />

    </path>
@@ -1250,7 +1250,7 @@ 
    </path>



    <path name="compress-offload-playback8">

        <ctl name="TERT_TDM_RX_0 Channels" value="Two" />

        <ctl name="TERT_TDM_RX_0 Channels" value="Six" />

        <ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia15" value="1" />

    </path>
@@ -1317,7 +1317,7 @@ 
    </path>



    <path name="compress-offload-playback9">

        <ctl name="TERT_TDM_RX_0 Channels" value="Two" />

        <ctl name="TERT_TDM_RX_0 Channels" value="Six" />

        <ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia16" value="1" />

    </path>
@@ -1613,6 +1613,8 @@ 
    </path>



    <path name="hfp-sco-wb">

        <ctl name="PRIM_AUX_PCM_TX SampleRate" value="KHZ_16" />

        <ctl name="PRIM_AUX_PCM_RX SampleRate" value="KHZ_16" />

        <path name="hfp-sco" />

    </path>
@@ -1753,6 +1755,7 @@ 


    <!-- VoIP Rx settings -->

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

        <ctl name="TERT_TDM_RX_0 Channels" value="Six" />

        <ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia10" value="1" />

    </path>
@@ -2611,8 +2614,6 @@ 
    </path>



    <path name="bt-a2dp">

        <ctl name="BT SampleRate" value="KHZ_48" />

        <ctl name="AFE Input Channels" value="Two" />

        <ctl name="SLIM7_RX ADM Channels" value="Two" />

    </path>

configs/msmsteppe_au/audio_platform_info.xml

+4 −4
Original line number Diff line number Diff line
@@ -27,12 +27,12 @@ 
<!-- IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.                          -->

<audio_platform_info>

    <acdb_ids>

        <device name="SND_DEVICE_OUT_HANDSET" acdb_id="41"/>

        <device name="SND_DEVICE_OUT_SPEAKER" acdb_id="41"/>

        <device name="SND_DEVICE_OUT_HEADPHONES" acdb_id="41"/>

        <device name="SND_DEVICE_OUT_HANDSET" acdb_id="78"/>

        <device name="SND_DEVICE_OUT_SPEAKER" acdb_id="78"/>

        <device name="SND_DEVICE_OUT_HEADPHONES" acdb_id="78"/>

        <device name="SND_DEVICE_OUT_BT_SCO" acdb_id="94"/>

        <device name="SND_DEVICE_OUT_BT_SCO_WB" acdb_id="94"/>

        <device name="SND_DEVICE_OUT_BT_A2DP" acdb_id="41"/>

        <device name="SND_DEVICE_OUT_BT_A2DP" acdb_id="78"/>

        <device name="SND_DEVICE_OUT_VOICE_HANDSET" acdb_id="94"/>

        <device name="SND_DEVICE_OUT_VOICE_SPEAKER" acdb_id="94"/>

        <device name="SND_DEVICE_IN_HANDSET_MIC" acdb_id="11"/>

configs/msmsteppe_au/mixer_paths_adp.xml

+21 −14
Original line number Diff line number Diff line
@@ -319,6 +319,10 @@ 
    <ctl name="SEC_TDM_RX_0 Audio Mixer MultiMedia9" value="0" />

    <ctl name="MultiMedia9 Mixer TERT_TDM_TX_0" value="0" />



    <path name="dummy-hostless">

        <ctl name="SEC_TDM_RX_7 Port Mixer TERT_TDM_TX_7" value="1" />

    </path>



    <!-- Codec controls -->

    <!-- WSA controls -->

    <ctl name="SpkrLeft COMP Switch" value="0" />
@@ -577,7 +581,7 @@ 
    </path>



    <path name="deep-buffer-playback">

        <ctl name="TERT_TDM_RX_0 Channels" value="Two" />

        <ctl name="TERT_TDM_RX_0 Channels" value="Six" />

        <ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia1" value="1" />

    </path>
@@ -640,7 +644,7 @@ 
    </path>



    <path name="low-latency-playback">

        <ctl name="TERT_TDM_RX_0 Channels" value="Two" />

        <ctl name="TERT_TDM_RX_0 Channels" value="Six" />

        <ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia5" value="1" />

    </path>
@@ -707,7 +711,7 @@ 
    </path>



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

        <ctl name="TERT_TDM_RX_0 Channels" value="Two" />

        <ctl name="TERT_TDM_RX_0 Channels" value="Six" />

        <ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia8" value="1" />

    </path>
@@ -773,7 +777,7 @@ 
    </path>



    <path name="compress-offload-playback">

        <ctl name="TERT_TDM_RX_0 Channels" value="Two" />

        <ctl name="TERT_TDM_RX_0 Channels" value="Six" />

        <ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia4" value="1" />

    </path>
@@ -848,7 +852,7 @@ 
    </path>



    <path name="compress-offload-playback2">

        <ctl name="TERT_TDM_RX_0 Channels" value="Two" />

        <ctl name="TERT_TDM_RX_0 Channels" value="Six" />

        <ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia7" value="1" />

    </path>
@@ -915,7 +919,7 @@ 
    </path>



    <path name="compress-offload-playback3">

        <ctl name="TERT_TDM_RX_0 Channels" value="Two" />

        <ctl name="TERT_TDM_RX_0 Channels" value="Six" />

        <ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia10" value="1" />

    </path>
@@ -982,7 +986,7 @@ 
    </path>



    <path name="compress-offload-playback4">

        <ctl name="TERT_TDM_RX_0 Channels" value="Two" />

        <ctl name="TERT_TDM_RX_0 Channels" value="Six" />

        <ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia11" value="1" />

    </path>
@@ -1050,7 +1054,7 @@ 
    </path>



    <path name="compress-offload-playback5">

        <ctl name="TERT_TDM_RX_0 Channels" value="Two" />

        <ctl name="TERT_TDM_RX_0 Channels" value="Six" />

        <ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia12" value="1" />

    </path>
@@ -1117,7 +1121,7 @@ 
    </path>



    <path name="compress-offload-playback6">

        <ctl name="TERT_TDM_RX_0 Channels" value="Two" />

        <ctl name="TERT_TDM_RX_0 Channels" value="Six" />

        <ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia13" value="1" />

    </path>
@@ -1184,7 +1188,7 @@ 
    </path>



    <path name="compress-offload-playback7">

        <ctl name="TERT_TDM_RX_0 Channels" value="Two" />

        <ctl name="TERT_TDM_RX_0 Channels" value="Six" />

        <ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia14" value="1" />

    </path>
@@ -1251,7 +1255,7 @@ 
    </path>



    <path name="compress-offload-playback8">

        <ctl name="TERT_TDM_RX_0 Channels" value="Two" />

        <ctl name="TERT_TDM_RX_0 Channels" value="Six" />

        <ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia15" value="1" />

    </path>
@@ -1318,7 +1322,7 @@ 
    </path>



    <path name="compress-offload-playback9">

        <ctl name="TERT_TDM_RX_0 Channels" value="Two" />

        <ctl name="TERT_TDM_RX_0 Channels" value="Six" />

        <ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia16" value="1" />

    </path>
@@ -1614,6 +1618,8 @@ 
    </path>



    <path name="hfp-sco-wb">

        <ctl name="PRIM_AUX_PCM_TX SampleRate" value="KHZ_16" />

        <ctl name="PRIM_AUX_PCM_RX SampleRate" value="KHZ_16" />

        <path name="hfp-sco" />

    </path>
@@ -1754,6 +1760,7 @@ 


    <!-- VoIP Rx settings -->

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

        <ctl name="TERT_TDM_RX_0 Channels" value="Six" />

        <ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia10" value="1" />

    </path>

configs/msmsteppe_au/mixer_paths_custom.xml

+17 −16
Original line number Diff line number Diff line
@@ -577,7 +577,7 @@ 
    </path>



    <path name="deep-buffer-playback">

        <ctl name="TERT_TDM_RX_0 Channels" value="Two" />

        <ctl name="TERT_TDM_RX_0 Channels" value="Six" />

        <ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia1" value="1" />

    </path>
@@ -640,7 +640,7 @@ 
    </path>



    <path name="low-latency-playback">

        <ctl name="TERT_TDM_RX_0 Channels" value="Two" />

        <ctl name="TERT_TDM_RX_0 Channels" value="Six" />

        <ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia5" value="1" />

    </path>
@@ -707,7 +707,7 @@ 
    </path>



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

        <ctl name="TERT_TDM_RX_0 Channels" value="Two" />

        <ctl name="TERT_TDM_RX_0 Channels" value="Six" />

        <ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia8" value="1" />

    </path>
@@ -773,7 +773,7 @@ 
    </path>



    <path name="compress-offload-playback">

        <ctl name="TERT_TDM_RX_0 Channels" value="Two" />

        <ctl name="TERT_TDM_RX_0 Channels" value="Six" />

        <ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia4" value="1" />

    </path>
@@ -848,7 +848,7 @@ 
    </path>



    <path name="compress-offload-playback2">

        <ctl name="TERT_TDM_RX_0 Channels" value="Two" />

        <ctl name="TERT_TDM_RX_0 Channels" value="Six" />

        <ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia7" value="1" />

    </path>
@@ -915,7 +915,7 @@ 
    </path>



    <path name="compress-offload-playback3">

        <ctl name="TERT_TDM_RX_0 Channels" value="Two" />

        <ctl name="TERT_TDM_RX_0 Channels" value="Six" />

        <ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia10" value="1" />

    </path>
@@ -982,7 +982,7 @@ 
    </path>



    <path name="compress-offload-playback4">

        <ctl name="TERT_TDM_RX_0 Channels" value="Two" />

        <ctl name="TERT_TDM_RX_0 Channels" value="Six" />

        <ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia11" value="1" />

    </path>
@@ -1050,7 +1050,7 @@ 
    </path>



    <path name="compress-offload-playback5">

        <ctl name="TERT_TDM_RX_0 Channels" value="Two" />

        <ctl name="TERT_TDM_RX_0 Channels" value="Six" />

        <ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia12" value="1" />

    </path>
@@ -1117,7 +1117,7 @@ 
    </path>



    <path name="compress-offload-playback6">

        <ctl name="TERT_TDM_RX_0 Channels" value="Two" />

        <ctl name="TERT_TDM_RX_0 Channels" value="Six" />

        <ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia13" value="1" />

    </path>
@@ -1184,7 +1184,7 @@ 
    </path>



    <path name="compress-offload-playback7">

        <ctl name="TERT_TDM_RX_0 Channels" value="Two" />

        <ctl name="TERT_TDM_RX_0 Channels" value="Six" />

        <ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia14" value="1" />

    </path>
@@ -1251,7 +1251,7 @@ 
    </path>



    <path name="compress-offload-playback8">

        <ctl name="TERT_TDM_RX_0 Channels" value="Two" />

        <ctl name="TERT_TDM_RX_0 Channels" value="Six" />

        <ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia15" value="1" />

    </path>
@@ -1318,7 +1318,7 @@ 
    </path>



    <path name="compress-offload-playback9">

        <ctl name="TERT_TDM_RX_0 Channels" value="Two" />

        <ctl name="TERT_TDM_RX_0 Channels" value="Six" />

        <ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia16" value="1" />

    </path>
@@ -1614,6 +1614,8 @@ 
    </path>



    <path name="hfp-sco-wb">

        <ctl name="PRIM_AUX_PCM_TX SampleRate" value="KHZ_16" />

        <ctl name="PRIM_AUX_PCM_RX SampleRate" value="KHZ_16" />

        <path name="hfp-sco" />

    </path>
@@ -1754,6 +1756,7 @@ 


    <!-- VoIP Rx settings -->

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

        <ctl name="TERT_TDM_RX_0 Channels" value="Six" />

        <ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia10" value="1" />

    </path>
@@ -2612,8 +2615,6 @@ 
    </path>



    <path name="bt-a2dp">

        <ctl name="BT SampleRate" value="KHZ_48" />

        <ctl name="AFE Input Channels" value="Two" />

        <ctl name="SLIM7_RX ADM Channels" value="Two" />

    </path>