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

Commit 2c2f7efd authored by Sudheer Papothi's avatar Sudheer Papothi Committed by Dan Pasanen
Browse files

hal: Add performance lock for playback usecase 

Add performance lock during device path bringup in
playback usecase to reduce cold start output latency.

Change-Id: I2ff217beedb270f057fd4ea577a7a317ee1f20e6
parent e7c84b00

hal/audio_extn/audio_extn.c

+20 −11
Original line number Diff line number Diff line
@@ -874,9 +874,7 @@ static void *qcopt_handle; 
static perf_lock_acquire_t perf_lock_acq;

static perf_lock_release_t perf_lock_rel;



static int perf_lock_handle;

char opt_lib_path[512] = {0};

int perf_lock_opts[1] = {0x20E};



int audio_extn_perf_lock_init(void)

{
@@ -914,19 +912,30 @@ err: 
    return ret;

}



void audio_extn_perf_lock_acquire(void)

void audio_extn_perf_lock_acquire(int *handle, int duration,

                                 int *perf_lock_opts, int size)

{

    if (perf_lock_acq)

        perf_lock_handle = perf_lock_acq(perf_lock_handle, 0, perf_lock_opts, 1);

    else

        ALOGE("%s: Perf lock acquire error \n", __func__);



    if (!perf_lock_opts || !size || !perf_lock_acq || !handle)

        return -EINVAL;

    /*

     * Acquire performance lock for 1 sec during device path bringup.

     * Lock will be released either after 1 sec or when perf_lock_release

     * function is executed.

     */

    *handle = perf_lock_acq(*handle, duration, perf_lock_opts, size);

    if (*handle <= 0)

        ALOGE("%s: Failed to acquire perf lock, err: %d\n",

              __func__, *handle);

}



void audio_extn_perf_lock_release(void)

void audio_extn_perf_lock_release(int *handle)

{

    if (perf_lock_rel && perf_lock_handle)

        perf_lock_rel(perf_lock_handle);

    else

    if (perf_lock_rel && handle && (*handle > 0)) {

        perf_lock_rel(*handle);

        *handle = 0;

    } else {

        ALOGE("%s: Perf lock release error \n", __func__);

    }

}

#endif /* KPI_OPTIMIZE_ENABLED */

hal/audio_extn/audio_extn.h

+6 −4
Original line number Diff line number Diff line
@@ -461,11 +461,13 @@ int b64encode(uint8_t *inp, int ilen, char* outp); 


#ifndef KPI_OPTIMIZE_ENABLED

#define audio_extn_perf_lock_init() (0)

#define audio_extn_perf_lock_acquire() (0)

#define audio_extn_perf_lock_release() (0)

#define audio_extn_perf_lock_acquire(handle, duration, opts, size) (0)

#define audio_extn_perf_lock_release(handle) (0)

#else

int audio_extn_perf_lock_init(void);

void audio_extn_perf_lock_acquire(void);

void audio_extn_perf_lock_release(void);

void audio_extn_perf_lock_acquire(int *handle, int duration,

                                 int *opts, int size);

void audio_extn_perf_lock_release(int *handle);



#endif /* KPI_OPTIMIZE_ENABLED */

#endif /* AUDIO_EXTN_H */

hal/audio_hw.c

+14 −7
Original line number Diff line number Diff line
@@ -1225,7 +1225,9 @@ int start_input_stream(struct stream_in *in) 
    uc_info->out_snd_device = SND_DEVICE_NONE;



    list_add_tail(&adev->usecase_list, &uc_info->list);

    audio_extn_perf_lock_acquire();

    audio_extn_perf_lock_acquire(&adev->perf_lock_handle, 0,

                                 adev->perf_lock_opts,

                                 adev->perf_lock_opts_size);

    select_devices(adev, in->usecase);



    ALOGV("%s: Opening PCM device card_id(%d) device_id(%d), channels %d",
@@ -1267,16 +1269,14 @@ int start_input_stream(struct stream_in *in) 
        goto error_open;

    }



    audio_extn_perf_lock_release();



    audio_extn_perf_lock_release(&adev->perf_lock_handle);

    ALOGD("%s: exit", __func__);



    return ret;



error_open:

    audio_extn_perf_lock_release(&adev->perf_lock_handle);

    stop_input_stream(in);

    audio_extn_perf_lock_release();



error_config:

    adev->active_input = NULL;

    ALOGD("%s: exit: status(%d)", __func__, ret);
@@ -1729,6 +1729,9 @@ int start_output_stream(struct stream_out *out) 
    }

    list_add_tail(&adev->usecase_list, &uc_info->list);



    audio_extn_perf_lock_acquire(&adev->perf_lock_handle, 0,

                                 adev->perf_lock_opts,

                                 adev->perf_lock_opts_size);

    select_devices(adev, out->usecase);



    ALOGV("%s: Opening PCM device card_id(%d) device_id(%d) format(%#x)",
@@ -1819,11 +1822,12 @@ int start_output_stream(struct stream_out *out) 
            audio_extn_check_and_set_dts_hpx_state(adev);

        }

    }



    audio_extn_perf_lock_release(&adev->perf_lock_handle);

    ALOGD("%s: exit", __func__);



    return 0;

