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

Commit 9536e67b authored by yixuanjiang's avatar yixuanjiang Committed by HW Lee
Browse files

hal: add support to separate headset and headphones mixer backend 



add backend apply support for voice headphone path

Test: local build
Bug: 112827678
Change-Id: I819ad66a657b2c2e6b86025bf506b37377c45cf5
Signed-off-by: default avataryixuanjiang <yixuanjiang@google.com>
parent 07f96d11

hal/msm8916/platform.c

+5 −0
Original line number Diff line number Diff line
@@ -220,6 +220,7 @@ static const char * const device_table[SND_DEVICE_MAX] = { 
    [SND_DEVICE_OUT_VOICE_SPEAKER] = "voice-speaker",

    [SND_DEVICE_OUT_VOICE_SPEAKER_HFP] = "voice-speaker-hfp",

    [SND_DEVICE_OUT_VOICE_HEADPHONES] = "voice-headphones",

    [SND_DEVICE_OUT_VOICE_HEADSET] = "voice-headphones",

    [SND_DEVICE_OUT_VOICE_LINE] = "voice-line",

    [SND_DEVICE_OUT_HDMI] = "hdmi",

    [SND_DEVICE_OUT_SPEAKER_AND_HDMI] = "speaker-and-hdmi",
@@ -316,6 +317,7 @@ static int acdb_device_table[SND_DEVICE_MAX] = { 
    [SND_DEVICE_OUT_VOICE_LINE] = 10,

    [SND_DEVICE_OUT_VOICE_SPEAKER] = 14,

    [SND_DEVICE_OUT_VOICE_HEADPHONES] = 10,

    [SND_DEVICE_OUT_VOICE_HEADSET] = 10,

    [SND_DEVICE_OUT_HDMI] = 18,

    [SND_DEVICE_OUT_SPEAKER_AND_HDMI] = 14,

    [SND_DEVICE_OUT_BT_SCO] = 22,
@@ -417,6 +419,7 @@ static struct name_to_index snd_device_name_index[SND_DEVICE_MAX] = { 
    {TO_NAME_INDEX(SND_DEVICE_OUT_VOICE_SPEAKER)},

    {TO_NAME_INDEX(SND_DEVICE_OUT_VOICE_SPEAKER_HFP)},

    {TO_NAME_INDEX(SND_DEVICE_OUT_VOICE_HEADPHONES)},

    {TO_NAME_INDEX(SND_DEVICE_OUT_VOICE_HEADSET)},

    {TO_NAME_INDEX(SND_DEVICE_OUT_VOICE_LINE)},

    {TO_NAME_INDEX(SND_DEVICE_OUT_HDMI)},

    {TO_NAME_INDEX(SND_DEVICE_OUT_SPEAKER_AND_HDMI)},
@@ -1845,6 +1848,8 @@ snd_device_t platform_get_output_snd_device(void *platform, audio_devices_t devi 
                }

            } else if (devices & AUDIO_DEVICE_OUT_LINE) {

                snd_device = SND_DEVICE_OUT_VOICE_LINE;

            } else if (devices & AUDIO_DEVICE_OUT_WIRED_HEADSET) {

                snd_device = SND_DEVICE_OUT_VOICE_HEADSET;

            } else {

                snd_device = SND_DEVICE_OUT_VOICE_HEADPHONES;

            }

hal/msm8916/platform.h

+1 −0
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ enum { 
    SND_DEVICE_OUT_VOICE_SPEAKER,

    SND_DEVICE_OUT_VOICE_SPEAKER_HFP,

    SND_DEVICE_OUT_VOICE_HEADPHONES,

    SND_DEVICE_OUT_VOICE_HEADSET,

    SND_DEVICE_OUT_VOICE_LINE,

    SND_DEVICE_OUT_HDMI,

    SND_DEVICE_OUT_SPEAKER_AND_HDMI,

hal/msm8960/platform.c

+4 −0
Original line number Diff line number Diff line
@@ -123,6 +123,7 @@ static const char * const device_table[SND_DEVICE_MAX] = { 
    [SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES] = "speaker-and-headphones",

    [SND_DEVICE_OUT_VOICE_SPEAKER] = "voice-speaker",

    [SND_DEVICE_OUT_VOICE_HEADPHONES] = "voice-headphones",

    [SND_DEVICE_OUT_VOICE_HEADSET] = "voice-headphones",

    [SND_DEVICE_OUT_HDMI] = "hdmi",

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

    [SND_DEVICE_OUT_BT_SCO] = "bt-sco-headset",
@@ -178,6 +179,7 @@ static const int acdb_device_table[SND_DEVICE_MAX] = { 
    [SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES] = 10,

    [SND_DEVICE_OUT_VOICE_SPEAKER] = 14,

    [SND_DEVICE_OUT_VOICE_HEADPHONES] = 10,

    [SND_DEVICE_OUT_VOICE_HEADSET] = 10,

    [SND_DEVICE_OUT_HDMI] = 18,

    [SND_DEVICE_OUT_SPEAKER_AND_HDMI] = 14,

    [SND_DEVICE_OUT_BT_SCO] = 22,
@@ -648,6 +650,8 @@ snd_device_t platform_get_output_snd_device(void *platform, audio_devices_t devi 
                snd_device = SND_DEVICE_OUT_VOICE_TTY_VCO_HEADPHONES;

            else if (adev->voice.tty_mode == TTY_MODE_HCO)

                snd_device = SND_DEVICE_OUT_VOICE_TTY_HCO_HANDSET;

            else if (devices & AUDIO_DEVICE_OUT_WIRED_HEADSET)

                snd_device = SND_DEVICE_OUT_VOICE_HEADSET;

            else

                snd_device = SND_DEVICE_OUT_VOICE_HEADPHONES;

        } else if (devices & AUDIO_DEVICE_OUT_ALL_SCO) {

hal/msm8960/platform.h

+1 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ enum { 
    SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES,

    SND_DEVICE_OUT_VOICE_SPEAKER,

    SND_DEVICE_OUT_VOICE_HEADPHONES,

    SND_DEVICE_OUT_VOICE_HEADSET,

    SND_DEVICE_OUT_HDMI,

    SND_DEVICE_OUT_SPEAKER_AND_HDMI,

    SND_DEVICE_OUT_BT_SCO,

hal/msm8974/platform.c

+6 −0
Original line number Diff line number Diff line
@@ -256,6 +256,7 @@ static const char * const device_table[SND_DEVICE_MAX] = { 
    [SND_DEVICE_OUT_VOICE_HAC_HANDSET] = "voice-hac-handset",

    [SND_DEVICE_OUT_VOICE_SPEAKER] = "voice-speaker",

    [SND_DEVICE_OUT_VOICE_HEADPHONES] = "voice-headphones",

    [SND_DEVICE_OUT_VOICE_HEADSET] = "voice-headphones",

    [SND_DEVICE_OUT_VOICE_LINE] = "voice-line",

    [SND_DEVICE_OUT_HDMI] = "hdmi",

    [SND_DEVICE_OUT_SPEAKER_AND_HDMI] = "speaker-and-hdmi",
@@ -377,6 +378,7 @@ static int acdb_device_table[SND_DEVICE_MAX] = { 
    [SND_DEVICE_OUT_VOICE_SPEAKER] = ACDB_ID_VOICE_SPEAKER,

    [SND_DEVICE_OUT_VOICE_HAC_HANDSET] = 53,

    [SND_DEVICE_OUT_VOICE_HEADPHONES] = 10,

    [SND_DEVICE_OUT_VOICE_HEADSET] = 10,

    [SND_DEVICE_OUT_VOICE_LINE] = 77,

    [SND_DEVICE_OUT_HDMI] = 18,

    [SND_DEVICE_OUT_SPEAKER_AND_HDMI] = 15,
@@ -504,6 +506,7 @@ static const struct name_to_index snd_device_name_index[SND_DEVICE_MAX] = { 
    {TO_NAME_INDEX(SND_DEVICE_OUT_VOICE_SPEAKER)},

    {TO_NAME_INDEX(SND_DEVICE_OUT_VOICE_SPEAKER_HFP)},

    {TO_NAME_INDEX(SND_DEVICE_OUT_VOICE_HEADPHONES)},

    {TO_NAME_INDEX(SND_DEVICE_OUT_VOICE_HEADSET)},

    {TO_NAME_INDEX(SND_DEVICE_OUT_VOICE_LINE)},

    {TO_NAME_INDEX(SND_DEVICE_OUT_HDMI)},

    {TO_NAME_INDEX(SND_DEVICE_OUT_SPEAKER_AND_HDMI)},
@@ -1242,6 +1245,7 @@ static void set_platform_defaults(struct platform_data * my_data) 
    hw_interface_table[SND_DEVICE_OUT_VOICE_HAC_HANDSET] = strdup("SLIMBUS_0_RX");

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

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

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

    hw_interface_table[SND_DEVICE_OUT_VOICE_MUSIC_TX] = strdup("VOICE_PLAYBACK_TX");

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

    hw_interface_table[SND_DEVICE_OUT_HDMI] = strdup("HDMI_RX");
@@ -2717,6 +2721,8 @@ snd_device_t platform_get_output_snd_device(void *platform, audio_devices_t devi 
            else {

                if (devices & AUDIO_DEVICE_OUT_LINE)

                    snd_device = SND_DEVICE_OUT_VOICE_LINE;

                else if (devices & AUDIO_DEVICE_OUT_WIRED_HEADSET)

                    snd_device = SND_DEVICE_OUT_VOICE_HEADSET;

                else

                    snd_device = SND_DEVICE_OUT_VOICE_HEADPHONES;

                }