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

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

Merge "configs: msm8937: add support for VoIP over audio path"

parents 956161f3 103de7a8

configs/msm8937/audio_output_policy.conf

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

    app_type 69937

  }

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

+8 −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 -->
@@ -48,6 +48,8 @@ 
        <usecase name="USECASE_VOICEMMODE1_CALL" type="out" id="34"/>

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

        <usecase name="USECASE_VOICEMMODE2_CALL" type="out" id="35"/>

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

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

    </pcm_ids>

    <config_params>

        <param key="spkr_1_tz_name" value="wsa881x.0f"/>
@@ -70,6 +72,7 @@ 
        <device name="SND_DEVICE_IN_HDMI_MIC" acdb_id="4"/>

        <device name="SND_DEVICE_IN_HANDSET_TMIC_FLUENCE_PRO" acdb_id="125"/>

        <device name="SND_DEVICE_IN_HANDSET_TMIC" acdb_id="125"/>

        <device name="SND_DEVICE_IN_HEADSET_MIC_FLUENCE" acdb_id="8"/>

    </acdb_ids>



    <backend_names>
@@ -172,6 +175,10 @@ 
        <device name="SND_DEVICE_OUT_SPEAKER_WSA_AND_BT_SCO_WB" backend="wsa-speaker-and-bt-sco-wb" interface="PRI_MI2S_RX-and-INT_BT_SCO_RX"/>

        <device name="SND_DEVICE_OUT_VOICE_SPEAKER_VBAT" backend="vbat-voice-speaker" interface="PRI_MI2S_RX"/>

        <device name="SND_DEVICE_IN_HDMI_MIC" interface="HDMI"/>

        <device name="SND_DEVICE_IN_BT_SCO_MIC" interface="INT_BT_SCO_TX"/>

        <device name="SND_DEVICE_IN_BT_SCO_MIC_NREC" interface="INT_BT_SCO_TX"/>

        <device name="SND_DEVICE_IN_BT_SCO_MIC_WB" interface="INT_BT_SCO_TX"/>

        <device name="SND_DEVICE_IN_BT_SCO_MIC_WB_NREC" interface="INT_BT_SCO_TX"/>

    </backend_names>

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

    <microphone_characteristics>

configs/msm8937/audio_platform_info_intcodec.xml

+7 −0
Original line number Diff line number Diff line
@@ -50,6 +50,8 @@ 
        <usecase name="USECASE_INCALL_MUSIC_UPLINK" type="out" id="1" />

        <usecase name="USECASE_INCALL_MUSIC_UPLINK2" type="out" id="35" />

        <usecase name="USECASE_AUDIO_SPKR_CALIB_TX" type="in" id="26"/>

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

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

    </pcm_ids>

    <config_params>

        <param key="spkr_1_tz_name" value="wsa881x.0f"/>
@@ -72,6 +74,7 @@ 
        <device name="SND_DEVICE_IN_HDMI_MIC" acdb_id="4"/>

        <device name="SND_DEVICE_IN_HANDSET_TMIC_FLUENCE_PRO" acdb_id="125"/>

        <device name="SND_DEVICE_IN_HANDSET_TMIC" acdb_id="125"/>

        <device name="SND_DEVICE_IN_HEADSET_MIC_FLUENCE" acdb_id="8"/>

    </acdb_ids>



    <backend_names>
@@ -174,6 +177,10 @@ 
        <device name="SND_DEVICE_OUT_SPEAKER_WSA_AND_BT_SCO_WB" backend="wsa-speaker-and-bt-sco-wb" interface="PRI_MI2S_RX-and-INT_BT_SCO_RX"/>

        <device name="SND_DEVICE_OUT_VOICE_SPEAKER_VBAT" backend="vbat-voice-speaker" interface="PRI_MI2S_RX"/>

        <device name="SND_DEVICE_IN_HDMI_MIC" interface="HDMI"/>

        <device name="SND_DEVICE_IN_BT_SCO_MIC" interface="INT_BT_SCO_TX"/>

        <device name="SND_DEVICE_IN_BT_SCO_MIC_NREC" interface="INT_BT_SCO_TX"/>

        <device name="SND_DEVICE_IN_BT_SCO_MIC_WB" interface="INT_BT_SCO_TX"/>

        <device name="SND_DEVICE_IN_BT_SCO_MIC_WB_NREC" interface="INT_BT_SCO_TX"/>

    </backend_names>

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

    <microphone_characteristics>

