lavfi: move AVFilterLink.m{ax,in}_samples to FilterLink

Also, document who sets these fields and when.

Anton Khirnov committed 2 years ago

Commit 99ee7a91 parent 54754ee7 files · +40 −27Browse files

Unified · Split

7 files

libavfilter/af_firequalizer.c +3 −1
libavfilter/af_lv2.c +2 −1
libavfilter/af_replaygain.c +4 −2
libavfilter/avfilter.c +7 −6
libavfilter/avfilter.h +0 −15
libavfilter/buffersink.c +3 −2
libavfilter/filters.h +21 −0

 #include "libavutil/avassert.h"
 #include "libavutil/tx.h"
 #include "avfilter.h"
+#include "filters.h"
 #include "internal.h"
 #include "audio.h"
 static int config_input(AVFilterLink *inlink)
 {
+    FilterLink *l = ff_filter_link(inlink);
     AVFilterContext *ctx = inlink->dst;
     FIREqualizerContext *s = ctx->priv;
     float iscale, scale = 1.f;
            inlink->sample_rate, inlink->ch_layout.nb_channels, s->analysis_rdft_len, s->rdft_len, s->fir_len, s->nsamples_max);
     if (s->fixed)
-        inlink->min_samples = inlink->max_samples = s->nsamples_max;
+        l->min_samples = l->max_samples = s->nsamples_max;
     return generate_kernel(ctx, SELECT_GAIN(s), SELECT_GAIN_ENTRY(s));
 }

libavfilter/af_lv2.c+2−1

 #include "libavutil/opt.h"
 #include "audio.h"
 #include "avfilter.h"
+#include "filters.h"
 #include "formats.h"
 #include "internal.h"
         (lilv_plugin_has_feature(s->plugin, s->powerOf2BlockLength) ||
          lilv_plugin_has_feature(s->plugin, s->fixedBlockLength) ||
          lilv_plugin_has_feature(s->plugin, s->boundedBlockLength))) {
-        AVFilterLink *inlink = ctx->inputs[0];
+        FilterLink *inlink = ff_filter_link(ctx->inputs[0]);
         inlink->min_samples = inlink->max_samples = 4096;
     }

libavfilter/af_replaygain.c+4−2

 #include "libavutil/opt.h"
 #include "audio.h"
 #include "avfilter.h"
+#include "filters.h"
 #include "formats.h"
 #include "internal.h"
 static int config_input(AVFilterLink *inlink)
 {
+    FilterLink *l = ff_filter_link(inlink);
     AVFilterContext *ctx = inlink->dst;
     ReplayGainContext *s = ctx->priv;
     int i;
     s->yule_hist_i   = 20;
     s->butter_hist_i = 4;
-    inlink->min_samples =
+    l->min_samples =
-    inlink->max_samples = inlink->sample_rate / 20;
+    l->max_samples = inlink->sample_rate / 20;
     return 0;
 }

libavfilter/avfilter.c+7−6

 static int take_samples(FilterLinkInternal *li, unsigned min, unsigned max,
                         AVFrame **rframe)
 {
-    AVFilterLink *link = &li->l.pub;
+    FilterLink *l = &li->l;
+    AVFilterLink *link = &l->pub;
     AVFrame *frame0, *frame, *buf;
     unsigned nb_samples, nb_frames, i, p;
     int ret;
     /* Note: this function relies on no format changes and must only be
        called with enough samples. */
-    av_assert1(samples_ready(li, link->min_samples));
+    av_assert1(samples_ready(li, l->min_samples));
     frame0 = frame = ff_framequeue_peek(&li->fifo, 0);
     if (!li->fifo.samples_skipped && frame->nb_samples >= min && frame->nb_samples <= max) {
         *rframe = ff_framequeue_take(&li->fifo);
     int ret;
     av_assert1(ff_framequeue_queued_frames(&li->fifo));
-    ret = link->min_samples ?
+    ret = li->l.min_samples ?
-          ff_inlink_consume_samples(link, link->min_samples, link->max_samples, &frame) :
+          ff_inlink_consume_samples(link, li->l.min_samples, li->l.max_samples, &frame) :
           ff_inlink_consume_frame(link, &frame);
     av_assert1(ret);
     if (ret < 0) {
     }
     for (i = 0; i < filter->nb_inputs; i++) {
-        if (samples_ready(ff_link_internal(filter->inputs[i]),
+        FilterLinkInternal *li = ff_link_internal(filter->inputs[i]);
-                          filter->inputs[i]->min_samples)) {
+        if (samples_ready(li, li->l.min_samples)) {
             return ff_filter_frame_to_filter(filter->inputs[i]);
         }
     }

libavfilter/avfilter.h+0−15

@@ -625,21 +625,6 @@ struct AVFilterLink { · 624 unmodified lines
625	*/	625	*/
626	AVRational frame_rate;	626	AVRational frame_rate;
627		627
628	/**
629	* Minimum number of samples to filter at once. If filter_frame() is
630	* called with fewer samples, it will accumulate them in fifo.
631	* This field and the related ones must not be changed after filtering
632	* has started.
633	* If 0, all related fields are ignored.
634	*/
635	int min_samples;
636
637	/**
638	* Maximum number of samples to filter at once. If filter_frame() is
639	* called with more samples, it will split them.
640	*/
641	int max_samples;
642
643	/**	628	/**
644	* Number of past frames sent through the link.	629	* Number of past frames sent through the link.
645	*/	630	*/

libavfilter/buffersink.c+3−2

 int attribute_align_arg av_buffersink_get_frame_flags(AVFilterContext *ctx, AVFrame *frame, int flags)
 {
-    return get_frame_internal(ctx, frame, flags, ctx->inputs[0]->min_samples);
+    return get_frame_internal(ctx, frame, flags,
+                              ff_filter_link(ctx->inputs[0])->min_samples);
 }
 int attribute_align_arg av_buffersink_get_samples(AVFilterContext *ctx,
 void av_buffersink_set_frame_size(AVFilterContext *ctx, unsigned frame_size)
 {
-    AVFilterLink *inlink = ctx->inputs[0];
+    FilterLink *inlink = ff_filter_link(ctx->inputs[0]);
     inlink->min_samples = inlink->max_samples = frame_size;
 }

libavfilter/filters.h+21−0

@@ -41,8 +41,29 @@ · 40 unmodified lines
41	*/	41	*/
42	typedef struct FilterLink {	42	typedef struct FilterLink {
43	AVFilterLink pub;	43	AVFilterLink pub;
		44
		45	/**
		46	* Minimum number of samples to filter at once.
		47	*
		48	* May be set by the link destination filter in its config_props().
		49	* If 0, all related fields are ignored.
		50	*/
		51	int min_samples;
		52
		53	/**
		54	* Maximum number of samples to filter at once. If filter_frame() is
		55	* called with more samples, it will split them.
		56	*
		57	* May be set by the link destination filter in its config_props().
		58	*/
		59	int max_samples;
44	} FilterLink;	60	} FilterLink;
45		61
		62	static inline FilterLink* ff_filter_link(AVFilterLink *link)
		63	{
		64	return (FilterLink*)link;
		65	}
		66
46	/**	67	/**
47	* Mark a filter ready and schedule it for activation.	68	* Mark a filter ready and schedule it for activation.
48	*	69	*

lavfi: move AVFilterLink.m{ax,in}_samples to FilterLink

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code