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

Commit 70e57616 authored by kunleiz's avatar kunleiz
Browse files

hal: add support to check sva and audio echo reference 

EC ref port can be simultaneously set and reset by
audio and SVA use cases. Synchronize enabling/disabling
of EC ref between sthal and audio hal by passing EC ref
enablement/disablement information to each other.
1. When closing input, EC ref does not stop if SVA EC ref
   is active.
2. Pass Audio EC ref status to STHAL, when stopping SVA,
   ensure EC does not stop if Audio EC ref is active.

Change-Id: I67f1f6316ea64e43a21cbf0add90d345a1108d3e
parent 130f1884

hal/audio_extn/audio_extn.h

+4 −0
Original line number Diff line number Diff line
@@ -432,6 +432,8 @@ void audio_extn_listen_set_parameters(struct audio_device *adev, 
#define audio_extn_sound_trigger_check_and_get_session(in)             (0)

#define audio_extn_sound_trigger_stop_lab(in)                          (0)

#define audio_extn_sound_trigger_read(in, buffer, bytes)               (0)

#define audio_extn_sound_trigger_check_ec_ref_enable()                 (0)

#define audio_extn_sound_trigger_update_ec_ref_status(on)              (0)

#else



enum st_event_type {
@@ -457,6 +459,8 @@ int audio_extn_sound_trigger_read(struct stream_in *in, void *buffer, 
                                  size_t bytes);

void audio_extn_sound_trigger_get_parameters(const struct audio_device *adev,

                     struct str_parms *query, struct str_parms *reply);

bool audio_extn_sound_trigger_check_ec_ref_enable();

void audio_extn_sound_trigger_update_ec_ref_status(bool on);

#endif



#ifndef AUXPCM_BT_ENABLED

hal/audio_extn/soundtrigger.c

+54 −2
Original line number Diff line number Diff line
@@ -54,7 +54,8 @@ 


/* Proprietary interface version used for compatibility with STHAL */

#define STHAL_PROP_API_VERSION_1_0 MAKE_HAL_VERSION(1, 0)

#define STHAL_PROP_API_CURRENT_VERSION STHAL_PROP_API_VERSION_1_0

#define STHAL_PROP_API_VERSION_1_1 MAKE_HAL_VERSION(1, 1)

#define STHAL_PROP_API_CURRENT_VERSION STHAL_PROP_API_VERSION_1_1



#define ST_EVENT_CONFIG_MAX_STR_VALUE 32

#define ST_DEVICE_HANDSET_MIC 1
@@ -64,6 +65,7 @@ typedef enum { 
    ST_EVENT_SESSION_DEREGISTER,

    ST_EVENT_START_KEEP_ALIVE,

    ST_EVENT_STOP_KEEP_ALIVE,

    ST_EVENT_UPDATE_ECHO_REF

} sound_trigger_event_type_t;



typedef enum {
@@ -82,7 +84,8 @@ typedef enum { 
    AUDIO_EVENT_CAPTURE_STREAM_INACTIVE,

    AUDIO_EVENT_CAPTURE_STREAM_ACTIVE,

    AUDIO_EVENT_BATTERY_STATUS_CHANGED,

    AUDIO_EVENT_GET_PARAM

    AUDIO_EVENT_GET_PARAM,

    AUDIO_EVENT_UPDATE_ECHO_REF

} audio_event_type_t;



typedef enum {
@@ -120,6 +123,7 @@ struct audio_hal_usecase { 


struct sound_trigger_event_info {

    struct sound_trigger_session_info st_ses;

    bool st_ec_ref_enabled;

};

typedef struct sound_trigger_event_info sound_trigger_event_info_t;
@@ -141,6 +145,7 @@ struct audio_event_info { 
        struct audio_read_samples_info aud_info;

        char str_value[ST_EVENT_CONFIG_MAX_STR_VALUE];

        struct audio_hal_usecase usecase;

        bool audio_ec_ref_enabled;

        struct sound_trigger_get_param_data st_get_param_data;

    } u;

    struct sound_trigger_device_info device_info;
@@ -200,6 +205,7 @@ struct sound_trigger_audio_device { 
    struct listnode st_ses_list;

    pthread_mutex_t lock;

    unsigned int sthal_prop_api_version;

    bool st_ec_ref_enabled;

};



static struct sound_trigger_audio_device *st_dev;
@@ -335,6 +341,15 @@ int audio_hw_call_back(sound_trigger_event_type_t event, 
        pthread_mutex_unlock(&st_dev->adev->lock);

        goto done;



    case ST_EVENT_UPDATE_ECHO_REF:

        if (!config) {

            ALOGE("%s: NULL config", __func__);

            status = -EINVAL;

            break;

        }

        st_dev->st_ec_ref_enabled = config->st_ec_ref_enabled;

        break;



    default:

        ALOGW("%s: Unknown event %d", __func__, event);

        break;
@@ -443,6 +458,42 @@ bool is_same_as_st_device(snd_device_t snd_device) 
    return false;

}



bool audio_extn_sound_trigger_check_ec_ref_enable()

{

    bool ret = false;



    if (!st_dev) {

        ALOGE("%s: st_dev NULL", __func__);

        return ret;

    }



    pthread_mutex_lock(&st_dev->lock);

    if (st_dev->st_ec_ref_enabled) {

        ret = true;

        ALOGD("%s: EC Reference is enabled", __func__);

    } else {

        ALOGD("%s: EC Reference is disabled", __func__);

    }

    pthread_mutex_unlock(&st_dev->lock);



    return ret;

}



void audio_extn_sound_trigger_update_ec_ref_status(bool on)

{

    struct audio_event_info ev_info;



    if (!st_dev) {

        ALOGE("%s: st_dev NULL", __func__);

        return;

    }



    ev_info.u.audio_ec_ref_enabled = on;

    st_dev->st_callback(AUDIO_EVENT_UPDATE_ECHO_REF, &ev_info);

    ALOGD("%s: update audio echo ref status %s",__func__,

                ev_info.u.audio_ec_ref_enabled == true ? "true" : "false");

}



void audio_extn_sound_trigger_update_device_status(snd_device_t snd_device,

                                     st_event_type_t event)

{
@@ -753,6 +804,7 @@ int audio_extn_sound_trigger_init(struct audio_device *adev) 
    }



    st_dev->adev = adev;

    st_dev->st_ec_ref_enabled = false;

    list_init(&st_dev->st_ses_list);

    audio_extn_snd_mon_register_listener(st_dev, stdev_snd_mon_cb);

hal/audio_hw.c

+11 −5
Original line number Diff line number Diff line
@@ -7971,14 +7971,20 @@ static void adev_close_input_stream(struct audio_hw_device *dev, 


    ALOGD("%s: enter:stream_handle(%p)",__func__, in);



    // must deregister from sndmonitor first to prevent races

    // between the callback and close_stream

    /* must deregister from sndmonitor first to prevent races

     * between the callback and close_stream

     */

    audio_extn_snd_mon_unregister_listener(stream);



    // Disable echo reference if there are no active input and hfp call

    // while closing input stream

    if (!adev->active_input && !audio_extn_hfp_is_active(adev))

    /* Disable echo reference if there are no active input, hfp call

     * and sound trigger while closing input stream

     */

    if (!adev->active_input &&

        !audio_extn_hfp_is_active(adev) &&

        !audio_extn_sound_trigger_check_ec_ref_enable())

        platform_set_echo_reference(adev, false, AUDIO_DEVICE_NONE);

    else

        audio_extn_sound_trigger_update_ec_ref_status(false);



    error_log_destroy(in->error_log);

    in->error_log = NULL;

hal/msm8974/platform.c

+2 −0
Original line number Diff line number Diff line
@@ -1478,6 +1478,8 @@ void platform_set_echo_reference(struct audio_device *adev, bool enable, 
    struct platform_data *my_data = (struct platform_data *)adev->platform;

    char ec_ref_mixer_path[MIXER_PATH_MAX_LENGTH] = "echo-reference";



    audio_extn_sound_trigger_update_ec_ref_status(enable);



    if (strcmp(my_data->ec_ref_mixer_path, "")) {

        ALOGV("%s: disabling %s", __func__, my_data->ec_ref_mixer_path);

        audio_route_reset_and_update_path(adev->audio_route,