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

Commit d2a7488a authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Promotion of audio-userspace.lnx.3.0-00021. 

CRs      Change ID                                   Subject
--------------------------------------------------------------------------------------------------------------
2009985   I27a55267efa888925c837639cb3349c6e19da249   audio: hal: support for out start delay
2009985   I17aed22d885df2f8236f739ab61e258bd3f760bf   audio: hal: support for audio clock recovery modes
2009985   I40bb0d8061b8245999c37a485d3a7ee45108fac6   audio: hal: support for audio render window

Change-Id: If34602bbdd7407f8775b0b6c88014e7afcbc608a
CRs-Fixed: 2009985
parents 52f9b6db 2d753530

hal/audio_extn/audio_defs.h

+18 −1
Original line number Diff line number Diff line
@@ -164,18 +164,35 @@ struct audio_avt_device_drift_param { 
    uint32_t        ref_timer_abs_ts_msw;

};



/*use these for setting infine window.i.e free run mode */

#define AUDIO_MAX_RENDER_START_WINDOW 0x8000000000000000

#define AUDIO_MAX_RENDER_END_WINDOW   0x7FFFFFFFFFFFFFFF



struct audio_out_render_window_param {

   uint64_t        render_ws; /* render window start value in microseconds*/

   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 {

    AUDIO_EXTN_PARAM_SOURCE_TRACK,

    AUDIO_EXTN_PARAM_SOUND_FOCUS,

    AUDIO_EXTN_PARAM_APTX_DEC,

    AUDIO_EXTN_PARAM_AVT_DEVICE_DRIFT

    AUDIO_EXTN_PARAM_AVT_DEVICE_DRIFT,

    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

+7 −0
Original line number Diff line number Diff line
@@ -834,4 +834,11 @@ int audio_extn_utils_get_avt_device_drift( 
                struct audio_avt_device_drift_param *drift_param);

int audio_extn_utils_compress_get_dsp_latency(struct stream_out *out);

int audio_extn_utils_compress_set_render_mode(struct stream_out *out);

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

+195 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#define LOG_TAG "audio_hw_utils"

/* #define LOG_NDEBUG 0 */



#include <inttypes.h>

#include <errno.h>

#include <cutils/properties.h>

#include <cutils/config_utils.h>
@@ -1741,3 +1742,197 @@ int audio_extn_utils_compress_set_render_mode(struct stream_out *out __unused) 
    return 0;

}

#endif



#ifdef SNDRV_COMPRESS_CLK_REC_MODE

int audio_extn_utils_compress_set_clk_rec_mode(

            struct audio_usecase *usecase)

{

    struct snd_compr_metadata metadata;

    struct stream_out *out = NULL;

    int ret = -EINVAL;



    if (usecase != NULL && usecase->type != PCM_PLAYBACK) {

        ALOGE("%s:: Invalid use case", __func__);

        goto exit;

    }



    out = usecase->stream.out;

    if (!out) {

        ALOGE("%s:: invalid stream", __func__);

        goto exit;

    }



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

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

        goto exit;

    }



    if (out->render_mode != RENDER_MODE_AUDIO_STC_MASTER) {

        ALOGD("%s:: clk recovery is only supported in STC render mode",

                __func__);

        ret = 0;

        goto exit;

    }



    if (!out->compr) {

        ALOGD("%s:: Invalid compress handle",

                __func__);

        goto exit;

    }

    metadata.key = SNDRV_COMPRESS_CLK_REC_MODE;

    switch(usecase->out_snd_device) {

        case SND_DEVICE_OUT_HDMI:

        case SND_DEVICE_OUT_SPEAKER_AND_HDMI:

        case SND_DEVICE_OUT_DISPLAY_PORT:

        case SND_DEVICE_OUT_SPEAKER_AND_DISPLAY_PORT:

            metadata.value[0] = SNDRV_COMPRESS_CLK_REC_MODE_NONE;

            break;

        default:

            metadata.value[0] = SNDRV_COMPRESS_CLK_REC_MODE_AUTO;

            break;

    }



