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

Commit ba6281e8 authored by Divya Narayanan Poojary's avatar Divya Narayanan Poojary
Browse files

configs: Support fluence for ADSP SVA 

Update sound trigger mixer controls to support pre-processing
of captured data in ADM when requested. The existing mixer controls
would be used when LSM directly connects to AFE.
When LSM connects to ADM, regular recording path is used till LSM

CRs-Fixed: 2108942
Change-Id: If9ce9891f863eb90fdf3d3407ce52707c970a496
parent 5cc0bcdb

configs/msm8953/sound_trigger_mixer_paths.xml

+62 −0
Original line number Diff line number Diff line
@@ -94,6 +94,54 @@ 
        <ctl name="LSM8 Mixer TERT_MI2S_TX" value="1" />

    </path>



    <path name="listen-voice-wakeup-1 preproc">

        <ctl name="TERT_MI2S_TX LSM Function" value="SWAUDIO" />

        <ctl name="LSM1 Port" value="ADM_LSM_TX" />

        <ctl name="LSM1 Mixer TERT_MI2S_TX" value="1" />

    </path>



    <path name="listen-voice-wakeup-2 preproc">

        <ctl name="TERT_MI2S_TX LSM Function" value="SWAUDIO" />

        <ctl name="LSM2 Port" value="ADM_LSM_TX" />

        <ctl name="LSM2 Mixer TERT_MI2S_TX" value="1" />

    </path>



    <path name="listen-voice-wakeup-3 preproc">

        <ctl name="TERT_MI2S_TX LSM Function" value="SWAUDIO" />

        <ctl name="LSM3 Port" value="ADM_LSM_TX" />

        <ctl name="LSM3 Mixer TERT_MI2S_TX" value="1" />

    </path>



    <path name="listen-voice-wakeup-4 preproc">

        <ctl name="TERT_MI2S_TX LSM Function" value="SWAUDIO" />

        <ctl name="LSM4 Port" value="ADM_LSM_TX" />

        <ctl name="LSM4 Mixer TERT_MI2S_TX" value="1" />

    </path>



    <path name="listen-voice-wakeup-5 preproc">

        <ctl name="TERT_MI2S_TX LSM Function" value="SWAUDIO" />

        <ctl name="LSM5 Port" value="ADM_LSM_TX" />

        <ctl name="LSM5 Mixer TERT_MI2S_TX" value="1" />

    </path>



    <path name="listen-voice-wakeup-6 preproc">

        <ctl name="TERT_MI2S_TX LSM Function" value="SWAUDIO" />

        <ctl name="LSM6 Port" value="ADM_LSM_TX" />

        <ctl name="LSM6 Mixer TERT_MI2S_TX" value="1" />

    </path>



    <path name="listen-voice-wakeup-7 preproc">

        <ctl name="TERT_MI2S_TX LSM Function" value="SWAUDIO" />

        <ctl name="LSM7 Port" value="ADM_LSM_TX" />

        <ctl name="LSM7 Mixer TERT_MI2S_TX" value="1" />

    </path>



    <path name="listen-voice-wakeup-8 preproc">

        <ctl name="TERT_MI2S_TX LSM Function" value="SWAUDIO" />

        <ctl name="LSM8 Port" value="ADM_LSM_TX" />

        <ctl name="LSM8 Mixer TERT_MI2S_TX" value="1" />

    </path>



    <path name="listen-ape-handset-mic">

        <!-- this is to avoid codec mute when device is not enabled first -->

        <ctl name="LOOPBACK Mode" value="ENABLE" />
@@ -102,4 +150,18 @@ 
        <ctl name="ADC2 MUX" value="INP3" />

    </path>



    <path name="listen-ape-handset-mic-preproc">

        <ctl name="DEC1 MUX" value="ADC2" />

        <ctl name="ADC2 MUX" value="INP3" />

    </path>



    <path name="listen-ape-handset-dmic">

        <ctl name="ADC1 Volume" value="6" />

        <ctl name="DEC1 MUX" value="ADC1" />

        <ctl name="ADC3 Volume" value="6" />

        <ctl name="DEC2 MUX" value="ADC2" />

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

        <ctl name="ADC2 MUX" value="INP3" />

    </path>



</mixer>

configs/msm8953/sound_trigger_mixer_paths_wcd9335.xml

+124 −0
Original line number Diff line number Diff line
@@ -57,6 +57,19 @@ 
    <ctl name="EC BUF MUX INP" value="ZERO" />

    <ctl name="ADC MUX1" value="DMIC" />

    <ctl name="DMIC MUX1" value="ZERO" />

    <ctl name="ADC MUX5" value="AMIC" />

    <ctl name="ADC MUX6" value="AMIC" />

    <ctl name="ADC MUX7" value="AMIC" />

    <ctl name="ADC MUX8" value="AMIC" />

    <ctl name="DMIC MUX5" value="ZERO" />

    <ctl name="DMIC MUX6" value="ZERO" />

    <ctl name="DMIC MUX7" value="ZERO" />

    <ctl name="DMIC MUX8" value="ZERO" />

    <ctl name="IIR0 INP0 MUX" value="ZERO" />

    <ctl name="AIF1_CAP Mixer SLIM TX5" value="0" />

    <ctl name="AIF1_CAP Mixer SLIM TX6" value="0" />

    <ctl name="AIF1_CAP Mixer SLIM TX7" value="0" />

    <ctl name="AIF1_CAP Mixer SLIM TX8" value="0" />



    <path name="listen-voice-wakeup-1">

        <ctl name="SLIMBUS_5_TX LSM Function" value="AUDIO" />
