From 5dbb111900b6208813fe299912d4ba8297c4525e Mon Sep 17 00:00:00 2001
From: Nicolas George <george@nsup.org>
Date: Mon, 17 Jul 2017 16:54:23 +0200
Subject: [PATCH] lavfi/vf_hysteresis: move to "activate" design.

---
 libavfilter/Makefile        |  2 +-
 libavfilter/vf_hysteresis.c | 28 ++++++++++------------------
 2 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/libavfilter/Makefile b/libavfilter/Makefile
index 27ceb339a4..441e07843f 100644
--- a/libavfilter/Makefile
+++ b/libavfilter/Makefile
@@ -208,7 +208,7 @@ OBJS-$(CONFIG_HWDOWNLOAD_FILTER)             += vf_hwdownload.o
 OBJS-$(CONFIG_HWMAP_FILTER)                  += vf_hwmap.o
 OBJS-$(CONFIG_HWUPLOAD_CUDA_FILTER)          += vf_hwupload_cuda.o
 OBJS-$(CONFIG_HWUPLOAD_FILTER)               += vf_hwupload.o
-OBJS-$(CONFIG_HYSTERESIS_FILTER)             += vf_hysteresis.o framesync.o
+OBJS-$(CONFIG_HYSTERESIS_FILTER)             += vf_hysteresis.o framesync2.o
 OBJS-$(CONFIG_IDET_FILTER)                   += vf_idet.o
 OBJS-$(CONFIG_IL_FILTER)                     += vf_il.o
 OBJS-$(CONFIG_INFLATE_FILTER)                += vf_neighbor.o
diff --git a/libavfilter/vf_hysteresis.c b/libavfilter/vf_hysteresis.c
index c0369b2066..c3b769b8a7 100644
--- a/libavfilter/vf_hysteresis.c
+++ b/libavfilter/vf_hysteresis.c
@@ -26,7 +26,7 @@
 #include "formats.h"
 #include "internal.h"
 #include "video.h"
-#include "framesync.h"
+#include "framesync2.h"
 
 #define OFFSET(x) offsetof(HysteresisContext, x)
 #define FLAGS AV_OPT_FLAG_FILTERING_PARAM|AV_OPT_FLAG_VIDEO_PARAM
@@ -94,8 +94,8 @@ static int process_frame(FFFrameSync *fs)
     AVFrame *out, *base, *alt;
     int ret;
 
-    if ((ret = ff_framesync_get_frame(&s->fs, 0, &base, 0)) < 0 ||
-        (ret = ff_framesync_get_frame(&s->fs, 1, &alt,  0)) < 0)
+    if ((ret = ff_framesync2_get_frame(&s->fs, 0, &base, 0)) < 0 ||
+        (ret = ff_framesync2_get_frame(&s->fs, 1, &alt,  0)) < 0)
         return ret;
 
     if (ctx->is_disabled) {
@@ -324,7 +324,7 @@ static int config_output(AVFilterLink *outlink)
     outlink->sample_aspect_ratio = base->sample_aspect_ratio;
     outlink->frame_rate = base->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;
@@ -339,26 +339,20 @@ static int config_output(AVFilterLink *outlink)
     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)
 {
-    HysteresisContext *s = inlink->dst->priv;
-    return ff_framesync_filter_frame(&s->fs, inlink, buf);
-}
-
-static int request_frame(AVFilterLink *outlink)
-{
-    HysteresisContext *s = outlink->src->priv;
-    return ff_framesync_request_frame(&s->fs, outlink);
+    HysteresisContext *s = ctx->priv;
+    return ff_framesync2_activate(&s->fs);
 }
 
 static av_cold void uninit(AVFilterContext *ctx)
 {
     HysteresisContext *s = ctx->priv;
 
-    ff_framesync_uninit(&s->fs);
+    ff_framesync2_uninit(&s->fs);
     av_freep(&s->map);
     av_freep(&s->xy);
 }
@@ -367,13 +361,11 @@ static const AVFilterPad hysteresis_inputs[] = {
     {
         .name         = "base",
         .type         = AVMEDIA_TYPE_VIDEO,
-        .filter_frame = filter_frame,
         .config_props = config_input,
     },
     {
         .name         = "alt",
         .type         = AVMEDIA_TYPE_VIDEO,
-        .filter_frame = filter_frame,
     },
     { NULL }
 };
@@ -383,7 +375,6 @@ static const AVFilterPad hysteresis_outputs[] = {
         .name          = "default",
         .type          = AVMEDIA_TYPE_VIDEO,
         .config_props  = config_output,
-        .request_frame = request_frame,
     },
     { NULL }
 };
@@ -394,6 +385,7 @@ AVFilter ff_vf_hysteresis = {
     .priv_size     = sizeof(HysteresisContext),
     .uninit        = uninit,
     .query_formats = query_formats,
+    .activate      = activate,
     .inputs        = hysteresis_inputs,
     .outputs       = hysteresis_outputs,
     .priv_class    = &hysteresis_class,
-- 
GitLab