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

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

Merge "configs: sdm670: add support for VoIP over audio path in sdm670"

parents 9beb409e 994ecaca

configs/sdm670/audio_output_policy.conf

+7 −0
Original line number Diff line number Diff line
@@ -25,6 +25,13 @@ outputs { 
    bit_width 16

    app_type 69943

  }

voip_rx {

    flags AUDIO_OUTPUT_FLAG_VOIP_RX|AUDIO_OUTPUT_FLAG_DIRECT

    formats AUDIO_FORMAT_PCM_16_BIT

    sampling_rates 8000|16000|32000|48000

    bit_width 16

    app_type 69946

  }

  deep_buffer {

    flags AUDIO_OUTPUT_FLAG_DEEP_BUFFER

    formats AUDIO_FORMAT_PCM_16_BIT

configs/sdm670/audio_platform_info.xml

+2 −0
Original line number Diff line number Diff line
@@ -90,6 +90,8 @@ 
        <usecase name="USECASE_AUDIO_PLAYBACK_EXT_DISP_SILENCE" type="out" id="27" />

        <usecase name="USECASE_AUDIO_HFP_SCO" type="in" id="35" />

        <usecase name="USECASE_AUDIO_HFP_SCO_WB" type="in" id="35" />

        <usecase name="USECASE_AUDIO_PLAYBACK_VOIP" type="out" id="16" />

        <usecase name="USECASE_AUDIO_RECORD_VOIP" type="in" id="16" />

    </pcm_ids>

    <config_params>

        <param key="spkr_1_tz_name" value="wsatz.13"/>

configs/sdm670/audio_platform_info_intcodec.xml

+2 −0
Original line number Diff line number Diff line
@@ -60,6 +60,8 @@ 
        <usecase name="USECASE_AUDIO_PLAYBACK_EXT_DISP_SILENCE" type="out" id="27" />

        <usecase name="USECASE_AUDIO_HFP_SCO" type="in" id="12" />

        <usecase name="USECASE_AUDIO_HFP_SCO_WB" type="in" id="12" />

        <usecase name="USECASE_AUDIO_PLAYBACK_VOIP" type="out" id="16" />

        <usecase name="USECASE_AUDIO_RECORD_VOIP" type="in" id="16" />

    </pcm_ids>

    <config_params>

        <!-- In the below value string, the value indicates default mono -->

configs/sdm670/mixer_paths_mtp.xml

+61 −0
Original line number Diff line number Diff line
@@ -67,6 +67,9 @@ 
    <ctl name="MultiMedia1 Mixer SLIM_7_TX" value="0" />

    <ctl name="MultiMedia8 Mixer INT3_MI2S_TX" value="0" />

    <ctl name="MultiMedia8 Mixer SLIM_7_TX" value="0" />

    <ctl name="MultiMedia10 Mixer INT3_MI2S_TX" value="0" />

    <ctl name="MultiMedia10 Mixer SLIM_7_TX" value="0" />

    <ctl name="MultiMedia10 Mixer AFE_PCM_TX" value="0" />

    <ctl name="DISPLAY_PORT Mixer MultiMedia1" value="0" />

    <ctl name="DISPLAY_PORT Mixer MultiMedia2" value="0" />

    <ctl name="DISPLAY_PORT Mixer MultiMedia3" value="0" />
@@ -135,6 +138,7 @@ 
    <ctl name="MultiMedia2 Mixer USB_AUDIO_TX" value="0" />

    <ctl name="MultiMedia5 Mixer USB_AUDIO_TX" value="0" />

    <ctl name="MultiMedia8 Mixer USB_AUDIO_TX" value="0" />

    <ctl name="MultiMedia10 Mixer USB_AUDIO_TX" value="0" />

    <ctl name="USB_AUDIO_TX Format" value="S16_LE" />

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

    <ctl name="USB_AUDIO_TX Channels" value="One" />
@@ -1447,6 +1451,63 @@ 
        <ctl name="VoiceMMode2_Tx Mixer USB_AUDIO_TX_MMode2" value="1" />

    </path>



    <!-- VOIP Rx settings -->

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

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

    </path>



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

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

    </path>



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

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

    </path>



    <path name="audio-playback-voip bt-sco-wb">

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

        <path name="audio-playback-voip bt-sco" />

    </path>



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

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

    </path>



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

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

    </path>



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

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

    </path>



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

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

    </path>



    <path name="audio-playback-voip speaker-and-display-port">

        <path name="audio-playback-voip display-port" />

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

    </path>



    <!-- VoIP Tx settings -->

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

        <ctl name="MultiMedia10 Mixer INT3_MI2S_TX" value="1" />

    </path>



    <path name="audio-record-voip usb-headset-mic">

        <ctl name="MultiMedia10 Mixer USB_AUDIO_TX" value="1" />

    </path>



    <path name="audio-record-voip bt-sco">

        <ctl name="MultiMedia10 Mixer SLIM_7_TX" value="1" />

    </path>



    <path name="audio-record-voip bt-sco-wb">

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

        <path name="audio-record-voip bt-sco" />

   </path>



   <path name="spkr-rx-calib">

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

    </path>

configs/sdm670/mixer_paths_tavil.xml

+61 −0
Original line number Diff line number Diff line
@@ -72,6 +72,9 @@ 
    <ctl name="MultiMedia8 Mixer SLIM_0_TX" value="0" />

    <ctl name="MultiMedia8 Mixer SLIM_4_TX" value="0" />

    <ctl name="MultiMedia8 Mixer SLIM_7_TX" value="0" />

    <ctl name="MultiMedia10 Mixer SLIM_0_TX" value="0" />

    <ctl name="MultiMedia10 Mixer SLIM_7_TX" value="0" />

    <ctl name="MultiMedia10 Mixer AFE_PCM_TX" value="0" />

    <ctl name="DISPLAY_PORT Mixer MultiMedia1" value="0" />

    <ctl name="DISPLAY_PORT Mixer MultiMedia2" value="0" />

    <ctl name="DISPLAY_PORT Mixer MultiMedia3" value="0" />
@@ -160,6 +163,7 @@ 
    <ctl name="MultiMedia2 Mixer USB_AUDIO_TX" value="0" />

    <ctl name="MultiMedia5 Mixer USB_AUDIO_TX" value="0" />

    <ctl name="MultiMedia8 Mixer USB_AUDIO_TX" value="0" />

    <ctl name="MultiMedia10 Mixer USB_AUDIO_TX" value="0" />

    <ctl name="USB_AUDIO_TX Format" value="S16_LE" />

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

    <ctl name="USB_AUDIO_TX Channels" value="One" />
@@ -1541,6 +1545,63 @@ 
        <ctl name="VoiceMMode2_Tx Mixer USB_AUDIO_TX_MMode2" value="1" />

    </path>



    <!-- VOIP Rx settings -->

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

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

    </path>



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

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

    </path>



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

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

    </path>



    <path name="audio-playback-voip bt-sco-wb">

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

        <path name="audio-playback-voip bt-sco" />

    </path>



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

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

    </path>



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

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

    </path>



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

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

    </path>



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

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

    </path>



    <path name="audio-playback-voip speaker-and-display-port">

        <path name="audio-playback-voip display-port" />

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

    </path>



    <!-- VoIP Tx settings -->

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

        <ctl name="MultiMedia10 Mixer SLIM_0_TX" value="1" />

    </path>



    <path name="audio-record-voip usb-headset-mic">

        <ctl name="MultiMedia10 Mixer USB_AUDIO_TX" value="1" />

    </path>



    <path name="audio-record-voip bt-sco">

        <ctl name="MultiMedia10 Mixer SLIM_7_TX" value="1" />

    </path>



    <path name="audio-record-voip bt-sco-wb">

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

        <path name="audio-record-voip bt-sco" />

    </path>



   <path name="spkr-rx-calib">

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

    </path>