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

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

Merge "configs: add new mixer paths for mmsecns hfp calls"

parents 8f47047d d1f6335c

configs/msmnile_au/audio_platform_info.xml

+7 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ 
        <device name="SND_DEVICE_IN_VOICE_HEADSET_MIC" acdb_id="95"/>

        <device name="SND_DEVICE_IN_VOICE_SPEAKER_MIC" acdb_id="95"/>

        <device name="SND_DEVICE_IN_VOICE_SPEAKER_MIC_HFP" acdb_id="95"/>

        <device name="SND_DEVICE_IN_VOICE_SPEAKER_MIC_HFP_MMSECNS" acdb_id="131"/>

        <device name="SND_DEVICE_IN_BT_SCO_MIC" acdb_id="20"/>

        <device name="SND_DEVICE_IN_BT_SCO_MIC_WB" acdb_id="38"/>

        <device name="SND_DEVICE_IN_HANDSET_DMIC" acdb_id="80"/>
@@ -74,6 +75,10 @@ 
            <device name="SND_DEVICE_IN_HANDSET_DMIC_AEC_NS" module_id="0x10F0A" instance_id="0x0" param_id="0x10EAF" param_value="0x02"/>

            <device name="SND_DEVICE_IN_HANDSET_MIC_AEC_NS" module_id="0x10F09" instance_id="0x0" param_id="0x10EAF" param_value="0x02"/>

        </ns>

        <mmsecns>

            <!-- multi-mic surround ECNS zone control -->

            <device name="SND_DEVICE_IN_VOICE_SPEAKER_MIC_HFP_MMSECNS" topology_id="0x1FFF0002" module_id="0x10F3B" instance_id="0x8000" param_id="0x109F0"/>

        </mmsecns>

    </module_ids>



    <bit_width_configs>
@@ -174,6 +179,8 @@ 
        <device name="SND_DEVICE_IN_SPEAKER_DMIC" interface="TERT_TDM_TX_0"/>

        <device name="SND_DEVICE_IN_QUAD_MIC" interface="TERT_TDM_TX_0"/>

        <device name="SND_DEVICE_IN_HANDSET_QMIC" interface="TERT_TDM_TX_0"/>

        <!-- multi-mic surround ECNS mixer path definition -->

        <device name="SND_DEVICE_IN_VOICE_SPEAKER_MIC_HFP_MMSECNS" backend="bt-sco-mmsecns" interface="TERT_TDM_TX_0"/>

    </backend_names>

    <!-- below values are for ref purpose to OEM, doesn't contain actual hardware info on MTP -->

    <microphone_characteristics>

configs/msmnile_au/mixer_paths_adp.xml

+23 −8
Original line number Diff line number Diff line
@@ -1600,12 +1600,6 @@ 
        <path name="incall-rec-uplink-and-downlink-compress" />

    </path>



    <path name="hfp-sco">

        <ctl name="AUX_PCM_RX Audio Mixer MultiMedia6" value="1" />

        <ctl name="TERT_TDM_TX_0 Channels" value="One" />

        <ctl name="MultiMedia6 Mixer TERT_TDM_TX_0" value="1" />

    </path>



    <path name="icc-call">

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

        <ctl name="SEC_TDM_RX_0 Channels" value="Four" />
@@ -1624,11 +1618,26 @@ 
    <path name="hfp-sco headphones">

    </path>



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

        <path name="hfp-sco headphones" />

    </path>



    <path name="hfp-sco headset">

        <path name="hfp-sco headphones" />

    </path>



    <path name="hfp-sco">

        <ctl name="AUX_PCM_RX Audio Mixer MultiMedia6" value="1" />

        <ctl name="MultiMedia6 Mixer TERT_TDM_TX_0" value="1" />

    </path>



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

        <ctl name="TERT_TDM_TX_0 Channels" value="One" />

        <path name="hfp-sco" />

    </path>



    <path name="hfp-sco bt-sco-mmsecns">

        <ctl name="TERT_TDM_TX_0 Channels" value="Four" />

        <path name="hfp-sco" />

    </path>
@@ -1638,11 +1647,13 @@ 
    </path>



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

        <ctl name="TERT_TDM_TX_0 Channels" value="One" />

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

    </path>



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

        <path name="hfp-sco headphones" />

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

        <ctl name="TERT_TDM_TX_0 Channels" value="Four" />

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

    </path>
@@ -2145,6 +2156,10 @@ 
        <path name="speaker-mic" />

    </path>



    <path name="voice-speaker-mic-hfp-mmsecns">

        <path name="speaker-mic" />

    </path>



    <path name="voice-headphones">

        <path name="headphones" />

    </path>

configs/msmnile_au/mixer_paths_custom.xml

+23 −8
Original line number Diff line number Diff line
@@ -1588,12 +1588,6 @@ 
        <path name="incall-rec-uplink-and-downlink-compress" />

    </path>



    <path name="hfp-sco">

        <ctl name="AUX_PCM_RX Audio Mixer MultiMedia6" value="1" />

        <ctl name="TERT_TDM_TX_0 Channels" value="One" />

        <ctl name="MultiMedia6 Mixer TERT_TDM_TX_0" value="1" />

    </path>



    <path name="icc-call">

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

        <ctl name="SEC_TDM_RX_0 Channels" value="Four" />
