lavfi/vf_midequalizer: move to "activate" design.

Nicolas George committed 9 years ago

Commit 62060841 parent b8944152 files · +11 −19Browse files

Unified · Split

2 files

libavfilter/Makefile +1 −1
libavfilter/vf_midequalizer.c +10 −18

@@ -231,7 +231,7 @@ OBJS-$(CONFIG_MCDEINT_FILTER) += vf_mcdeint.o · 230 unmodified lines
231	OBJS-$(CONFIG_MERGEPLANES_FILTER) += vf_mergeplanes.o framesync.o	231	OBJS-$(CONFIG_MERGEPLANES_FILTER) += vf_mergeplanes.o framesync.o
232	OBJS-$(CONFIG_MESTIMATE_FILTER) += vf_mestimate.o motion_estimation.o	232	OBJS-$(CONFIG_MESTIMATE_FILTER) += vf_mestimate.o motion_estimation.o
233	OBJS-$(CONFIG_METADATA_FILTER) += f_metadata.o	233	OBJS-$(CONFIG_METADATA_FILTER) += f_metadata.o
234	OBJS-$(CONFIG_MIDEQUALIZER_FILTER) += vf_midequalizer.o framesync.o	234	OBJS-$(CONFIG_MIDEQUALIZER_FILTER) += vf_midequalizer.o framesync2.o
235	OBJS-$(CONFIG_MINTERPOLATE_FILTER) += vf_minterpolate.o motion_estimation.o	235	OBJS-$(CONFIG_MINTERPOLATE_FILTER) += vf_minterpolate.o motion_estimation.o
236	OBJS-$(CONFIG_MPDECIMATE_FILTER) += vf_mpdecimate.o	236	OBJS-$(CONFIG_MPDECIMATE_FILTER) += vf_mpdecimate.o
237	OBJS-$(CONFIG_NEGATE_FILTER) += vf_lut.o	237	OBJS-$(CONFIG_NEGATE_FILTER) += vf_lut.o

libavfilter/vf_midequalizer.c+10−18

 #include "formats.h"
 #include "internal.h"
 #include "video.h"
-#include "framesync.h"
+#include "framesync2.h"
 typedef struct MidEqualizerContext {
     const AVClass *class;
     AVFrame *out, *in0, *in1;
     int ret;
-    if ((ret = ff_framesync_get_frame(&s->fs, 0, &in0, 0)) < 0 ||
+    if ((ret = ff_framesync2_get_frame(&s->fs, 0, &in0, 0)) < 0 ||
-        (ret = ff_framesync_get_frame(&s->fs, 1, &in1, 0)) < 0)
+        (ret = ff_framesync2_get_frame(&s->fs, 1, &in1, 0)) < 0)
         return ret;
     if (ctx->is_disabled) {
     outlink->sample_aspect_ratio = in0->sample_aspect_ratio;
     outlink->frame_rate = in0->frame_rate;
-    if ((ret = ff_framesync_init(&s->fs, ctx, 2)) < 0)
+    if ((ret = ff_framesync2_init(&s->fs, ctx, 2)) < 0)
         return ret;
     in = s->fs.in;
     s->fs.opaque   = s;
     s->fs.on_event = process_frame;
-    return ff_framesync_configure(&s->fs);
+    return ff_framesync2_configure(&s->fs);
 }
-static int filter_frame(AVFilterLink *inlink, AVFrame *buf)
+static int activate(AVFilterContext *ctx)
 {
-    MidEqualizerContext *s = inlink->dst->priv;
+    MidEqualizerContext *s = ctx->priv;
-    return ff_framesync_filter_frame(&s->fs, inlink, buf);
+    return ff_framesync2_activate(&s->fs);
-}
-static int request_frame(AVFilterLink *outlink)
-{
-    MidEqualizerContext *s = outlink->src->priv;
-    return ff_framesync_request_frame(&s->fs, outlink);
 }
 static av_cold void uninit(AVFilterContext *ctx)
 {
     MidEqualizerContext *s = ctx->priv;
-    ff_framesync_uninit(&s->fs);
+    ff_framesync2_uninit(&s->fs);
     av_freep(&s->histogram[0]);
     av_freep(&s->histogram[1]);
     av_freep(&s->cchange);
     {
         .name         = "in0",
         .type         = AVMEDIA_TYPE_VIDEO,
-        .filter_frame = filter_frame,
         .config_props = config_input0,
     },
     {
         .name         = "in1",
         .type         = AVMEDIA_TYPE_VIDEO,
-        .filter_frame = filter_frame,
         .config_props = config_input1,
     },
     { NULL }
         .name          = "default",
         .type          = AVMEDIA_TYPE_VIDEO,
         .config_props  = config_output,
-        .request_frame = request_frame,
     },
     { NULL }
 };
     .priv_size     = sizeof(MidEqualizerContext),
     .uninit        = uninit,
     .query_formats = query_formats,
+    .activate      = activate,
     .inputs        = midequalizer_inputs,
     .outputs       = midequalizer_outputs,
     .priv_class    = &midequalizer_class,

lavfi/vf_midequalizer: move to "activate" design.

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code