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

Commit 7cc5363d authored by Ravi Kumar Alamanda's avatar Ravi Kumar Alamanda Committed by Dan Pasanen
Browse files

hal: Add support for LINE out device 

Add support for AUDIO_DEVICE_OUT_LINE device. Treat it same
as Wired Headphone device w.r.t. routing and acdb device.
If the acdb or backend is different it can be updated using
audio_platform_info.xml.

Change-Id: I203f38b1629a837478da1ae304a67bb016b06fa7
CRs-Fixed: 929500
parent b4e35e66

hal/msm8974/platform.c

+24 −4
Original line number Diff line number Diff line
@@ -282,12 +282,15 @@ static char * device_table[SND_DEVICE_MAX] = { 
    [SND_DEVICE_OUT_SPEAKER_EXTERNAL_2] = "speaker-ext-2",

    [SND_DEVICE_OUT_SPEAKER_REVERSE] = "speaker-reverse",

    [SND_DEVICE_OUT_HEADPHONES] = "headphones",

    [SND_DEVICE_OUT_LINE] = "line",

    [SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES] = "speaker-and-headphones",

    [SND_DEVICE_OUT_SPEAKER_AND_LINE] = "speaker-and-line",

    [SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES_EXTERNAL_1] = "speaker-and-headphones-ext-1",

    [SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES_EXTERNAL_2] = "speaker-and-headphones-ext-2",

    [SND_DEVICE_OUT_VOICE_HANDSET] = "voice-handset",

    [SND_DEVICE_OUT_VOICE_SPEAKER] = "voice-speaker",

    [SND_DEVICE_OUT_VOICE_HEADPHONES] = "voice-headphones",

    [SND_DEVICE_OUT_VOICE_LINE] = "voice-line",

    [SND_DEVICE_OUT_HDMI] = "hdmi",

    [SND_DEVICE_OUT_SPEAKER_AND_HDMI] = "speaker-and-hdmi",

    [SND_DEVICE_OUT_BT_SCO] = "bt-sco-headset",
@@ -380,13 +383,16 @@ static int acdb_device_table[SND_DEVICE_MAX] = { 
    [SND_DEVICE_OUT_SPEAKER_EXTERNAL_1] = 14,

    [SND_DEVICE_OUT_SPEAKER_EXTERNAL_2] = 14,

    [SND_DEVICE_OUT_SPEAKER_REVERSE] = 14,

    [SND_DEVICE_OUT_LINE] = 10,

    [SND_DEVICE_OUT_HEADPHONES] = 10,

    [SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES] = 10,

    [SND_DEVICE_OUT_SPEAKER_AND_LINE] = 10,

    [SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES_EXTERNAL_1] = 10,

    [SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES_EXTERNAL_2] = 10,

    [SND_DEVICE_OUT_VOICE_HANDSET] = 7,

    [SND_DEVICE_OUT_VOICE_SPEAKER] = 14,

    [SND_DEVICE_OUT_VOICE_HEADPHONES] = 10,

    [SND_DEVICE_OUT_VOICE_LINE] = 10,

    [SND_DEVICE_OUT_HDMI] = 18,

    [SND_DEVICE_OUT_SPEAKER_AND_HDMI] = 14,

    [SND_DEVICE_OUT_BT_SCO] = 22,
@@ -482,12 +488,15 @@ static struct name_to_index snd_device_name_index[SND_DEVICE_MAX] = { 
    {TO_NAME_INDEX(SND_DEVICE_OUT_SPEAKER_EXTERNAL_2)},

    {TO_NAME_INDEX(SND_DEVICE_OUT_SPEAKER_REVERSE)},

    {TO_NAME_INDEX(SND_DEVICE_OUT_HEADPHONES)},

    {TO_NAME_INDEX(SND_DEVICE_OUT_LINE)},

    {TO_NAME_INDEX(SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES)},

    {TO_NAME_INDEX(SND_DEVICE_OUT_SPEAKER_AND_LINE)},

    {TO_NAME_INDEX(SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES_EXTERNAL_1)},

    {TO_NAME_INDEX(SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES_EXTERNAL_2)},

    {TO_NAME_INDEX(SND_DEVICE_OUT_VOICE_HANDSET)},

    {TO_NAME_INDEX(SND_DEVICE_OUT_VOICE_SPEAKER)},

    {TO_NAME_INDEX(SND_DEVICE_OUT_VOICE_HEADPHONES)},

    {TO_NAME_INDEX(SND_DEVICE_OUT_VOICE_LINE)},

    {TO_NAME_INDEX(SND_DEVICE_OUT_HDMI)},

    {TO_NAME_INDEX(SND_DEVICE_OUT_SPEAKER_AND_HDMI)},

    {TO_NAME_INDEX(SND_DEVICE_OUT_BT_SCO)},
@@ -1807,6 +1816,9 @@ snd_device_t platform_get_output_snd_device(void *platform, audio_devices_t devi 
                snd_device = SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES_EXTERNAL_2;

            else

                snd_device = SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES;

        } else if (devices == (AUDIO_DEVICE_OUT_LINE |

                               AUDIO_DEVICE_OUT_SPEAKER)) {

            snd_device = SND_DEVICE_OUT_SPEAKER_AND_LINE;

        } else if (devices == (AUDIO_DEVICE_OUT_AUX_DIGITAL |

                               AUDIO_DEVICE_OUT_SPEAKER)) {

            snd_device = SND_DEVICE_OUT_SPEAKER_AND_HDMI;
@@ -1832,7 +1844,8 @@ snd_device_t platform_get_output_snd_device(void *platform, audio_devices_t devi 
    if (voice_is_in_call(adev) ||

        voice_extn_compress_voip_is_active(adev)) {

        if (devices & AUDIO_DEVICE_OUT_WIRED_HEADPHONE ||

            devices & AUDIO_DEVICE_OUT_WIRED_HEADSET) {

            devices & AUDIO_DEVICE_OUT_WIRED_HEADSET ||

            devices & AUDIO_DEVICE_OUT_LINE) {

            if ((adev->voice.tty_mode != TTY_MODE_OFF) &&

                !voice_extn_compress_voip_is_active(adev)) {

                switch (adev->voice.tty_mode) {
@@ -1849,6 +1862,8 @@ snd_device_t platform_get_output_snd_device(void *platform, audio_devices_t devi 
                    ALOGE("%s: Invalid TTY mode (%#x)",

                          __func__, adev->voice.tty_mode);

                }

            } else if (devices & AUDIO_DEVICE_OUT_LINE) {

                snd_device = SND_DEVICE_OUT_VOICE_LINE;

            } else if (audio_extn_get_anc_enabled()) {

                if (audio_extn_should_use_fb_anc())

                    snd_device = SND_DEVICE_OUT_VOICE_ANC_FB_HEADSET;
@@ -1892,6 +1907,8 @@ snd_device_t platform_get_output_snd_device(void *platform, audio_devices_t devi 
                snd_device = SND_DEVICE_OUT_ANC_HEADSET;

        } else

            snd_device = SND_DEVICE_OUT_HEADPHONES;

    } else if (devices & AUDIO_DEVICE_OUT_LINE) {

        snd_device = SND_DEVICE_OUT_LINE;

    } else if (devices & AUDIO_DEVICE_OUT_SPEAKER) {

        if (my_data->external_spk_1)

            snd_device = SND_DEVICE_OUT_SPEAKER_EXTERNAL_1;
@@ -1968,7 +1985,8 @@ snd_device_t platform_get_input_snd_device(void *platform, audio_devices_t out_d 
        if ((adev->voice.tty_mode != TTY_MODE_OFF) &&

            !voice_extn_compress_voip_is_active(adev)) {

            if (out_device & AUDIO_DEVICE_OUT_WIRED_HEADPHONE ||

                out_device & AUDIO_DEVICE_OUT_WIRED_HEADSET) {

                out_device & AUDIO_DEVICE_OUT_WIRED_HEADSET ||

                out_device & AUDIO_DEVICE_OUT_LINE) {

                switch (adev->voice.tty_mode) {

                case TTY_MODE_FULL:

                    snd_device = SND_DEVICE_IN_VOICE_TTY_FULL_HEADSET_MIC;
@@ -1986,7 +2004,8 @@ snd_device_t platform_get_input_snd_device(void *platform, audio_devices_t out_d 
            }

        }

        if (out_device & AUDIO_DEVICE_OUT_EARPIECE ||

            out_device & AUDIO_DEVICE_OUT_WIRED_HEADPHONE) {

            out_device & AUDIO_DEVICE_OUT_WIRED_HEADPHONE ||

                out_device & AUDIO_DEVICE_OUT_LINE) {

            if (out_device & AUDIO_DEVICE_OUT_EARPIECE &&

                audio_extn_should_use_handset_anc(channel_count)) {

                snd_device = SND_DEVICE_IN_AANC_HANDSET_MIC;
@@ -2223,7 +2242,8 @@ snd_device_t platform_get_input_snd_device(void *platform, audio_devices_t out_d 
                snd_device = SND_DEVICE_IN_SPEAKER_STEREO_DMIC;

            else

                snd_device = SND_DEVICE_IN_SPEAKER_MIC;

        } else if (out_device & AUDIO_DEVICE_OUT_WIRED_HEADPHONE) {

        } else if (out_device & AUDIO_DEVICE_OUT_WIRED_HEADPHONE ||

                        out_device & AUDIO_DEVICE_OUT_LINE) {

            snd_device = SND_DEVICE_IN_HANDSET_MIC;

        } else if (out_device & AUDIO_DEVICE_OUT_BLUETOOTH_SCO_HEADSET) {

            if (adev->bt_wb_speech_enabled) {

hal/msm8974/platform.h

+5 −1
Original line number Diff line number Diff line
@@ -39,7 +39,8 @@ enum { 
 */

#define AUDIO_DEVICE_OUT_ALL_CODEC_BACKEND \

    (AUDIO_DEVICE_OUT_EARPIECE | AUDIO_DEVICE_OUT_SPEAKER | \

     AUDIO_DEVICE_OUT_WIRED_HEADSET | AUDIO_DEVICE_OUT_WIRED_HEADPHONE)

     AUDIO_DEVICE_OUT_WIRED_HEADSET | AUDIO_DEVICE_OUT_WIRED_HEADPHONE | \

     AUDIO_DEVICE_OUT_LINE)



/*

 * Below are the input devices for which back end is same, SLIMBUS_0_TX.
@@ -65,13 +66,16 @@ enum { 
    SND_DEVICE_OUT_SPEAKER_EXTERNAL_1,

    SND_DEVICE_OUT_SPEAKER_EXTERNAL_2,

    SND_DEVICE_OUT_SPEAKER_REVERSE,

    SND_DEVICE_OUT_LINE,

    SND_DEVICE_OUT_HEADPHONES,

    SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES,

    SND_DEVICE_OUT_SPEAKER_AND_LINE,

    SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES_EXTERNAL_1,

    SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES_EXTERNAL_2,

    SND_DEVICE_OUT_VOICE_HANDSET,

    SND_DEVICE_OUT_VOICE_SPEAKER,

    SND_DEVICE_OUT_VOICE_HEADPHONES,

    SND_DEVICE_OUT_VOICE_LINE,

    SND_DEVICE_OUT_HDMI,

    SND_DEVICE_OUT_SPEAKER_AND_HDMI,

    SND_DEVICE_OUT_BT_SCO,