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

Commit d194b431 authored by juyuchen's avatar juyuchen
Browse files

audio: Enhance latency and tuning in voice call with hearing aid 



1. Reduce microphone latency in voice call
2. Use specific acdb tuning

Bug: 120869034
Test: manual audio test

Change-Id: Ifabd1ce2cce5bb4285cc33cd792070c0c3b20f1a
Signed-off-by: default avatarjuyuchen <juyuchen@google.com>
parent 8e9b92d2

hal/audio_hw.c

+15 −4
Original line number Diff line number Diff line
@@ -1510,6 +1510,7 @@ int select_devices(struct audio_device *adev, 
                                               get_voice_usecase_id_from_list(adev));

            if ((vc_usecase != NULL) &&

                ((vc_usecase->devices & AUDIO_DEVICE_OUT_ALL_CODEC_BACKEND) ||

                 (vc_usecase->devices == AUDIO_DEVICE_OUT_HEARING_AID) ||

                 (usecase->devices == AUDIO_DEVICE_IN_VOICE_CALL))) {

                in_snd_device = vc_usecase->in_snd_device;

                out_snd_device = vc_usecase->out_snd_device;
@@ -1556,8 +1557,13 @@ int select_devices(struct audio_device *adev, 
                        out_device = AUDIO_DEVICE_OUT_TELEPHONY_TX;

                    } else if (voip_usecase) {

                        out_device = voip_usecase->stream.out->devices;

                    } else if (adev->primary_output) {

                    } else if (adev->primary_output &&

                                  !adev->primary_output->standby) {

                        out_device = adev->primary_output->devices;

                    } else {

                        /* forcing speaker o/p device to get matching i/p pair

                           in case o/p is not routed from same primary HAL */

                        out_device = AUDIO_DEVICE_OUT_SPEAKER;

                    }

                }

                in_snd_device = platform_get_input_snd_device(adev->platform,
@@ -2213,14 +2219,19 @@ static int stop_output_stream(struct stream_out *out) 
        }

        ret = 0;

    }



    /* 1) media + voip output routing to handset must route media back to

          speaker when voip stops.

       2) trigger voip input to reroute when voip output changes to

          hearing aid. */

    if (has_voip_usecase ||

            out->devices & AUDIO_DEVICE_OUT_SPEAKER_SAFE) {

        struct listnode *node;

        struct audio_usecase *usecase;

        list_for_each(node, &adev->usecase_list) {

            usecase = node_to_item(node, struct audio_usecase, list);

            if (usecase->type == PCM_CAPTURE || usecase == uc_info)

            if ((usecase->type == PCM_CAPTURE &&

                     usecase->id != USECASE_AUDIO_RECORD_VOIP)

                || usecase == uc_info)

                continue;



            ALOGD("%s: select_devices at usecase(%d: %s) after removing the usecase(%d: %s)",

hal/msm8974/platform.c

+21 −1
Original line number Diff line number Diff line
@@ -293,6 +293,7 @@ static const char * const device_table[SND_DEVICE_MAX] = { 
    [SND_DEVICE_OUT_SPEAKER_SAFE_AND_BT_SCO] = "speaker-safe-and-bt-sco",

    [SND_DEVICE_OUT_SPEAKER_AND_BT_SCO_WB] = "speaker-and-bt-sco-wb",

    [SND_DEVICE_OUT_SPEAKER_SAFE_AND_BT_SCO_WB] = "speaker-safe-and-bt-sco-wb",

    [SND_DEVICE_OUT_VOICE_HEARING_AID] = "hearing-aid",



    /* Capture sound devices */

    [SND_DEVICE_IN_HANDSET_MIC] = "handset-mic",
@@ -372,6 +373,7 @@ static const char * const device_table[SND_DEVICE_MAX] = { 
    [SND_DEVICE_IN_CAMCORDER_SELFIE_PORTRAIT] = "camcorder-mic",

    [SND_DEVICE_IN_SPEAKER_QMIC_NS] = "quad-mic",

    [SND_DEVICE_IN_SPEAKER_QMIC_AEC_NS] = "quad-mic",

    [SND_DEVICE_IN_VOICE_HEARING_AID] = "hearing-aid-mic",

};



static struct audio_effect_config \
@@ -444,6 +446,7 @@ static int acdb_device_table[SND_DEVICE_MAX] = { 
    [SND_DEVICE_OUT_SPEAKER_PROTECTED] = 124,

    [SND_DEVICE_OUT_VOICE_SPEAKER_PROTECTED] = 101,

    [SND_DEVICE_OUT_VOICE_SPEAKER_HFP] = ACDB_ID_VOICE_SPEAKER,

    [SND_DEVICE_OUT_VOICE_HEARING_AID] = 45,



    [SND_DEVICE_IN_HANDSET_MIC] = 4,

    [SND_DEVICE_IN_HANDSET_MIC_AEC] = 106,
@@ -521,6 +524,7 @@ static int acdb_device_table[SND_DEVICE_MAX] = { 
    [SND_DEVICE_IN_CAMCORDER_SELFIE_PORTRAIT] = 61,

    [SND_DEVICE_IN_SPEAKER_QMIC_NS] = 129,

    [SND_DEVICE_IN_SPEAKER_QMIC_AEC_NS] = 129,

    [SND_DEVICE_IN_VOICE_HEARING_AID] = 44,

};



// Platform specific backend bit width table
@@ -579,6 +583,7 @@ static const struct name_to_index snd_device_name_index[SND_DEVICE_MAX] = { 
    {TO_NAME_INDEX(SND_DEVICE_OUT_SPEAKER_PROTECTED)},

    {TO_NAME_INDEX(SND_DEVICE_OUT_VOICE_SPEAKER_PROTECTED)},

    {TO_NAME_INDEX(SND_DEVICE_OUT_USB_HEADSET_SPEC)},

    {TO_NAME_INDEX(SND_DEVICE_OUT_VOICE_HEARING_AID)},



    /* in */

    {TO_NAME_INDEX(SND_DEVICE_IN_HANDSET_MIC)},
@@ -655,6 +660,8 @@ static const struct name_to_index snd_device_name_index[SND_DEVICE_MAX] = { 
    {TO_NAME_INDEX(SND_DEVICE_IN_CAMCORDER_SELFIE_LANDSCAPE)},

    {TO_NAME_INDEX(SND_DEVICE_IN_CAMCORDER_SELFIE_INVERT_LANDSCAPE)},

    {TO_NAME_INDEX(SND_DEVICE_IN_CAMCORDER_SELFIE_PORTRAIT)},

    {TO_NAME_INDEX(SND_DEVICE_IN_VOICE_HEARING_AID)},



    /* For legacy xml file parsing */

    {TO_NAME_INDEX(SND_DEVICE_IN_CAMCORDER_MIC)},

    {TO_NAME_INDEX(SND_DEVICE_IN_SPEAKER_QMIC_NS)},
@@ -1285,6 +1292,7 @@ static void set_platform_defaults(struct platform_data * my_data) 
    backend_tag_table[SND_DEVICE_OUT_SPEAKER_AND_BT_A2DP] = strdup("speaker-and-bt-a2dp");

    backend_tag_table[SND_DEVICE_OUT_SPEAKER_SAFE_AND_BT_A2DP] = strdup("speaker-safe-and-bt-a2dp");

    backend_tag_table[SND_DEVICE_OUT_USB_HEADSET_SPEC] = strdup("usb-headset");

    backend_tag_table[SND_DEVICE_OUT_VOICE_HEARING_AID] = strdup("hearing-aid");



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

    hw_interface_table[SND_DEVICE_OUT_SPEAKER] = strdup("SLIMBUS_0_RX");
@@ -1333,6 +1341,11 @@ static void set_platform_defaults(struct platform_data * my_data) 
    hw_interface_table[SND_DEVICE_OUT_SPEAKER_AND_BT_SCO_WB] = strdup("SLIMBUS_0_RX-and-SEC_AUX_PCM_RX");

    hw_interface_table[SND_DEVICE_OUT_SPEAKER_SAFE_AND_BT_SCO] = strdup("QUAT_TDM_RX_0-and-SLIMBUS_7_RX"),

    hw_interface_table[SND_DEVICE_OUT_SPEAKER_SAFE_AND_BT_SCO_WB] = strdup("QUAT_TDM_RX_0-and-SLIMBUS_7_RX"),

    /* So far, primary hal doesn't support hearing aid device.

       Need snd_device to route voice call and use specific acdb tuning.

       Also, BT_RX is a virtual port to indicate bluetooth hearing aid. */

    hw_interface_table[SND_DEVICE_OUT_VOICE_HEARING_AID] = strdup("BT_RX"),



    hw_interface_table[SND_DEVICE_IN_USB_HEADSET_MIC] = strdup("USB_AUDIO_TX");

    hw_interface_table[SND_DEVICE_IN_VOICE_USB_HEADSET_MIC] = strdup("USB_AUDIO_TX");

    hw_interface_table[SND_DEVICE_IN_USB_HEADSET_MIC_AEC] =  strdup("USB_AUDIO_TX");
@@ -1400,6 +1413,8 @@ static void set_platform_defaults(struct platform_data * my_data) 
    hw_interface_table[SND_DEVICE_IN_CAMCORDER_SELFIE_LANDSCAPE] = strdup("SLIMBUS_0_TX");

    hw_interface_table[SND_DEVICE_IN_CAMCORDER_SELFIE_INVERT_LANDSCAPE] = strdup("SLIMBUS_0_TX");

    hw_interface_table[SND_DEVICE_IN_CAMCORDER_SELFIE_PORTRAIT] = strdup("SLIMBUS_0_TX");

    hw_interface_table[SND_DEVICE_IN_VOICE_HEARING_AID] = strdup("SLIMBUS_0_TX");



    my_data->max_mic_count = PLATFORM_DEFAULT_MIC_COUNT;

}
@@ -2893,8 +2908,11 @@ snd_device_t platform_get_output_snd_device(void *platform, audio_devices_t devi 
                snd_device = SND_DEVICE_OUT_VOICE_HANDSET_TMUS;

            else

                snd_device = SND_DEVICE_OUT_VOICE_HANDSET;

        } else if (devices & AUDIO_DEVICE_OUT_TELEPHONY_TX)

        } else if (devices & AUDIO_DEVICE_OUT_TELEPHONY_TX) {

            snd_device = SND_DEVICE_OUT_VOICE_TX;

        } else if (devices & AUDIO_DEVICE_OUT_HEARING_AID) {

            snd_device = SND_DEVICE_OUT_VOICE_HEARING_AID;

        }



        if (snd_device != SND_DEVICE_NONE) {

            goto exit;
@@ -3186,6 +3204,8 @@ snd_device_t platform_get_input_snd_device(void *platform, 
                    snd_device = SND_DEVICE_IN_VOICE_SPEAKER_MIC;

                }

            }

        } else if (out_device & AUDIO_DEVICE_OUT_HEARING_AID) {

            snd_device = SND_DEVICE_IN_VOICE_HEARING_AID;

        }

    } else if (source == AUDIO_SOURCE_CAMCORDER) {

        if (in_device & AUDIO_DEVICE_IN_BUILTIN_MIC ||

hal/msm8974/platform.h

+2 −0
Original line number Diff line number Diff line
@@ -106,6 +106,7 @@ enum { 
    SND_DEVICE_OUT_VOICE_USB_HEADSET,

    /* Specific snd_devices */

    SND_DEVICE_OUT_USB_HEADSET_SPEC,

    SND_DEVICE_OUT_VOICE_HEARING_AID,

    SND_DEVICE_OUT_END,



    /*
@@ -192,6 +193,7 @@ enum { 
    SND_DEVICE_IN_CAMCORDER_SELFIE_PORTRAIT,

    SND_DEVICE_IN_SPEAKER_QMIC_NS,

    SND_DEVICE_IN_SPEAKER_QMIC_AEC_NS,

    SND_DEVICE_IN_VOICE_HEARING_AID,

    SND_DEVICE_IN_END,



    SND_DEVICE_MAX = SND_DEVICE_IN_END,