From 1c32d7dfcf0394a332d5ddee2a210d4eb5bd540c Mon Sep 17 00:00:00 2001 From: Paul B Mahol Date: Sat, 6 Jun 2020 15:49:13 +0200 Subject: avfilter/asrc_anoisesrc: switch to activate Allows to set EOF timestamp. --- libavfilter/asrc_anoisesrc.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'libavfilter/asrc_anoisesrc.c') diff --git a/libavfilter/asrc_anoisesrc.c b/libavfilter/asrc_anoisesrc.c index ebcc446ae1..7aa878707d 100644 --- a/libavfilter/asrc_anoisesrc.c +++ b/libavfilter/asrc_anoisesrc.c @@ -21,6 +21,7 @@ #include "libavutil/opt.h" #include "audio.h" #include "avfilter.h" +#include "filters.h" #include "internal.h" #include "libavutil/lfg.h" #include "libavutil/random_seed.h" @@ -198,16 +199,20 @@ static av_cold int config_props(AVFilterLink *outlink) return 0; } -static int request_frame(AVFilterLink *outlink) +static int activate(AVFilterContext *ctx) { - AVFilterContext *ctx = outlink->src; + AVFilterLink *outlink = ctx->outputs[0]; ANoiseSrcContext *s = ctx->priv; AVFrame *frame; int nb_samples, i; double *dst; + if (!ff_outlink_frame_wanted(outlink)) + return FFERROR_NOT_READY; + if (!s->infinite && s->duration <= 0) { - return AVERROR_EOF; + ff_outlink_set_status(outlink, AVERROR_EOF, s->pts); + return 0; } else if (!s->infinite && s->duration < s->nb_samples) { nb_samples = s->duration; } else { @@ -236,7 +241,6 @@ static const AVFilterPad anoisesrc_outputs[] = { { .name = "default", .type = AVMEDIA_TYPE_AUDIO, - .request_frame = request_frame, .config_props = config_props, }, { NULL } @@ -248,6 +252,7 @@ AVFilter ff_asrc_anoisesrc = { .query_formats = query_formats, .priv_size = sizeof(ANoiseSrcContext), .inputs = NULL, + .activate = activate, .outputs = anoisesrc_outputs, .priv_class = &anoisesrc_class, }; -- cgit v1.2.3