@@ -100,6 +113,54 @@ 
        <ctl name="LSM8 Mixer SLIMBUS_5_TX" value="1" />

    </path>



    <path name="listen-voice-wakeup-1 preproc">

        <ctl name="SLIMBUS_0_TX LSM Function" value="SWAUDIO" />

        <ctl name="LSM1 Port" value="ADM_LSM_TX" />

        <ctl name="LSM1 Mixer SLIMBUS_0_TX" value="1" />

    </path>



    <path name="listen-voice-wakeup-2 preproc">

        <ctl name="SLIMBUS_0_TX LSM Function" value="SWAUDIO" />

        <ctl name="LSM2 Port" value="ADM_LSM_TX" />

        <ctl name="LSM2 Mixer SLIMBUS_0_TX" value="1" />

    </path>



    <path name="listen-voice-wakeup-3 preproc">

        <ctl name="SLIMBUS_0_TX LSM Function" value="SWAUDIO" />

        <ctl name="LSM3 Port" value="ADM_LSM_TX" />

        <ctl name="LSM3 Mixer SLIMBUS_0_TX" value="1" />

    </path>



    <path name="listen-voice-wakeup-4 preproc">

        <ctl name="SLIMBUS_0_TX LSM Function" value="SWAUDIO" />

        <ctl name="LSM4 Port" value="ADM_LSM_TX" />

        <ctl name="LSM4 Mixer SLIMBUS_0_TX" value="1" />

    </path>



    <path name="listen-voice-wakeup-5 preproc">

        <ctl name="SLIMBUS_0_TX LSM Function" value="SWAUDIO" />

        <ctl name="LSM5 Port" value="ADM_LSM_TX" />

        <ctl name="LSM5 Mixer SLIMBUS_0_TX" value="1" />

    </path>



    <path name="listen-voice-wakeup-6 preproc">

        <ctl name="SLIMBUS_0_TX LSM Function" value="SWAUDIO" />

        <ctl name="LSM6 Port" value="ADM_LSM_TX" />

        <ctl name="LSM6 Mixer SLIMBUS_0_TX" value="1" />

    </path>



    <path name="listen-voice-wakeup-7 preproc">

        <ctl name="SLIMBUS_0_TX LSM Function" value="SWAUDIO" />

        <ctl name="LSM7 Port" value="ADM_LSM_TX" />

        <ctl name="LSM7 Mixer SLIMBUS_0_TX" value="1" />

    </path>



    <path name="listen-voice-wakeup-8 preproc">

        <ctl name="SLIMBUS_0_TX LSM Function" value="SWAUDIO" />

        <ctl name="LSM8 Port" value="ADM_LSM_TX" />

        <ctl name="LSM8 Mixer SLIMBUS_0_TX" value="1" />

    </path>



    <path name="listen-cpe-handset-mic">

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

        <ctl name="TX13 INP MUX" value="CPE_TX_PP" />