configs/msm8937/audio_platform_info_mtp.xml

+7 −0
Original line number Diff line number Diff line
@@ -49,6 +49,8 @@ 
        <usecase name="USECASE_VOICEMMODE2_CALL" type="out" id="35"/>

        <usecase name="USECASE_INCALL_MUSIC_UPLINK" type="out" id="1" />

        <usecase name="USECASE_INCALL_MUSIC_UPLINK2" type="out" id="35" />

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

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

    </pcm_ids>

    <config_params>

        <param key="spkr_1_tz_name" value="wsa881x.0f"/>
@@ -71,6 +73,7 @@ 
        <device name="SND_DEVICE_IN_HDMI_MIC" acdb_id="4"/>

        <device name="SND_DEVICE_IN_HANDSET_TMIC_FLUENCE_PRO" acdb_id="125"/>

        <device name="SND_DEVICE_IN_HANDSET_TMIC" acdb_id="125"/>

        <device name="SND_DEVICE_IN_HEADSET_MIC_FLUENCE" acdb_id="8"/>

    </acdb_ids>



    <backend_names>
@@ -173,6 +176,10 @@ 
        <device name="SND_DEVICE_OUT_SPEAKER_WSA_AND_BT_SCO_WB" backend="wsa-speaker-and-bt-sco-wb" interface="PRI_MI2S_RX-and-INT_BT_SCO_RX"/>

        <device name="SND_DEVICE_OUT_VOICE_SPEAKER_VBAT" backend="vbat-voice-speaker" interface="PRI_MI2S_RX"/>

        <device name="SND_DEVICE_IN_HDMI_MIC" interface="HDMI"/>

        <device name="SND_DEVICE_IN_BT_SCO_MIC" interface="INT_BT_SCO_TX"/>

        <device name="SND_DEVICE_IN_BT_SCO_MIC_NREC" interface="INT_BT_SCO_TX"/>

        <device name="SND_DEVICE_IN_BT_SCO_MIC_WB" interface="INT_BT_SCO_TX"/>

        <device name="SND_DEVICE_IN_BT_SCO_MIC_WB_NREC" interface="INT_BT_SCO_TX"/>

    </backend_names>

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

    <microphone_characteristics>

configs/msm8937/audio_platform_info_tasha.xml

+7 −0
Original line number Diff line number Diff line
@@ -52,6 +52,8 @@ 
        <usecase name="USECASE_QCHAT_CALL" type="out" id="42"/>

        <usecase name="USECASE_INCALL_MUSIC_UPLINK" type="out" id="1" />

        <usecase name="USECASE_INCALL_MUSIC_UPLINK2" type="out" id="35" />

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

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

    </pcm_ids>

    <acdb_ids>

        <device name="SND_DEVICE_OUT_SPEAKER_EXTERNAL_1" acdb_id="14"/>
@@ -65,6 +67,7 @@ 
        <device name="SND_DEVICE_IN_HDMI_MIC" acdb_id="4"/>

        <device name="SND_DEVICE_IN_HANDSET_TMIC_FLUENCE_PRO" acdb_id="125"/>

        <device name="SND_DEVICE_IN_HANDSET_TMIC" acdb_id="125"/>

        <device name="SND_DEVICE_IN_HEADSET_MIC_FLUENCE" acdb_id="8"/>

    </acdb_ids>

    <config_params>

        <param key="spkr_1_tz_name" value="wsatz.11"/>
@@ -95,6 +98,10 @@ 
        <device name="SND_DEVICE_OUT_SPEAKER_WSA_AND_BT_SCO_WB" backend="wsa-speaker-and-bt-sco-wb" interface="SLIMBUS_0_RX-and-INT_BT_SCO_RX"/>

        <device name="SND_DEVICE_OUT_VOICE_SPEAKER_VBAT" backend="vbat-voice-speaker"/>

        <device name="SND_DEVICE_IN_HDMI_MIC" interface="HDMI"/>

        <device name="SND_DEVICE_IN_BT_SCO_MIC" interface="INT_BT_SCO_TX"/>

        <device name="SND_DEVICE_IN_BT_SCO_MIC_NREC" interface="INT_BT_SCO_TX"/>

        <device name="SND_DEVICE_IN_BT_SCO_MIC_WB" interface="INT_BT_SCO_TX"/>

        <device name="SND_DEVICE_IN_BT_SCO_MIC_WB_NREC" interface="INT_BT_SCO_TX"/>

    </backend_names>

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

    <microphone_characteristics>