lavfi/vf_mergeplanes: move to "activate" design.

Nicolas George committed 9 years ago

Commit 0bc331b1 parent a5e3b0c2 files · +10 −17Browse files

Unified · Split

2 files

libavfilter/Makefile +1 −1
libavfilter/vf_mergeplanes.c +9 −16

@@ -228,7 +228,7 @@ OBJS-$(CONFIG_LUTYUV_FILTER) += vf_lut.o · 227 unmodified lines
228	OBJS-$(CONFIG_MASKEDCLAMP_FILTER) += vf_maskedclamp.o framesync.o	228	OBJS-$(CONFIG_MASKEDCLAMP_FILTER) += vf_maskedclamp.o framesync.o
229	OBJS-$(CONFIG_MASKEDMERGE_FILTER) += vf_maskedmerge.o framesync2.o	229	OBJS-$(CONFIG_MASKEDMERGE_FILTER) += vf_maskedmerge.o framesync2.o
230	OBJS-$(CONFIG_MCDEINT_FILTER) += vf_mcdeint.o	230	OBJS-$(CONFIG_MCDEINT_FILTER) += vf_mcdeint.o
231	OBJS-$(CONFIG_MERGEPLANES_FILTER) += vf_mergeplanes.o framesync.o	231	OBJS-$(CONFIG_MERGEPLANES_FILTER) += vf_mergeplanes.o framesync2.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 framesync2.o	234	OBJS-$(CONFIG_MIDEQUALIZER_FILTER) += vf_midequalizer.o framesync2.o

libavfilter/vf_mergeplanes.c+9−16

 #include "libavutil/pixdesc.h"
 #include "avfilter.h"
 #include "internal.h"
-#include "framesync.h"
+#include "framesync2.h"
 typedef struct InputParam {
     int depth[4];
 AVFILTER_DEFINE_CLASS(mergeplanes);
-static int filter_frame(AVFilterLink *inlink, AVFrame *in)
-{
-    MergePlanesContext *s = inlink->dst->priv;
-    return ff_framesync_filter_frame(&s->fs, inlink, in);
-}
 static av_cold int init(AVFilterContext *ctx)
 {
     MergePlanesContext *s = ctx->priv;
         pad.name = av_asprintf("in%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);
     int i, ret;
     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;
     }
     FFFrameSyncIn *in;
     int i, ret;
-    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;
         }
     }
-    return ff_framesync_configure(&s->fs);
+    return ff_framesync2_configure(&s->fs);
 fail:
     return AVERROR(EINVAL);
 }
-static int request_frame(AVFilterLink *outlink)
+static int activate(AVFilterContext *ctx)
 {
-    MergePlanesContext *s = outlink->src->priv;
+    MergePlanesContext *s = ctx->priv;
-    return ff_framesync_request_frame(&s->fs, outlink);
+    return ff_framesync2_activate(&s->fs);
 }
 static av_cold void uninit(AVFilterContext *ctx)
     MergePlanesContext *s = ctx->priv;
     int i;
-    ff_framesync_uninit(&s->fs);
+    ff_framesync2_uninit(&s->fs);
     for (i = 0; i < ctx->nb_inputs; i++)
         av_freep(&ctx->input_pads[i].name);
         .name          = "default",
         .type          = AVMEDIA_TYPE_VIDEO,
         .config_props  = config_output,
-        .request_frame = request_frame,
     },
     { NULL }
 };
     .init          = init,
     .uninit        = uninit,
     .query_formats = query_formats,
+    .activate      = activate,
     .inputs        = NULL,
     .outputs       = mergeplanes_outputs,
     .flags         = AVFILTER_FLAG_DYNAMIC_INPUTS,

lavfi/vf_mergeplanes: move to "activate" design.

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code