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

Commit 14956cc9 authored by Manish Dewangan's avatar Manish Dewangan Committed by Gerrit - the friendly Code Review server
Browse files

audio: hal: support for out start delay 

-Changes to add support for out start delay

Change-Id: I27a55267efa888925c837639cb3349c6e19da249
parent 27346045

hal/audio_extn/audio_defs.h

+7 −1
Original line number Diff line number Diff line
@@ -173,12 +173,17 @@ struct audio_out_render_window_param { 
   uint64_t        render_we; /* render window end value in microseconds*/

};



struct audio_out_start_delay_param {

   uint64_t        start_delay; /* session start delay in microseconds*/

};



typedef union {

    struct source_tracking_param st_params;

    struct sound_focus_param sf_params;

    struct aptx_dec_param aptx_params;

    struct audio_avt_device_drift_param drift_params;

    struct audio_out_render_window_param render_window_param;

    struct audio_out_start_delay_param start_delay;

} audio_extn_param_payload;



typedef enum {
@@ -186,7 +191,8 @@ typedef enum { 
    AUDIO_EXTN_PARAM_SOUND_FOCUS,

    AUDIO_EXTN_PARAM_APTX_DEC,

    AUDIO_EXTN_PARAM_AVT_DEVICE_DRIFT,

    AUDIO_EXTN_PARAM_OUT_RENDER_WINDOW /* PARAM to set render window */

    AUDIO_EXTN_PARAM_OUT_RENDER_WINDOW, /* PARAM to set render window */

    AUDIO_EXTN_PARAM_OUT_START_DELAY

} audio_extn_param_id;



#endif /* AUDIO_DEFS_H */

hal/audio_extn/audio_extn.h

+3 −0
Original line number Diff line number Diff line
@@ -838,4 +838,7 @@ int audio_extn_utils_compress_set_clk_rec_mode(struct audio_usecase *usecase); 
int audio_extn_utils_compress_set_render_window(

            struct stream_out *out,

            struct audio_out_render_window_param *render_window);

int audio_extn_utils_compress_set_start_delay(

            struct stream_out *out,

            struct audio_out_start_delay_param *start_delay_param);

#endif /* AUDIO_EXTN_H */

hal/audio_extn/utils.c

+60 −0
Original line number Diff line number Diff line
@@ -1876,3 +1876,63 @@ int audio_extn_utils_compress_set_render_window( 
    return 0;

}

#endif



#ifdef SNDRV_COMPRESS_START_DELAY

int audio_extn_utils_compress_set_start_delay(

            struct stream_out *out,

            struct audio_out_start_delay_param *delay_param)

{

    struct snd_compr_metadata metadata;

    int ret = -EINVAL;



    if(delay_param == NULL) {

        ALOGE("%s:: Invalid delay_param", __func__);

        goto exit;

    }



    ALOGD("%s:: render start delay 0x%"PRIx64" ", __func__,

          delay_param->start_delay);



    if (!is_offload_usecase(out->usecase)) {

        ALOGE("%s:: not supported for non offload session", __func__);

        goto exit;

    }



   if ((out->render_mode == RENDER_MODE_AUDIO_MASTER) ||

       (out->render_mode == RENDER_MODE_AUDIO_STC_MASTER)) {

        /* store it to reconfigure in start_output_stream() */

        out->delay_param.start_delay = delay_param->start_delay;

    } else {

        ALOGD("%s:: only supported in timestamp mode, current "

              "render mode mode %d", __func__, out->render_mode);

        goto exit;

    }



    if (!out->compr) {

        ALOGW("%s:: offload session not yet opened,"

               "start delay will be configure later", __func__);

       goto exit;

    }



    metadata.key = SNDRV_COMPRESS_START_DELAY;

    metadata.value[0] = 0xFFFFFFFF & delay_param->start_delay; /* lsb */

    metadata.value[1] = \

            (0xFFFFFFFF00000000 & delay_param->start_delay) >> 32; /* msb*/



    ret = compress_set_metadata(out->compr, &metadata);

    if(ret) {

        ALOGE("%s::error %s", __func__, compress_get_error(out->compr));

    }



exit:

    return ret;

}

#else

int audio_extn_utils_compress_set_start_delay(

            struct stream_out *out __unused,

            struct audio_out_start_delay_param *delay_param __unused)

{

    ALOGD("%s:: configuring render window not supported", __func__);

    return 0;

}

#endif

hal/audio_hw.c

+4 −0
Original line number Diff line number Diff line
@@ -2193,6 +2193,9 @@ static int stop_output_stream(struct stream_out *out) 
    if (out->devices & AUDIO_DEVICE_OUT_AUX_DIGITAL)

        audio_extn_keep_alive_start();



    /*reset delay_param to 0*/

    out->delay_param.start_delay = 0;



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

    return ret;

}
@@ -2376,6 +2379,7 @@ int start_output_stream(struct stream_out *out) 
        if (out->render_window.render_ws != 0 && out->render_window.render_we != 0)

            audio_extn_utils_compress_set_render_window(out,

                                            &out->render_window);

        audio_extn_utils_compress_set_start_delay(out, &out->delay_param);



        audio_extn_dts_create_state_notifier_node(out->usecase);

        audio_extn_dts_notify_playback_state(out->usecase, 0, out->sample_rate,

hal/audio_hw.h

+1 −0
Original line number Diff line number Diff line
@@ -266,6 +266,7 @@ struct stream_out { 
    uint32_t platform_latency;

    render_mode_t render_mode;

    struct audio_out_render_window_param render_window; /*render winodw*/

    struct audio_out_start_delay_param delay_param; /*start delay*/



    audio_offload_info_t info;

};