lavfi/vf_maskedmerge: move to "activate" design.

Nicolas George committed 9 years ago

Commit a5e3b0c1 parent 62060843 files · +12 −21Browse files

Unified · Split

3 files

libavfilter/Makefile +1 −1
libavfilter/maskedmerge.h +1 −1
libavfilter/vf_maskedmerge.c +10 −19

@@ -226,7 +226,7 @@ OBJS-$(CONFIG_LUT3D_FILTER) += vf_lut3d.o · 225 unmodified lines
226	OBJS-$(CONFIG_LUTRGB_FILTER) += vf_lut.o	226	OBJS-$(CONFIG_LUTRGB_FILTER) += vf_lut.o
227	OBJS-$(CONFIG_LUTYUV_FILTER) += vf_lut.o	227	OBJS-$(CONFIG_LUTYUV_FILTER) += vf_lut.o
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 framesync.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 framesync.o
232	OBJS-$(CONFIG_MESTIMATE_FILTER) += vf_mestimate.o motion_estimation.o	232	OBJS-$(CONFIG_MESTIMATE_FILTER) += vf_mestimate.o motion_estimation.o

libavfilter/maskedmerge.h+1−1

@@ -22,7 +22,7 @@ · 21 unmodified lines
22	#define AVFILTER_MASKEDMERGE_H	22	#define AVFILTER_MASKEDMERGE_H
23		23
24	#include "avfilter.h"	24	#include "avfilter.h"
25	#include "framesync.h"	25	#include "framesync2.h"
26		26
27	typedef struct MaskedMergeContext {	27	typedef struct MaskedMergeContext {
28	const AVClass *class;	28	const AVClass *class;

libavfilter/vf_maskedmerge.c+10−19

     AVFrame *out, *base, *overlay, *mask;
     int ret;
-    if ((ret = ff_framesync_get_frame(&s->fs, 0, &base,    0)) < 0 ||
+    if ((ret = ff_framesync2_get_frame(&s->fs, 0, &base,    0)) < 0 ||
-        (ret = ff_framesync_get_frame(&s->fs, 1, &overlay, 0)) < 0 ||
+        (ret = ff_framesync2_get_frame(&s->fs, 1, &overlay, 0)) < 0 ||
-        (ret = ff_framesync_get_frame(&s->fs, 2, &mask,    0)) < 0)
+        (ret = ff_framesync2_get_frame(&s->fs, 2, &mask,    0)) < 0)
         return ret;
     if (ctx->is_disabled) {
     if ((ret = av_image_fill_linesizes(s->linesize, outlink->format, outlink->w)) < 0)
         return ret;
-    if ((ret = ff_framesync_init(&s->fs, ctx, 3)) < 0)
+    if ((ret = ff_framesync2_init(&s->fs, ctx, 3)) < 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)
 {
-    MaskedMergeContext *s = inlink->dst->priv;
+    MaskedMergeContext *s = ctx->priv;
-    return ff_framesync_filter_frame(&s->fs, inlink, buf);
+    return ff_framesync2_activate(&s->fs);
-}
-static int request_frame(AVFilterLink *outlink)
-{
-    MaskedMergeContext *s = outlink->src->priv;
-    return ff_framesync_request_frame(&s->fs, outlink);
 }
 static av_cold void uninit(AVFilterContext *ctx)
 {
     MaskedMergeContext *s = ctx->priv;
-    ff_framesync_uninit(&s->fs);
+    ff_framesync2_uninit(&s->fs);
 }
 static const AVFilterPad maskedmerge_inputs[] = {
     {
         .name         = "base",
         .type         = AVMEDIA_TYPE_VIDEO,
-        .filter_frame = filter_frame,
         .config_props = config_input,
     },
     {
         .name         = "overlay",
         .type         = AVMEDIA_TYPE_VIDEO,
-        .filter_frame = filter_frame,
     },
     {
         .name         = "mask",
         .type         = AVMEDIA_TYPE_VIDEO,
-        .filter_frame = filter_frame,
     },
     { NULL }
 };
         .name          = "default",
         .type          = AVMEDIA_TYPE_VIDEO,
         .config_props  = config_output,
-        .request_frame = request_frame,
     },
     { NULL }
 };
     .priv_size     = sizeof(MaskedMergeContext),
     .uninit        = uninit,
     .query_formats = query_formats,
+    .activate      = activate,
     .inputs        = maskedmerge_inputs,
     .outputs       = maskedmerge_outputs,
     .priv_class    = &maskedmerge_class,

lavfi/vf_maskedmerge: move to "activate" design.

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code