Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mpc-hc/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas George <george@nsup.org>2017-07-17 15:37:00 +0300
committerNicolas George <george@nsup.org>2017-07-30 13:26:34 +0300
commit0dd8320e16bcdbe6b928e99489cf47abd16d3255 (patch)
tree66c07f326391e0dc37c924da75633a21046b79ef /libavfilter
parent4e0e9ce2dc67a94c98d40a46e91fe5aa53ad0376 (diff)
lavfi/vf_stack: move to "activate" design.
Diffstat (limited to 'libavfilter')
-rw-r--r--libavfilter/Makefile4
-rw-r--r--libavfilter/vf_stack.c32
2 files changed, 15 insertions, 21 deletions
diff --git a/libavfilter/Makefile b/libavfilter/Makefile
index ee163613be..6f8e7b5ae1 100644
--- a/libavfilter/Makefile
+++ b/libavfilter/Makefile
@@ -202,7 +202,7 @@ OBJS-$(CONFIG_HISTEQ_FILTER) += vf_histeq.o
OBJS-$(CONFIG_HISTOGRAM_FILTER) += vf_histogram.o
OBJS-$(CONFIG_HQDN3D_FILTER) += vf_hqdn3d.o
OBJS-$(CONFIG_HQX_FILTER) += vf_hqx.o
-OBJS-$(CONFIG_HSTACK_FILTER) += vf_stack.o framesync.o
+OBJS-$(CONFIG_HSTACK_FILTER) += vf_stack.o framesync2.o
OBJS-$(CONFIG_HUE_FILTER) += vf_hue.o
OBJS-$(CONFIG_HWDOWNLOAD_FILTER) += vf_hwdownload.o
OBJS-$(CONFIG_HWMAP_FILTER) += vf_hwmap.o
@@ -322,7 +322,7 @@ OBJS-$(CONFIG_VFLIP_FILTER) += vf_vflip.o
OBJS-$(CONFIG_VIDSTABDETECT_FILTER) += vidstabutils.o vf_vidstabdetect.o
OBJS-$(CONFIG_VIDSTABTRANSFORM_FILTER) += vidstabutils.o vf_vidstabtransform.o
OBJS-$(CONFIG_VIGNETTE_FILTER) += vf_vignette.o
-OBJS-$(CONFIG_VSTACK_FILTER) += vf_stack.o framesync.o
+OBJS-$(CONFIG_VSTACK_FILTER) += vf_stack.o framesync2.o
OBJS-$(CONFIG_W3FDIF_FILTER) += vf_w3fdif.o
OBJS-$(CONFIG_WAVEFORM_FILTER) += vf_waveform.o
OBJS-$(CONFIG_WEAVE_FILTER) += vf_weave.o
diff --git a/libavfilter/vf_stack.c b/libavfilter/vf_stack.c
index 03643b6f96..fa8a02257e 100644
--- a/libavfilter/vf_stack.c
+++ b/libavfilter/vf_stack.c
@@ -26,7 +26,7 @@
#include "avfilter.h"
#include "formats.h"
#include "internal.h"
-#include "framesync.h"
+#include "framesync2.h"
#include "video.h"
typedef struct StackContext {
@@ -58,12 +58,6 @@ static int query_formats(AVFilterContext *ctx)
return ff_set_common_formats(ctx, pix_fmts);
}
-static int filter_frame(AVFilterLink *inlink, AVFrame *in)
-{
- StackContext *s = inlink->dst->priv;
- return ff_framesync_filter_frame(&s->fs, inlink, in);
-}
-
static av_cold int init(AVFilterContext *ctx)
{
StackContext *s = ctx->priv;
@@ -83,7 +77,6 @@ static av_cold int init(AVFilterContext *ctx)
pad.name = av_asprintf("input%d", i);
if (!pad.name)
return AVERROR(ENOMEM);
- pad.filter_frame = filter_frame;
if ((ret = ff_insert_inpad(ctx, i, &pad)) < 0) {
av_freep(&pad.name);
@@ -104,7 +97,7 @@ static int process_frame(FFFrameSync *fs)
int i, p, ret, offset[4] = { 0 };
for (i = 0; i < s->nb_inputs; i++) {
- if ((ret = ff_framesync_get_frame(&s->fs, i, &in[i], 0)) < 0)
+ if ((ret = ff_framesync2_get_frame(&s->fs, i, &in[i], 0)) < 0)
return ret;
}
@@ -187,7 +180,7 @@ static int config_output(AVFilterLink *outlink)
outlink->time_base = time_base;
outlink->frame_rate = frame_rate;
- if ((ret = ff_framesync_init(&s->fs, ctx, s->nb_inputs)) < 0)
+ if ((ret = ff_framesync2_init(&s->fs, ctx, s->nb_inputs)) < 0)
return ret;
in = s->fs.in;
@@ -203,13 +196,7 @@ static int config_output(AVFilterLink *outlink)
in[i].after = s->shortest ? EXT_STOP : EXT_INFINITY;
}
- return ff_framesync_configure(&s->fs);
-}
-
-static int request_frame(AVFilterLink *outlink)
-{
- StackContext *s = outlink->src->priv;
- return ff_framesync_request_frame(&s->fs, outlink);
+ return ff_framesync2_configure(&s->fs);
}
static av_cold void uninit(AVFilterContext *ctx)
@@ -217,13 +204,19 @@ static av_cold void uninit(AVFilterContext *ctx)
StackContext *s = ctx->priv;
int i;
- ff_framesync_uninit(&s->fs);
+ ff_framesync2_uninit(&s->fs);
av_freep(&s->frames);
for (i = 0; i < ctx->nb_inputs; i++)
av_freep(&ctx->input_pads[i].name);
}
+static int activate(AVFilterContext *ctx)
+{
+ StackContext *s = ctx->priv;
+ return ff_framesync2_activate(&s->fs);
+}
+
#define OFFSET(x) offsetof(StackContext, x)
#define FLAGS AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_FILTERING_PARAM
static const AVOption stack_options[] = {
@@ -237,7 +230,6 @@ static const AVFilterPad outputs[] = {
.name = "default",
.type = AVMEDIA_TYPE_VIDEO,
.config_props = config_output,
- .request_frame = request_frame,
},
{ NULL }
};
@@ -256,6 +248,7 @@ AVFilter ff_vf_hstack = {
.outputs = outputs,
.init = init,
.uninit = uninit,
+ .activate = activate,
.flags = AVFILTER_FLAG_DYNAMIC_INPUTS,
};
@@ -275,6 +268,7 @@ AVFilter ff_vf_vstack = {
.outputs = outputs,
.init = init,
.uninit = uninit,
+ .activate = activate,
.flags = AVFILTER_FLAG_DYNAMIC_INPUTS,
};