History

avfilter/asrc_anoisesrc: switch to activate

Allows to set EOF timestamp.

Paul B Mahol committed 6 years ago

Commit 1c32d7d1 parent 49d37b41 file · +9 −4Browse files

Showing the changes to libavfilter (1 of 1 file). Show all

Unified · Split

libavfilter/asrc_anoisesrc.c+9−4
@@ -21,6 +21,7 @@ · 20 unmodified lines
2121 #include "libavutil/opt.h"
2222 #include "audio.h"
2323 #include "avfilter.h"
24+#include "filters.h"
2425 #include "internal.h"
2526 #include "libavutil/lfg.h"
2627 #include "libavutil/random_seed.h"
@@ -198,16 +199,20 @@ static av_cold int config_props(AVFilterLink *outlink) · 171 unmodified lines
198199 return 0;
199200 }
200201
201−static int request_frame(AVFilterLink *outlink)
202+static int activate(AVFilterContext *ctx)
202203 {
203− AVFilterContext *ctx = outlink->src;
204+ AVFilterLink *outlink = ctx->outputs[0];
204205 ANoiseSrcContext *s = ctx->priv;
205206 AVFrame *frame;
206207 int nb_samples, i;
207208 double *dst;
208209
210+ if (!ff_outlink_frame_wanted(outlink))
211+ return FFERROR_NOT_READY;
212+
209213 if (!s->infinite && s->duration <= 0) {
210− return AVERROR_EOF;
214+ ff_outlink_set_status(outlink, AVERROR_EOF, s->pts);
215+ return 0;
211216 } else if (!s->infinite && s->duration < s->nb_samples) {
212217 nb_samples = s->duration;
213218 } else {
@@ -236,7 +241,6 @@ static const AVFilterPad anoisesrc_outputs[] = { · 22 unmodified lines
236241 {
237242 .name = "default",
238243 .type = AVMEDIA_TYPE_AUDIO,
239− .request_frame = request_frame,
240244 .config_props = config_props,
241245 },
242246 { NULL }
@@ -248,6 +252,7 @@ AVFilter ff_asrc_anoisesrc = { · 5 unmodified lines
248252 .query_formats = query_formats,
249253 .priv_size = sizeof(ANoiseSrcContext),
250254 .inputs = NULL,
255+ .activate = activate,
251256 .outputs = anoisesrc_outputs,
252257 .priv_class = &anoisesrc_class,
253258 };

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t