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

Commit 7cbc7f3a authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "hal: Check hfp usecase to differenciate between nb and wb"

parents aa065473 739e7152

hal/audio_extn/audio_extn.h

+2 −0
Original line number Diff line number Diff line
@@ -184,8 +184,10 @@ void audio_extn_dolby_send_ddp_endp_params(struct audio_device *adev); 


#ifndef HFP_ENABLED

#define audio_extn_hfp_is_active(adev)                  (0)

#define audio_extn_hfp_get_usecase()                    (0)

#else

bool audio_extn_hfp_is_active(struct audio_device *adev);

audio_usecase_t audio_extn_hfp_get_usecase();

#endif



#ifndef HFP_ENABLED

hal/audio_extn/hfp.c

+6 −1
Original line number Diff line number Diff line
@@ -220,7 +220,7 @@ static int32_t stop_hfp(struct audio_device *adev) 
bool audio_extn_hfp_is_active(struct audio_device *adev)

{

    struct audio_usecase *hfp_usecase = NULL;

    hfp_usecase = get_usecase_from_list(adev, USECASE_AUDIO_HFP_SCO);

    hfp_usecase = get_usecase_from_list(adev, hfpmod.ucid);



    if (hfp_usecase != NULL)

        return true;
@@ -228,6 +228,11 @@ bool audio_extn_hfp_is_active(struct audio_device *adev) 
        return false;

}



audio_usecase_t audio_extn_hfp_get_usecase()

{

    return hfpmod.ucid;

}



void audio_extn_hfp_set_parameters(struct audio_device *adev, struct str_parms *parms)

{

    int ret;

hal/audio_hw.c

+3 −1
Original line number Diff line number Diff line
@@ -603,6 +603,7 @@ int select_devices(struct audio_device *adev, audio_usecase_t uc_id) 
    struct audio_usecase *vc_usecase = NULL;

    struct audio_usecase *voip_usecase = NULL;

    struct audio_usecase *hfp_usecase = NULL;

    audio_usecase_t hfp_ucid;

    struct listnode *node;

    int status = 0;
@@ -642,7 +643,8 @@ int select_devices(struct audio_device *adev, audio_usecase_t uc_id) 
                    out_snd_device = voip_usecase->out_snd_device;

            }

        } else if (audio_extn_hfp_is_active(adev)) {

            hfp_usecase = get_usecase_from_list(adev, USECASE_AUDIO_HFP_SCO);

            hfp_ucid = audio_extn_hfp_get_usecase();

            hfp_usecase = get_usecase_from_list(adev, hfp_ucid);

            if (hfp_usecase->devices & AUDIO_DEVICE_OUT_ALL_CODEC_BACKEND) {

                   in_snd_device = hfp_usecase->in_snd_device;

                   out_snd_device = hfp_usecase->out_snd_device;