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

Commit 66c4ecfa authored by juyuchen's avatar juyuchen Committed by David Lin
Browse files

audio: fix static noise on speaker path when enable incall-music 



Bug: 111107345
Test: manual audio test

Change-Id: I8da727326b0d5dd1d89623dae55e33f2b39830df
Signed-off-by: default avatarjuyuchen <juyuchen@google.com>
Signed-off-by: default avatarDavid Lin <dtwlin@google.com>
parent 7964549e

hal/audio_hw.c

+4 −0
Original line number Diff line number Diff line
@@ -1373,6 +1373,10 @@ int select_devices(struct audio_device *adev, 
            out_snd_device = SND_DEVICE_OUT_SPEAKER;

    }



    if (usecase->id == USECASE_INCALL_MUSIC_UPLINK) {

        out_snd_device = SND_DEVICE_OUT_VOICE_MUSIC_TX;

    }



    if (out_snd_device != SND_DEVICE_NONE &&

            out_snd_device != adev->last_logged_snd_device[uc_id][0]) {

        ALOGD("%s: changing use case %s output device from(%d: %s, acdb %d) to (%d: %s, acdb %d)",

hal/msm8916/platform.c

+2 −0
Original line number Diff line number Diff line
@@ -232,6 +232,7 @@ static const char * const device_table[SND_DEVICE_MAX] = { 
    [SND_DEVICE_OUT_VOICE_TTY_VCO_HEADPHONES] = "voice-tty-vco-headphones",

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

    [SND_DEVICE_OUT_VOICE_TX] = "voice-tx",

    [SND_DEVICE_OUT_VOICE_MUSIC_TX] = "voice-music-tx",

    [SND_DEVICE_OUT_AFE_PROXY] = "afe-proxy",

    [SND_DEVICE_OUT_USB_HEADSET] = "usb-headphones",

    [SND_DEVICE_OUT_USB_HEADPHONES] = "usb-headphones",
@@ -326,6 +327,7 @@ static int acdb_device_table[SND_DEVICE_MAX] = { 
    [SND_DEVICE_OUT_VOICE_TTY_VCO_HEADPHONES] = 17,

    [SND_DEVICE_OUT_VOICE_TTY_HCO_HANDSET] = 37,

    [SND_DEVICE_OUT_VOICE_TX] = 45,

    [SND_DEVICE_OUT_VOICE_MUSIC_TX] = 3,

    [SND_DEVICE_OUT_AFE_PROXY] = 0,

    [SND_DEVICE_OUT_USB_HEADSET] = 45,

    [SND_DEVICE_OUT_VOICE_USB_HEADSET] = 45,

hal/msm8916/platform.h

+1 −0
Original line number Diff line number Diff line
@@ -78,6 +78,7 @@ enum { 
    SND_DEVICE_OUT_VOICE_TTY_VCO_HEADPHONES,

    SND_DEVICE_OUT_VOICE_TTY_HCO_HANDSET,

    SND_DEVICE_OUT_VOICE_TX,

    SND_DEVICE_OUT_VOICE_MUSIC_TX,

    SND_DEVICE_OUT_AFE_PROXY,

    SND_DEVICE_OUT_USB_HEADSET,

    SND_DEVICE_OUT_USB_HEADPHONES,

hal/msm8974/platform.c

+3 −0
Original line number Diff line number Diff line
@@ -271,6 +271,7 @@ static const char * const device_table[SND_DEVICE_MAX] = { 
    [SND_DEVICE_OUT_VOICE_TTY_FULL_USB] = "voice-tty-full-usb",

    [SND_DEVICE_OUT_VOICE_TTY_VCO_USB] = "voice-tty-vco-usb",

    [SND_DEVICE_OUT_VOICE_TX] = "voice-tx",

    [SND_DEVICE_OUT_VOICE_MUSIC_TX] = "voice-music-tx",

    [SND_DEVICE_OUT_USB_HEADSET] = "usb-headset",

    [SND_DEVICE_OUT_VOICE_USB_HEADSET] = "usb-headset",

    [SND_DEVICE_OUT_USB_HEADPHONES] = "usb-headphones",
@@ -393,6 +394,7 @@ static int acdb_device_table[SND_DEVICE_MAX] = { 
    [SND_DEVICE_OUT_VOICE_TTY_FULL_USB] = 17,

    [SND_DEVICE_OUT_VOICE_TTY_VCO_USB] = 17,

    [SND_DEVICE_OUT_VOICE_TX] = 45,

    [SND_DEVICE_OUT_VOICE_MUSIC_TX] = 3,

    [SND_DEVICE_OUT_USB_HEADSET] = 45,

    [SND_DEVICE_OUT_VOICE_USB_HEADSET] = 45,

    [SND_DEVICE_OUT_USB_HEADPHONES] = 45,
@@ -1240,6 +1242,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_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");

    hw_interface_table[SND_DEVICE_OUT_SPEAKER_AND_HDMI] = strdup("SLIMBUS_0_RX-and-HDMI_RX");

hal/msm8974/platform.h

+1 −0
Original line number Diff line number Diff line
@@ -89,6 +89,7 @@ enum { 
    SND_DEVICE_OUT_VOICE_TTY_VCO_USB,

    SND_DEVICE_OUT_VOICE_HAC_HANDSET,

    SND_DEVICE_OUT_VOICE_TX,

    SND_DEVICE_OUT_VOICE_MUSIC_TX,

    SND_DEVICE_OUT_SPEAKER_PROTECTED,

    SND_DEVICE_OUT_VOICE_SPEAKER_PROTECTED,

    SND_DEVICE_OUT_VOICE_SPEAKER_HFP,