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

Commit c9250dc3 authored by Samyak Jain's avatar Samyak Jain Committed by Gerrit - the friendly Code Review server
Browse files

HAL: Add new device for voice tty headset 

voice tty usecase not working due to different
backend added for headset.

add new device for headset to differentiate
from headphones and update mixer path
accordingly.

Change-Id: Ie6ff44b773ee8fc4f257b096806651b467871f09
parent 7e8ec1d8

hal/msm8974/platform.c

+22 −2
Original line number Diff line number Diff line
@@ -517,7 +517,9 @@ static const char * const device_table[SND_DEVICE_MAX] = { 
    [SND_DEVICE_OUT_SPEAKER_SAFE_AND_BT_A2DP] = "speaker-safe-and-bt-a2dp",

    [SND_DEVICE_OUT_VOICE_HANDSET_TMUS] = "voice-handset-tmus",

    [SND_DEVICE_OUT_VOICE_TTY_FULL_HEADPHONES] = "voice-tty-full-headphones",

    [SND_DEVICE_OUT_VOICE_TTY_FULL_HEADSET] = "voice-tty-full-headset",

    [SND_DEVICE_OUT_VOICE_TTY_VCO_HEADPHONES] = "voice-tty-vco-headphones",

    [SND_DEVICE_OUT_VOICE_TTY_VCO_HEADSET] = "voice-tty-vco-headset",

    [SND_DEVICE_OUT_VOICE_TTY_HCO_HANDSET] = "voice-tty-hco-handset",

    [SND_DEVICE_OUT_VOICE_TTY_FULL_USB] = "voice-tty-full-usb",

    [SND_DEVICE_OUT_VOICE_TTY_VCO_USB] = "voice-tty-vco-usb",
@@ -786,7 +788,9 @@ static int acdb_device_table[SND_DEVICE_MAX] = { 
    [SND_DEVICE_OUT_SPEAKER_SAFE_AND_BT_A2DP] = 14,

    [SND_DEVICE_OUT_VOICE_HANDSET_TMUS] = 88,

    [SND_DEVICE_OUT_VOICE_TTY_FULL_HEADPHONES] = 17,

    [SND_DEVICE_OUT_VOICE_TTY_FULL_HEADSET] = 17,

    [SND_DEVICE_OUT_VOICE_TTY_VCO_HEADPHONES] = 17,

    [SND_DEVICE_OUT_VOICE_TTY_VCO_HEADSET] = 17,

    [SND_DEVICE_OUT_VOICE_TTY_HCO_HANDSET] = 37,

    [SND_DEVICE_OUT_VOICE_TTY_FULL_USB] = 17,

    [SND_DEVICE_OUT_VOICE_TTY_VCO_USB] = 17,
@@ -1002,7 +1006,9 @@ static struct name_to_index snd_device_name_index[SND_DEVICE_MAX] = { 
    {TO_NAME_INDEX(SND_DEVICE_OUT_VOICE_HANDSET_TMUS)},

    {TO_NAME_INDEX(SND_DEVICE_OUT_VOICE_HAC_HANDSET)},

    {TO_NAME_INDEX(SND_DEVICE_OUT_VOICE_TTY_FULL_HEADPHONES)},

    {TO_NAME_INDEX(SND_DEVICE_OUT_VOICE_TTY_FULL_HEADSET)},

    {TO_NAME_INDEX(SND_DEVICE_OUT_VOICE_TTY_VCO_HEADPHONES)},

    {TO_NAME_INDEX(SND_DEVICE_OUT_VOICE_TTY_VCO_HEADSET)},

    {TO_NAME_INDEX(SND_DEVICE_OUT_VOICE_TTY_HCO_HANDSET)},

    {TO_NAME_INDEX(SND_DEVICE_OUT_SPEAKER_AND_BT_SCO)},

    {TO_NAME_INDEX(SND_DEVICE_OUT_SPEAKER_AND_BT_SCO_WB)},
@@ -2108,7 +2114,9 @@ static void set_platform_defaults(struct platform_data * my_data) 
        strdup("SLIMBUS_0_RX-and-SLIMBUS_7_RX");

    hw_interface_table[SND_DEVICE_OUT_VOICE_HANDSET_TMUS] = strdup("SLIMBUS_0_RX");

    hw_interface_table[SND_DEVICE_OUT_VOICE_TTY_FULL_HEADPHONES] = strdup("SLIMBUS_6_RX");

    hw_interface_table[SND_DEVICE_OUT_VOICE_TTY_FULL_HEADSET] = strdup("SLIMBUS_6_RX");

    hw_interface_table[SND_DEVICE_OUT_VOICE_TTY_VCO_HEADPHONES] = strdup("SLIMBUS_6_RX");

    hw_interface_table[SND_DEVICE_OUT_VOICE_TTY_VCO_HEADSET] = strdup("SLIMBUS_6_RX");

    hw_interface_table[SND_DEVICE_OUT_VOICE_TTY_HCO_HANDSET] = strdup("SLIMBUS_0_RX");

    hw_interface_table[SND_DEVICE_OUT_VOICE_TTY_FULL_USB] = strdup("USB_AUDIO_RX");

    hw_interface_table[SND_DEVICE_OUT_VOICE_TTY_VCO_USB] = strdup("USB_AUDIO_RX");
@@ -5586,10 +5594,22 @@ snd_device_t platform_get_output_snd_device(void *platform, struct stream_out *o 
                !voice_extn_compress_voip_is_active(adev)) {

                switch (adev->voice.tty_mode) {

                case TTY_MODE_FULL:

                    if (audio_extn_is_concurrent_capture_enabled() &&

                         (devices & AUDIO_DEVICE_OUT_WIRED_HEADSET)) {

                        //Separate backend is added for headset-mic as part of concurrent capture

                        snd_device = SND_DEVICE_OUT_VOICE_TTY_FULL_HEADSET;

                    } else {

                        snd_device = SND_DEVICE_OUT_VOICE_TTY_FULL_HEADPHONES;

                    }

                    break;

                case TTY_MODE_VCO:

                    if (audio_extn_is_concurrent_capture_enabled() &&

                         (devices & AUDIO_DEVICE_OUT_WIRED_HEADSET)) {

                        //Separate backend is added for headset-mic as part of concurrent capture

                        snd_device = SND_DEVICE_OUT_VOICE_TTY_VCO_HEADSET;

                    } else {

                        snd_device = SND_DEVICE_OUT_VOICE_TTY_VCO_HEADPHONES;

                    }

                    break;

                case TTY_MODE_HCO:

                    snd_device = SND_DEVICE_OUT_VOICE_TTY_HCO_HANDSET;

hal/msm8974/platform.h

+2 −0
Original line number Diff line number Diff line
@@ -129,7 +129,9 @@ enum { 
    SND_DEVICE_OUT_SPEAKER_WSA_AND_BT_SCO_WB,

    SND_DEVICE_OUT_SPEAKER_WSA_AND_BT_SCO_SWB,

    SND_DEVICE_OUT_VOICE_TTY_FULL_HEADPHONES,

    SND_DEVICE_OUT_VOICE_TTY_FULL_HEADSET,

    SND_DEVICE_OUT_VOICE_TTY_VCO_HEADPHONES,

    SND_DEVICE_OUT_VOICE_TTY_VCO_HEADSET,

    SND_DEVICE_OUT_VOICE_TTY_HCO_HANDSET,

    SND_DEVICE_OUT_VOICE_TTY_FULL_USB,

    SND_DEVICE_OUT_VOICE_TTY_VCO_USB,