error_open:

    audio_extn_perf_lock_release(&adev->perf_lock_handle);

    stop_output_stream(out);

error_config:

    return ret;
@@ -3860,7 +3864,6 @@ static int adev_open_input_stream(struct audio_hw_device *dev, 
    /* This stream could be for sound trigger lab,

       get sound trigger pcm if present */

    audio_extn_sound_trigger_check_and_get_session(in);

    audio_extn_perf_lock_init();



    *stream_in = &in->stream;

    ALOGV("%s: exit", __func__);
@@ -4022,6 +4025,9 @@ static int adev_open(const hw_module_t *module, const char *name, 
    list_init(&adev->usecase_list);

    adev->cur_wfd_channels = 2;

    adev->offload_usecases_state = 0;

    adev->perf_lock_opts[0] = 0x101;

    adev->perf_lock_opts[1] = 0x20E;

    adev->perf_lock_opts_size = 2;



    pthread_mutex_init(&adev->snd_card_status.lock, (const pthread_mutexattr_t *) NULL);

    adev->snd_card_status.state = SND_CARD_STATE_OFFLINE;
@@ -4136,6 +4142,7 @@ static int adev_open(const hw_module_t *module, const char *name, 
    if (adev->adm_init)

        adev->adm_data = adev->adm_init();



    audio_extn_perf_lock_init();

    ALOGV("%s: exit", __func__);

    return 0;

}

hal/audio_hw.h

+5 −0
Original line number Diff line number Diff line
@@ -75,6 +75,8 @@ 
#define SND_CARD_STATE_OFFLINE 0

#define SND_CARD_STATE_ONLINE 1



#define MAX_PERF_LOCK_OPTS 20



/* These are the supported use cases by the hardware.

 * Each usecase is mapped to a specific PCM device.

 * Refer to pcm_device_table[].
@@ -346,6 +348,9 @@ struct audio_device { 
    adm_deregister_stream_t adm_deregister_stream;

    adm_request_focus_t adm_request_focus;

    adm_abandon_focus_t adm_abandon_focus;

    int perf_lock_handle;

    int perf_lock_opts[MAX_PERF_LOCK_OPTS];

    int perf_lock_opts_size;

    bool multi_offload_enable;



    amplifier_device_t *amp;

hal/msm8974/platform.c

+40 −1
Original line number Diff line number Diff line
@@ -113,6 +113,7 @@ 
#define AUDIO_PARAMETER_KEY_AUD_CALDATA   "cal_data"

#define AUDIO_PARAMETER_KEY_AUD_CALRESULT "cal_result"



#define AUDIO_PARAMETER_KEY_PERF_LOCK_OPTS "perf_lock_opts"



/* Query external audio device connection status */

#define AUDIO_PARAMETER_KEY_EXT_AUDIO_DEVICE "ext_audio_device"
@@ -2628,6 +2629,44 @@ done_key_audcal: 
        free(dptr);

}



static void perf_lock_set_params(struct platform_data *platform,

                          struct str_parms *parms,

                          char *value, int len)

{

    int err = 0, i = 0, num_opts = 0;

    char *test_r = NULL;

    char *opts = NULL;

    char *opts_size = NULL;



    err = str_parms_get_str(parms, AUDIO_PARAMETER_KEY_PERF_LOCK_OPTS,

                            value, len);

    if (err >= 0) {

        opts_size = strtok_r(value, ", ", &test_r);

        if (opts_size == NULL) {

            ALOGE("%s: incorrect perf lock opts\n", __func__);

            return;

        }

        num_opts = atoi(opts_size);

        if (num_opts > 0) {

            if (num_opts > MAX_PERF_LOCK_OPTS) {

                ALOGD("%s: num_opts %d exceeds max %d, setting to max\n",

                      __func__, num_opts, MAX_PERF_LOCK_OPTS);

                num_opts = MAX_PERF_LOCK_OPTS;

            }

            for (i = 0; i < num_opts; i++) {

                opts = strtok_r(NULL, ", ", &test_r);

                if (opts == NULL) {

                    ALOGE("%s: incorrect perf lock opts\n", __func__);

                    break;

                }

                platform->adev->perf_lock_opts[i] = strtoul(opts, NULL, 16);

            }

            platform->adev->perf_lock_opts_size = i;

        }

        str_parms_del(parms, AUDIO_PARAMETER_KEY_PERF_LOCK_OPTS);

    }

}



int platform_set_parameters(void *platform, struct str_parms *parms)

{

    struct platform_data *my_data = (struct platform_data *)platform;
@@ -2717,7 +2756,7 @@ int platform_set_parameters(void *platform, struct str_parms *parms) 


    /* handle audio calibration parameters */

    set_audiocal(platform, parms, value, len);



    perf_lock_set_params(platform, parms, value, len);

done:

    ALOGV("%s: exit with code(%d)", __func__, ret);

    free(kv_pairs);