@@ -1612,11 +1606,26 @@ 
    <path name="hfp-sco headphones">

    </path>



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

        <path name="hfp-sco headphones" />

    </path>



    <path name="hfp-sco headset">

        <path name="hfp-sco headphones" />

    </path>



    <path name="hfp-sco">

        <ctl name="AUX_PCM_RX Audio Mixer MultiMedia6" value="1" />

        <ctl name="MultiMedia6 Mixer TERT_TDM_TX_0" value="1" />

    </path>



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

        <ctl name="TERT_TDM_TX_0 Channels" value="One" />

        <path name="hfp-sco" />

    </path>



    <path name="hfp-sco bt-sco-mmsecns">

        <ctl name="TERT_TDM_TX_0 Channels" value="Four" />

        <path name="hfp-sco" />

    </path>
@@ -1626,11 +1635,13 @@ 
    </path>



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

        <ctl name="TERT_TDM_TX_0 Channels" value="One" />

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

    </path>



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

        <path name="hfp-sco headphones" />

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

        <ctl name="TERT_TDM_TX_0 Channels" value="Four" />

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

    </path>
@@ -2133,6 +2144,10 @@ 
        <path name="speaker-mic" />

    </path>



    <path name="voice-speaker-mic-hfp-mmsecns">

        <path name="speaker-mic" />

    </path>



    <path name="voice-headphones">

        <path name="headphones" />

    </path>

configs/msmsteppe_au/audio_platform_info.xml

+7 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ 
        <device name="SND_DEVICE_IN_VOICE_HEADSET_MIC" acdb_id="95"/>

        <device name="SND_DEVICE_IN_VOICE_SPEAKER_MIC" acdb_id="95"/>

        <device name="SND_DEVICE_IN_VOICE_SPEAKER_MIC_HFP" acdb_id="95"/>

        <device name="SND_DEVICE_IN_VOICE_SPEAKER_MIC_HFP_MMSECNS" acdb_id="131"/>

        <device name="SND_DEVICE_IN_BT_SCO_MIC" acdb_id="20"/>

        <device name="SND_DEVICE_IN_BT_SCO_MIC_WB" acdb_id="38"/>

        <device name="SND_DEVICE_IN_HANDSET_DMIC" acdb_id="80"/>
@@ -74,6 +75,10 @@ 
            <device name="SND_DEVICE_IN_HANDSET_DMIC_AEC_NS" module_id="0x10F0A" instance_id="0x0" param_id="0x10EAF" param_value="0x02"/>

            <device name="SND_DEVICE_IN_HANDSET_MIC_AEC_NS" module_id="0x10F09" instance_id="0x0" param_id="0x10EAF" param_value="0x02"/>

        </ns>

        <mmsecns>

            <!-- multi-mic surround ECNS zone control -->

            <device name="SND_DEVICE_IN_VOICE_SPEAKER_MIC_HFP_MMSECNS" topology_id="0x1FFF0002" module_id="0x10F3B" instance_id="0x8000" param_id="0x109F0"/>

        </mmsecns>

    </module_ids>



    <bit_width_configs>
@@ -174,6 +179,8 @@ 
        <device name="SND_DEVICE_IN_SPEAKER_DMIC" interface="TERT_TDM_TX_0"/>

        <device name="SND_DEVICE_IN_QUAD_MIC" interface="TERT_TDM_TX_0"/>

        <device name="SND_DEVICE_IN_HANDSET_QMIC" interface="TERT_TDM_TX_0"/>

        <!-- multi-mic surround ECNS mixer path definition -->

        <device name="SND_DEVICE_IN_VOICE_SPEAKER_MIC_HFP_MMSECNS" backend="bt-sco-mmsecns" interface="TERT_TDM_TX_0"/>

    </backend_names>

    <!-- below values are for ref purpose to OEM, doesn't contain actual hardware info on MTP -->

    <microphone_characteristics>

configs/msmsteppe_au/mixer_paths_adp.xml

+23 −8
Original line number Diff line number Diff line
@@ -1371,12 +1371,6 @@ 
        <path name="incall-rec-uplink-and-downlink-compress" />

    </path>



    <path name="hfp-sco">

        <ctl name="AUX_PCM_RX Audio Mixer MultiMedia6" value="1" />

        <ctl name="TERT_TDM_TX_0 Channels" value="One" />

        <ctl name="MultiMedia6 Mixer TERT_TDM_TX_0" value="1" />

    </path>



    <path name="icc-call">

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

        <ctl name="SEC_TDM_RX_0 Channels" value="Four" />
@@ -1395,7 +1389,22 @@ 
    <path name="hfp-sco headphones">

    </path>



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

        <path name="hfp-sco headphones" />

    </path>



    <path name="hfp-sco">

        <ctl name="AUX_PCM_RX Audio Mixer MultiMedia6" value="1" />

        <ctl name="MultiMedia6 Mixer TERT_TDM_TX_0" value="1" />

    </path>



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

        <ctl name="TERT_TDM_TX_0 Channels" value="One" />

        <path name="hfp-sco" />

    </path>



    <path name="hfp-sco bt-sco-mmsecns">

        <ctl name="TERT_TDM_TX_0 Channels" value="Four" />

        <path name="hfp-sco" />

    </path>
@@ -1405,11 +1414,13 @@ 
    </path>



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

        <ctl name="TERT_TDM_TX_0 Channels" value="One" />

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

    </path>



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

        <path name="hfp-sco headphones" />

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

        <ctl name="TERT_TDM_TX_0 Channels" value="Four" />

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

    </path>



    <path name="hfp-sco-downlink">
@@ -1870,6 +1881,10 @@ 
        <path name="speaker-mic" />

    </path>



    <path name="voice-speaker-mic-hfp-mmsecns">

        <path name="speaker-mic" />

    </path>



    <path name="voice-headphones">

        <path name="headphones" />

    </path>