@@ -130,4 +191,67 @@ 
        <ctl name="MAD Input" value="DMIC0" />

    </path>



    <path name="listen-ape-handset-mic-preproc">

        <ctl name="AIF1_CAP Mixer SLIM TX7" value="1"/>

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

        <ctl name="SLIM TX7 MUX" value="DEC7" />

        <ctl name="ADC MUX7" value="DMIC" />

        <ctl name="DMIC MUX7" value="DMIC0" />

        <ctl name="IIR0 INP0 MUX" value="DEC7" />

    </path>



    <path name="listen-ape-handset-dmic">

        <ctl name="AIF1_CAP Mixer SLIM TX7" value="1" />

        <ctl name="AIF1_CAP Mixer SLIM TX8" value="1" />

        <ctl name="SLIM TX7 MUX" value="DEC7" />

        <ctl name="ADC MUX7" value="DMIC" />

        <ctl name="DMIC MUX7" value="DMIC0" />

        <ctl name="SLIM TX8 MUX" value="DEC8" />

        <ctl name="ADC MUX8" value="DMIC" />

        <ctl name="DMIC MUX8" value="DMIC3" />

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

   </path>



    <path name="listen-ape-handset-qmic">

        <ctl name="AIF1_CAP Mixer SLIM TX5" value="1" />

        <ctl name="AIF1_CAP Mixer SLIM TX6" value="1" />

        <ctl name="AIF1_CAP Mixer SLIM TX7" value="1" />

        <ctl name="AIF1_CAP Mixer SLIM TX8" value="1" />

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

        <ctl name="SLIM TX5 MUX" value="DEC5" />

        <ctl name="ADC MUX5" value="DMIC" />

        <ctl name="DMIC MUX5" value="DMIC0" />

        <ctl name="SLIM TX6 MUX" value="DEC6" />

        <ctl name="ADC MUX6" value="DMIC" />

        <ctl name="DMIC MUX6" value="DMIC2" />

        <ctl name="SLIM TX7 MUX" value="DEC7" />

        <ctl name="ADC MUX7" value="DMIC" />

        <ctl name="DMIC MUX7" value="DMIC1" />

        <ctl name="SLIM TX8 MUX" value="DEC8" />

        <ctl name="ADC MUX8" value="DMIC" />

        <ctl name="DMIC MUX8" value="DMIC3" />

    </path>



    <path name="listen-ape-handset-tmic">

        <ctl name="AIF1_CAP Mixer SLIM TX5" value="1"/>

        <ctl name="AIF1_CAP Mixer SLIM TX6" value="1" />

        <ctl name="AIF1_CAP Mixer SLIM TX7" value="1"/>

        <ctl name="SLIM_0_TX Channels" value="Three" />

        <ctl name="SLIM TX5 MUX" value="DEC5" />

        <ctl name="ADC MUX5" value="DMIC" />

        <ctl name="DMIC MUX5" value="DMIC0" />

        <ctl name="SLIM TX6 MUX" value="DEC6" />

        <ctl name="ADC MUX6" value="DMIC" />

        <ctl name="DMIC MUX6" value="DMIC2" />

        <ctl name="SLIM TX7 MUX" value="DEC7" />

        <ctl name="ADC MUX7" value="DMIC" />

        <ctl name="DMIC MUX7" value="DMIC4" />

    </path>



    <path name="echo-reference">

        <ctl name="AUDIO_REF_EC_UL1 MUX" value="SLIM_RX" />

        <ctl name="EC Reference Channels" value="Two"/>

        <ctl name="EC Reference Bit Format" value="S16_LE"/>

        <ctl name="EC Reference SampleRate" value="48000"/>

    </path>

</mixer>

configs/msm8953/sound_trigger_platform_info.xml

+40 −3
Original line number Diff line number Diff line
@@ -35,12 +35,25 @@ 
        <param enable_failure_detection="false" />

        <param rx_concurrency_disabled="true" />

        <param rx_conc_max_st_ses="1" />

        <!-- Below backend params must match with port used in mixer path file -->

        <!-- param used to configure backend sample rate, format and channels -->

        <!--Enable below backend params for internal codec-->

        <!--param backend_port_name="MI2S_TX" />

        <param backend_dai_name="TERT_MI2S_TX" /-->

        <param backend_port_name="SLIM_0_TX" />

        <param backend_dai_name="SLIMBUS_0_TX" />

    </common_config>



    <acdb_ids>

        <param DEVICE_HANDSET_APE_ACDB_ID="130" />

        <param DEVICE_HANDSET_CPE_ACDB_ID="128" />

        <param DEVICE_HANDSET_CPE_ECPP_ACDB_ID="128" />

        <!--For internal codec please enable below device-->

        <!--param DEVICE_HANDSET_MIC_APE="130" /-->

        <param DEVICE_HANDSET_MIC_APE="100" />

        <param DEVICE_HANDSET_MIC_CPE="128" />

        <param EVICE_HANDSET_MIC_ECPP_CPE="128" />

        <param DEVICE_HANDSET_MIC_PP_APE="151" />

        <param DEVICE_HANDSET_QMIC_APE="150" />

        <param DEVICE_HANDSET_DMIC_APE="149" />

        <param DEVICE_HANDSET_TMIC_APE="152" />

    </acdb_ids>



    <!-- Multiple sound_model_config tags can be listed, each with unique    -->
@@ -55,6 +68,14 @@ 
        <param max_ape_phrases="10" />

        <param max_ape_users="10" />

        <param sample_rate="16000" />

        <param bit_width="16" />

        <param channel_count="1"/>

        <!-- adm_cfg_profile should match with the one defined under adm_config -->

        <!-- Set it to NONE if LSM directly connects to AFE -->

        <param adm_cfg_profile="NONE" />

        <!-- fluence_type: "FLUENCE", "FLUENCE_DMIC", "FLUENCE_TMIC", -->

        <!-- "FLUENCE_QMIC". param value is valid when adm_cfg_profile="FLUENCE"-->

        <param fluence_type="NONE" />



        <!-- Module and param ids with which the algorithm is integrated in firmware -->

        <param load_sound_model_ids="0x00012C0D, 0x00012C14" />
@@ -69,5 +90,21 @@ 
        <param client_capture_read_delay="2000" />

    </sound_model_config>



    <!-- Multiple adm_config tags can be listed, each with unique profile name. -->

    <!-- app_type to match corresponding value from ACDB -->

    <adm_config>

        <param adm_cfg_profile="DEFAULT" />

        <param app_type="69938" />

        <param sample_rate="16000" />

        <param bit_width="16" />

    </adm_config>



    <adm_config>

        <param adm_cfg_profile="FLUENCE" />

        <param app_type="69944" />

        <param sample_rate="16000" />

        <param bit_width="16" />

    </adm_config>



</sound_trigger_platform_info>