avfilter/asrc_afirsrc: switch to activate

Allow to set the EOF timestamp.
pull/365/head
Paul B Mahol 3 years ago
parent 9153038e0a
commit 5e2e9d50ce
  1. 16
      libavfilter/asrc_afirsrc.c

@ -24,6 +24,7 @@
#include "libavutil/tx.h" #include "libavutil/tx.h"
#include "audio.h" #include "audio.h"
#include "avfilter.h" #include "avfilter.h"
#include "filters.h"
#include "internal.h" #include "internal.h"
#include "window_func.h" #include "window_func.h"
@ -273,16 +274,21 @@ static av_cold int config_output(AVFilterLink *outlink)
return 0; return 0;
} }
static int request_frame(AVFilterLink *outlink) static int activate(AVFilterContext *ctx)
{ {
AVFilterContext *ctx = outlink->src; AVFilterLink *outlink = ctx->outputs[0];
AudioFIRSourceContext *s = ctx->priv; AudioFIRSourceContext *s = ctx->priv;
AVFrame *frame; AVFrame *frame;
int nb_samples; int nb_samples;
if (!ff_outlink_frame_wanted(outlink))
return FFERROR_NOT_READY;
nb_samples = FFMIN(s->nb_samples, s->nb_taps - s->pts); nb_samples = FFMIN(s->nb_samples, s->nb_taps - s->pts);
if (!nb_samples) if (nb_samples <= 0) {
return AVERROR_EOF; ff_outlink_set_status(outlink, AVERROR_EOF, s->pts);
return 0;
}
if (!(frame = ff_get_audio_buffer(outlink, nb_samples))) if (!(frame = ff_get_audio_buffer(outlink, nb_samples)))
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
@ -298,7 +304,6 @@ static const AVFilterPad afirsrc_outputs[] = {
{ {
.name = "default", .name = "default",
.type = AVMEDIA_TYPE_AUDIO, .type = AVMEDIA_TYPE_AUDIO,
.request_frame = request_frame,
.config_props = config_output, .config_props = config_output,
}, },
}; };
@ -309,6 +314,7 @@ const AVFilter ff_asrc_afirsrc = {
.query_formats = query_formats, .query_formats = query_formats,
.init = init, .init = init,
.uninit = uninit, .uninit = uninit,
.activate = activate,
.priv_size = sizeof(AudioFIRSourceContext), .priv_size = sizeof(AudioFIRSourceContext),
.inputs = NULL, .inputs = NULL,
FILTER_OUTPUTS(afirsrc_outputs), FILTER_OUTPUTS(afirsrc_outputs),

Loading…
Cancel
Save