History

lavfi: remove FF_LINK_FLAG_REQUEST_LOOP.

It has no longer any effect.

Nicolas George committed 11 years ago

Commit 44f660e1 parent 2a351f631 files · +2 −103Browse files

Unified · Split

31 files
  1. libavfilter/af_afade.c +0 −1
  2. libavfilter/af_asetnsamples.c +0 −1
  3. libavfilter/af_atempo.c +0 −2
  4. libavfilter/af_compand.c +0 −1
  5. libavfilter/af_dynaudnorm.c +0 −7
  6. libavfilter/af_silenceremove.c +0 −8
  7. libavfilter/avf_showfreqs.c +0 −1
  8. libavfilter/avfilter.c +0 −1
  9. libavfilter/f_ebur128.c +0 −4
  10. libavfilter/f_interleave.c +0 −2
  11. libavfilter/f_reverse.c +0 −8
  12. libavfilter/framesync.c +0 −1
  13. libavfilter/internal.h +0 −14
  14. libavfilter/trim.c +0 −8
  15. libavfilter/vf_atadenoise.c +0 −7
  16. libavfilter/vf_blend.c +2 −3
  17. libavfilter/vf_decimate.c +0 −1
  18. libavfilter/vf_detelecine.c +0 −1
  19. libavfilter/vf_fieldmatch.c +0 −1
  20. libavfilter/vf_framerate.c +0 −1
  21. libavfilter/vf_framestep.c +0 −1
  22. libavfilter/vf_idet.c +0 −7
  23. libavfilter/vf_interlace.c +0 −1
  24. libavfilter/vf_palettegen.c +0 −1
  25. libavfilter/vf_pullup.c +0 −7
  26. libavfilter/vf_random.c +0 −7
  27. libavfilter/vf_stereo3d.c +0 −1
  28. libavfilter/vf_telecine.c +0 −1
  29. libavfilter/vf_tile.c +0 −2
  30. libavfilter/vf_tinterlace.c +0 −1
  31. libavfilter/vf_w3fdif.c +0 −1