    ALOGD("%s:: clk recovery mode %d",__func__, metadata.value[0]);



    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_clk_rec_mode(

            struct audio_usecase *usecase __unused)

{

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

    return 0;

}

#endif



#ifdef SNDRV_COMPRESS_RENDER_WINDOW

int audio_extn_utils_compress_set_render_window(

            struct stream_out *out,

            struct audio_out_render_window_param *render_window)

{

    struct snd_compr_metadata metadata;

    int ret = -EINVAL;



    ALOGD("%s:: render window start 0x%"PRIx64" end 0x%"PRIx64"",

          __func__,render_window->render_ws, render_window->render_we);



    if(render_window == NULL) {

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

        goto exit;

    }



    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)) {

        memcpy(&out->render_window, render_window,

               sizeof(struct audio_out_render_window_param));

    } 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,"

               "render window will be configure later", __func__);

        /* store render window to reconfigure in start_output_stream() */

       goto exit;

    }



    metadata.key = SNDRV_COMPRESS_RENDER_WINDOW;

    /*render window start value */

    metadata.value[0] = 0xFFFFFFFF & render_window->render_ws; /* lsb */

    metadata.value[1] = \

            (0xFFFFFFFF00000000 & render_window->render_ws) >> 32; /* msb*/

    /*render window end value */

    metadata.value[2] = 0xFFFFFFFF & render_window->render_we; /* lsb */

    metadata.value[3] = \

            (0xFFFFFFFF00000000 & render_window->render_we) >> 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_render_window(

            struct stream_out *out __unused,

            struct audio_out_render_window_param *render_window __unused)

{

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

    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

+19 −0
Original line number Diff line number Diff line
@@ -710,6 +710,7 @@ int enable_audio_route(struct audio_device *adev, 
{

    snd_device_t snd_device;

    char mixer_path[MIXER_PATH_MAX_LENGTH];

    struct stream_out *out = NULL;



    if (usecase == NULL)

        return -EINVAL;
@@ -730,6 +731,12 @@ int enable_audio_route(struct audio_device *adev, 
    audio_extn_listen_update_stream_status(usecase, LISTEN_EVENT_STREAM_BUSY);

    audio_extn_utils_send_app_type_cfg(adev, usecase);

    audio_extn_utils_send_audio_calibration(adev, usecase);

    if ((usecase->type == PCM_PLAYBACK) && is_offload_usecase(usecase->id)) {

        out = usecase->stream.out;

        if (out && out->compr)

            audio_extn_utils_compress_set_clk_rec_mode(usecase);

    }



    strlcpy(mixer_path, use_case_table[usecase->id], MIXER_PATH_MAX_LENGTH);

    platform_add_backend_name(mixer_path, snd_device, usecase);

    ALOGD("%s: apply mixer and update path: %s", __func__, mixer_path);
@@ -2186,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;

}
@@ -2364,6 +2374,12 @@ int start_output_stream(struct stream_out *out) 
        }



        audio_extn_utils_compress_set_render_mode(out);

        audio_extn_utils_compress_set_clk_rec_mode(uc_info);

        /* set render window if it was set before compress_open() */

        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,
@@ -4144,6 +4160,9 @@ int adev_open_output_stream(struct audio_hw_device *dev, 
            out->render_mode = RENDER_MODE_AUDIO_NO_TIMESTAMP;

        }



        memset(&out->render_window, 0,

                sizeof(struct audio_out_render_window_param));



        out->send_new_metadata = 1;

        out->send_next_track_params = false;

        out->is_compr_metadata_avail = false;

hal/audio_hw.h

+2 −0
Original line number Diff line number Diff line
@@ -265,6 +265,8 @@ struct stream_out { 
    struct listnode qaf_offload_cmd_list;

    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;

};