libavfilter/af_afade.c+0−1
@@ -611,7 +611,6 @@ static int acrossfade_config_output(AVFilterLink *outlink) · 610 unmodified lines
611611 outlink->time_base = ctx->inputs[0]->time_base;
612612 outlink->channel_layout = ctx->inputs[0]->channel_layout;
613613 outlink->channels = ctx->inputs[0]->channels;
614− outlink->flags |= FF_LINK_FLAG_REQUEST_LOOP;
615614
616615 switch (outlink->format) {
617616 case AV_SAMPLE_FMT_DBL: s->crossfade_samples = crossfade_samples_dbl; break;
libavfilter/af_asetnsamples.c+0−1
@@ -77,7 +77,6 @@ static int config_props_output(AVFilterLink *outlink) · 76 unmodified lines
7777 asns->fifo = av_audio_fifo_alloc(outlink->format, outlink->channels, asns->nb_out_samples);
7878 if (!asns->fifo)
7979 return AVERROR(ENOMEM);
80− outlink->flags |= FF_LINK_FLAG_REQUEST_LOOP;
8180
8281 return 0;
8382 }
libavfilter/af_atempo.c+0−2
@@ -1046,8 +1046,6 @@ static int config_props(AVFilterLink *inlink) · 1045 unmodified lines
10461046 int sample_rate = (int)inlink->sample_rate;
10471047 int channels = av_get_channel_layout_nb_channels(inlink->channel_layout);
10481048
1049− ctx->outputs[0]->flags |= FF_LINK_FLAG_REQUEST_LOOP;
1050−
10511049 return yae_reset(atempo, format, sample_rate, channels);
10521050 }
10531051
libavfilter/af_compand.c+0−1
@@ -531,7 +531,6 @@ static int config_output(AVFilterLink *outlink) · 530 unmodified lines
531531 if (err)
532532 return err;
533533
534− outlink->flags |= FF_LINK_FLAG_REQUEST_LOOP;
535534 s->compand = compand_delay;
536535 return 0;
537536 }
libavfilter/af_dynaudnorm.c+0−7
@@ -305,12 +305,6 @@ static int config_input(AVFilterLink *inlink) · 304 unmodified lines
305305 return 0;
306306 }
307307
308−static int config_output(AVFilterLink *outlink)
309−{
310− outlink->flags |= FF_LINK_FLAG_REQUEST_LOOP;
311− return 0;
312−}
313−
314308 static inline double fade(double prev, double next, int pos,
315309 double *fade_factors[2])
316310 {
@@ -721,7 +715,6 @@ static const AVFilterPad avfilter_af_dynaudnorm_outputs[] = { · 404 unmodified lines
721715 {
722716 .name = "default",
723717 .type = AVMEDIA_TYPE_AUDIO,
724− .config_props = config_output,
725718 .request_frame = request_frame,
726719 },
727720 { NULL }
libavfilter/af_silenceremove.c+0−8
@@ -153,13 +153,6 @@ static int config_input(AVFilterLink *inlink) · 152 unmodified lines
153153 return 0;
154154 }
155155
156−static int config_output(AVFilterLink *outlink)
157−{
158− outlink->flags |= FF_LINK_FLAG_REQUEST_LOOP;
159−
160− return 0;
161−}
162−
163156 static double compute_rms(SilenceRemoveContext *s, double sample)
164157 {
165158 double new_sum;
@@ -463,7 +456,6 @@ static const AVFilterPad silenceremove_outputs[] = { · 297 unmodified lines
463456 {
464457 .name = "default",
465458 .type = AVMEDIA_TYPE_AUDIO,
466− .config_props = config_output,
467459 .request_frame = request_frame,
468460 },
469461 { NULL }
libavfilter/avf_showfreqs.c+0−1
@@ -300,7 +300,6 @@ static int config_output(AVFilterLink *outlink) · 299 unmodified lines
300300 s->scale += s->window_func_lut[i] * s->window_func_lut[i];
301301 }
302302
303− outlink->flags |= FF_LINK_FLAG_REQUEST_LOOP;
304303 outlink->frame_rate = av_make_q(inlink->sample_rate, s->win_size * (1.-s->overlap));
305304 outlink->sample_aspect_ratio = (AVRational){1,1};
306305 outlink->w = s->w;
libavfilter/avfilter.c+0−1
@@ -1097,7 +1097,6 @@ static int ff_filter_frame_needs_framing(AVFilterLink *link, AVFrame *frame) · 1096 unmodified lines
10971097 int nb_channels = av_frame_get_channels(frame);
10981098 int ret = 0;
10991099
1100− link->flags |= FF_LINK_FLAG_REQUEST_LOOP;
11011100 /* Handle framing (min_samples, max_samples) */
11021101 while (insamples) {
11031102 if (!pbuf) {
libavfilter/f_ebur128.c+0−4
@@ -337,8 +337,6 @@ static int config_video_output(AVFilterLink *outlink) · 336 unmodified lines
337337 DRAW_RECT(ebur128->graph);
338338 DRAW_RECT(ebur128->gauge);
339339
340− outlink->flags |= FF_LINK_FLAG_REQUEST_LOOP;
341−
342340 return 0;
343341 }
344342
@@ -398,8 +396,6 @@ static int config_audio_output(AVFilterLink *outlink) · 53 unmodified lines
398396 return AVERROR(ENOMEM);
399397 }
400398
401− outlink->flags |= FF_LINK_FLAG_REQUEST_LOOP;
402−
403399 #if CONFIG_SWRESAMPLE
404400 if (ebur128->peak_mode & PEAK_MODE_TRUE_PEAKS) {
405401 int ret;
libavfilter/f_interleave.c+0−2
@@ -180,8 +180,6 @@ static int config_output(AVFilterLink *outlink) · 179 unmodified lines
180180 }
181181 }
182182 }
183−
184− outlink->flags |= FF_LINK_FLAG_REQUEST_LOOP;
185183 return 0;
186184 }
187185
libavfilter/f_reverse.c+0−8
@@ -62,12 +62,6 @@ static av_cold void uninit(AVFilterContext *ctx) · 61 unmodified lines
6262 av_freep(&s->frames);
6363 }
6464
65−static int config_output(AVFilterLink *outlink)
66−{
67− outlink->flags |= FF_LINK_FLAG_REQUEST_LOOP;
68− return 0;
69−}
70−
7165 static int filter_frame(AVFilterLink *inlink, AVFrame *in)
7266 {
7367 AVFilterContext *ctx = inlink->dst;
@@ -129,7 +123,6 @@ static const AVFilterPad reverse_outputs[] = { · 55 unmodified lines
129123 .name = "default",
130124 .type = AVMEDIA_TYPE_VIDEO,
131125 .request_frame = request_frame,
132− .config_props = config_output,
133126 },
134127 { NULL }
135128 };
@@ -240,7 +233,6 @@ static const AVFilterPad areverse_outputs[] = { · 104 unmodified lines
240233 .name = "default",
241234 .type = AVMEDIA_TYPE_AUDIO,
242235 .request_frame = areverse_request_frame,
243− .config_props = config_output,
244236 },
245237 { NULL }
246238 };
libavfilter/framesync.c+0−1
@@ -322,7 +322,6 @@ int ff_framesync_request_frame(FFFrameSync *fs, AVFilterLink *outlink) · 321 unmodified lines
322322 return 0;
323323 if (fs->eof)
324324 return AVERROR_EOF;
325− outlink->flags |= FF_LINK_FLAG_REQUEST_LOOP;
326325 input = fs->in_request;
327326 ret = ff_request_frame(ctx->inputs[input]);
328327 if (ret == AVERROR_EOF) {
libavfilter/internal.h+0−14
@@ -335,20 +335,6 @@ int ff_request_frame(AVFilterLink *link); · 334 unmodified lines
335335 */
336336 int ff_filter_frame(AVFilterLink *link, AVFrame *frame);
337337
338−/**
339− * Flags for AVFilterLink.flags.
340− */
341−enum {
342−
343− /**
344− * Frame requests may need to loop in order to be fulfilled.
345− * A filter must set this flags on an output link if it may return 0 in
346− * request_frame() without filtering a frame.
347− */
348− FF_LINK_FLAG_REQUEST_LOOP = 1,
349−
350−};
351−
352338 /**
353339 * Allocate a new filter context and return it.
354340 *
libavfilter/trim.c+0−8
@@ -114,12 +114,6 @@ static int config_input(AVFilterLink *inlink) · 113 unmodified lines
114114 return 0;
115115 }
116116
117−static int config_output(AVFilterLink *outlink)
118−{
119− outlink->flags |= FF_LINK_FLAG_REQUEST_LOOP;
120− return 0;
121−}
122−
123117 #define OFFSET(x) offsetof(TrimContext, x)
124118 #define COMMON_OPTS \
125119 { "starti", "Timestamp of the first frame that " \
@@ -223,7 +217,6 @@ static const AVFilterPad trim_outputs[] = { · 97 unmodified lines
223217 {
224218 .name = "default",
225219 .type = AVMEDIA_TYPE_VIDEO,
226− .config_props = config_output,
227220 },
228221 { NULL }
229222 };
@@ -378,7 +371,6 @@ static const AVFilterPad atrim_outputs[] = { · 148 unmodified lines
378371 {
379372 .name = "default",
380373 .type = AVMEDIA_TYPE_AUDIO,
381− .config_props = config_output,
382374 },
383375 { NULL }
384376 };
libavfilter/vf_atadenoise.c+0−7
@@ -285,12 +285,6 @@ static int config_input(AVFilterLink *inlink) · 284 unmodified lines
285285 return 0;
286286 }
287287
288−static int config_output(AVFilterLink *outlink)
289−{
290− outlink->flags |= FF_LINK_FLAG_REQUEST_LOOP;
291− return 0;
292−}
293−
294288 static int filter_frame(AVFilterLink *inlink, AVFrame *buf)
295289 {
296290 AVFilterContext *ctx = inlink->dst;
@@ -401,7 +395,6 @@ static const AVFilterPad outputs[] = { · 104 unmodified lines
401395 .name = "default",
402396 .type = AVMEDIA_TYPE_VIDEO,
403397 .request_frame = request_frame,
404− .config_props = config_output,
405398 },
406399 { NULL }
407400 };
libavfilter/vf_blend.c+2−3
@@ -467,9 +467,8 @@ static int config_output(AVFilterLink *outlink) · 466 unmodified lines
467467 is_16bit = pix_desc->comp[0].depth == 16;
468468 s->nb_planes = av_pix_fmt_count_planes(toplink->format);
469469
470− if (s->tblend)
471− outlink->flags |= FF_LINK_FLAG_REQUEST_LOOP;
472− else if ((ret = ff_dualinput_init(ctx, &s->dinput)) < 0)
470+ if (!s->tblend)
471+ if ((ret = ff_dualinput_init(ctx, &s->dinput)) < 0)
473472 return ret;
474473
475474 for (plane = 0; plane < FF_ARRAY_ELEMS(s->params); plane++) {
libavfilter/vf_decimate.c+0−1
@@ -372,7 +372,6 @@ static int config_output(AVFilterLink *outlink) · 371 unmodified lines
372372 fps = av_mul_q(fps, (AVRational){dm->cycle - 1, dm->cycle});
373373 av_log(ctx, AV_LOG_VERBOSE, "FPS: %d/%d -> %d/%d\n",
374374 inlink->frame_rate.num, inlink->frame_rate.den, fps.num, fps.den);
375− outlink->flags |= FF_LINK_FLAG_REQUEST_LOOP;
376375 outlink->time_base = inlink->time_base;
377376 outlink->frame_rate = fps;
378377 outlink->sample_aspect_ratio = inlink->sample_aspect_ratio;
libavfilter/vf_detelecine.c+0−1
@@ -170,7 +170,6 @@ static int config_output(AVFilterLink *outlink) · 169 unmodified lines
170170 av_log(ctx, AV_LOG_VERBOSE, "FPS: %d/%d -> %d/%d\n",
171171 inlink->frame_rate.num, inlink->frame_rate.den, fps.num, fps.den);
172172
173− outlink->flags |= FF_LINK_FLAG_REQUEST_LOOP;
174173 outlink->frame_rate = fps;
175174 outlink->time_base = av_mul_q(inlink->time_base, s->pts);
176175 av_log(ctx, AV_LOG_VERBOSE, "TB: %d/%d -> %d/%d\n",
libavfilter/vf_fieldmatch.c+0−1
@@ -953,7 +953,6 @@ static int config_output(AVFilterLink *outlink) · 952 unmodified lines
953953 const AVFilterLink *inlink =
954954 ctx->inputs[fm->ppsrc ? INPUT_CLEANSRC : INPUT_MAIN];
955955
956− outlink->flags |= FF_LINK_FLAG_REQUEST_LOOP;
957956 outlink->time_base = inlink->time_base;
958957 outlink->sample_aspect_ratio = inlink->sample_aspect_ratio;
959958 outlink->frame_rate = inlink->frame_rate;
libavfilter/vf_framerate.c+0−1
@@ -639,7 +639,6 @@ static int config_output(AVFilterLink *outlink) · 638 unmodified lines
639639
640640 outlink->frame_rate = s->dest_frame_rate;
641641 outlink->time_base = s->dest_time_base;
642− outlink->flags |= FF_LINK_FLAG_REQUEST_LOOP;
643642
644643 ff_dlog(ctx,
645644 "config_output() output time base:%u/%u (%f) w:%d h:%d\n",
libavfilter/vf_framestep.c+0−1
@@ -49,7 +49,6 @@ static int config_output_props(AVFilterLink *outlink) · 48 unmodified lines
4949 FrameStepContext *framestep = ctx->priv;
5050 AVFilterLink *inlink = ctx->inputs[0];
5151
52− outlink->flags |= FF_LINK_FLAG_REQUEST_LOOP;
5352 outlink->frame_rate =
5453 av_div_q(inlink->frame_rate, (AVRational){framestep->frame_step, 1});
5554
libavfilter/vf_idet.c+0−7
@@ -400,12 +400,6 @@ static int query_formats(AVFilterContext *ctx) · 399 unmodified lines
400400 return ff_set_common_formats(ctx, fmts_list);
401401 }
402402
403−static int config_output(AVFilterLink *outlink)
404−{
405− outlink->flags |= FF_LINK_FLAG_REQUEST_LOOP;
406− return 0;
407−}
408−
409403 static av_cold int init(AVFilterContext *ctx)
410404 {
411405 IDETContext *idet = ctx->priv;
@@ -440,7 +434,6 @@ static const AVFilterPad idet_outputs[] = { · 28 unmodified lines
440434 {
441435 .name = "default",
442436 .type = AVMEDIA_TYPE_VIDEO,
443− .config_props = config_output,
444437 .request_frame = request_frame
445438 },
446439 { NULL }
libavfilter/vf_interlace.c+0−1
@@ -113,7 +113,6 @@ static int config_out_props(AVFilterLink *outlink) · 112 unmodified lines
113113 // half framerate
114114 outlink->time_base.num *= 2;
115115 outlink->frame_rate.den *= 2;
116− outlink->flags |= FF_LINK_FLAG_REQUEST_LOOP;
117116
118117
119118 if (s->lowpass) {
libavfilter/vf_palettegen.c+0−1
@@ -520,7 +520,6 @@ static int config_output(AVFilterLink *outlink) · 519 unmodified lines
520520 {
521521 outlink->w = outlink->h = 16;
522522 outlink->sample_aspect_ratio = av_make_q(1, 1);
523− outlink->flags |= FF_LINK_FLAG_REQUEST_LOOP;
524523 return 0;
525524 }
526525
libavfilter/vf_pullup.c+0−7
@@ -220,12 +220,6 @@ static int config_input(AVFilterLink *inlink) · 219 unmodified lines
220220 return 0;
221221 }
222222
223−static int config_output(AVFilterLink *outlink)
224−{
225− outlink->flags |= FF_LINK_FLAG_REQUEST_LOOP;
226− return 0;
227−}
228−
229223 static PullupBuffer *pullup_lock_buffer(PullupBuffer *b, int parity)
230224 {
231225 if (!b)
@@ -766,7 +760,6 @@ static const AVFilterPad pullup_outputs[] = { · 534 unmodified lines
766760 {
767761 .name = "default",
768762 .type = AVMEDIA_TYPE_VIDEO,
769− .config_props = config_output,
770763 },
771764 { NULL }
772765 };
libavfilter/vf_random.c+0−7
@@ -64,12 +64,6 @@ static av_cold int init(AVFilterContext *ctx) · 63 unmodified lines
6464 return 0;
6565 }
6666
67−static int config_output(AVFilterLink *outlink)
68−{
69− outlink->flags |= FF_LINK_FLAG_REQUEST_LOOP;
70− return 0;
71−}
72−
7367 static int filter_frame(AVFilterLink *inlink, AVFrame *in)
7468 {
7569 AVFilterContext *ctx = inlink->dst;
@@ -128,7 +122,6 @@ static const AVFilterPad random_outputs[] = { · 52 unmodified lines
128122 .name = "default",
129123 .type = AVMEDIA_TYPE_VIDEO,
130124 .request_frame = request_frame,
131− .config_props = config_output,
132125 },
133126 { NULL }
134127 };
libavfilter/vf_stereo3d.c+0−1
@@ -373,7 +373,6 @@ static int config_output(AVFilterLink *outlink) · 372 unmodified lines
373373 break;
374374 case ALTERNATING_RL:
375375 case ALTERNATING_LR:
376− outlink->flags |= FF_LINK_FLAG_REQUEST_LOOP;
377376 fps.den *= 2;
378377 tb.num *= 2;
379378 break;
libavfilter/vf_telecine.c+0−1
@@ -157,7 +157,6 @@ static int config_output(AVFilterLink *outlink) · 156 unmodified lines
157157 av_log(ctx, AV_LOG_VERBOSE, "FPS: %d/%d -> %d/%d\n",
158158 inlink->frame_rate.num, inlink->frame_rate.den, fps.num, fps.den);
159159
160− outlink->flags |= FF_LINK_FLAG_REQUEST_LOOP;
161160 outlink->frame_rate = fps;
162161 outlink->time_base = av_mul_q(inlink->time_base, s->pts);
163162 av_log(ctx, AV_LOG_VERBOSE, "TB: %d/%d -> %d/%d\n",
libavfilter/vf_tile.c+0−2
@@ -116,8 +116,6 @@ static int config_props(AVFilterLink *outlink) · 115 unmodified lines
116116 ff_draw_init(&tile->draw, inlink->format, 0);
117117 ff_draw_color(&tile->draw, &tile->blank, tile->rgba_color);
118118
119− outlink->flags |= FF_LINK_FLAG_REQUEST_LOOP;
120−
121119 return 0;
122120 }
123121
libavfilter/vf_tinterlace.c+0−1
@@ -117,7 +117,6 @@ static int config_out_props(AVFilterLink *outlink) · 116 unmodified lines
117117 int i;
118118
119119 tinterlace->vsub = desc->log2_chroma_h;
120− outlink->flags |= FF_LINK_FLAG_REQUEST_LOOP;
121120 outlink->w = inlink->w;
122121 outlink->h = tinterlace->mode == MODE_MERGE || tinterlace->mode == MODE_PAD ?
123122 inlink->h*2 : inlink->h;
libavfilter/vf_w3fdif.c+0−1
@@ -117,7 +117,6 @@ static int config_output(AVFilterLink *outlink) · 116 unmodified lines
117117 outlink->time_base.den = inlink->time_base.den * 2;
118118 outlink->frame_rate.num = inlink->frame_rate.num * 2;
119119 outlink->frame_rate.den = inlink->frame_rate.den;
120− outlink->flags |= FF_LINK_FLAG_REQUEST_LOOP;
121120
122121 return 0;
123122 }

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