diff mbox

[FFmpeg-devel,01/10] lavfi/vf_threshold: move to activate design.

Message ID 20170717154509.28255-1-george@nsup.org
State Accepted
Commit d07e25de763ef7c991bac99e9c05eb290869ed79
Headers show

Commit Message

Nicolas George July 17, 2017, 3:45 p.m. UTC 
Also fix missing dependency.

Signed-off-by: Nicolas George <george@nsup.org>
---
 libavfilter/Makefile       |  2 +-
 libavfilter/vf_threshold.c | 34 ++++++++++++----------------------
 2 files changed, 13 insertions(+), 23 deletions(-)


For all this series: the filter builds, FATE passes, but no further tests
have been done.

These are all the filters that use framesync directly except streamselect
that will require a more careful look. TODO: dualinput.

Comments

Paul B Mahol July 27, 2017, 1:27 p.m. UTC | #1 
On 7/17/17, Nicolas George <george@nsup.org> wrote:
> Also fix missing dependency.
>
> Signed-off-by: Nicolas George <george@nsup.org>
> ---
>  libavfilter/Makefile       |  2 +-
>  libavfilter/vf_threshold.c | 34 ++++++++++++----------------------
>  2 files changed, 13 insertions(+), 23 deletions(-)
>
>
> For all this series: the filter builds, FATE passes, but no further tests
> have been done.
>
> These are all the filters that use framesync directly except streamselect
> that will require a more careful look. TODO: dualinput.
>
>

Whole set LGTM.
Nicolas George July 30, 2017, 10:37 a.m. UTC | #2 
Le nonidi 9 thermidor, an CCXXV, Paul B Mahol a écrit :
> Whole set LGTM.

Framework and changes to the filters pushed.

Regards,
diff mbox

Patch

diff --git a/libavfilter/Makefile b/libavfilter/Makefile
index 6f8e7b5ae1..b34272830e 100644
--- a/libavfilter/Makefile
+++ b/libavfilter/Makefile
@@ -308,7 +308,7 @@  OBJS-$(CONFIG_SWAPRECT_FILTER)               += vf_swaprect.o
 OBJS-$(CONFIG_SWAPUV_FILTER)                 += vf_swapuv.o
 OBJS-$(CONFIG_TBLEND_FILTER)                 += vf_blend.o dualinput.o framesync.o
 OBJS-$(CONFIG_TELECINE_FILTER)               += vf_telecine.o
-OBJS-$(CONFIG_THRESHOLD_FILTER)              += vf_threshold.o
+OBJS-$(CONFIG_THRESHOLD_FILTER)              += vf_threshold.o framesync2.o
 OBJS-$(CONFIG_THUMBNAIL_FILTER)              += vf_thumbnail.o
 OBJS-$(CONFIG_TILE_FILTER)                   += vf_tile.o
 OBJS-$(CONFIG_TINTERLACE_FILTER)             += vf_tinterlace.o
diff --git a/libavfilter/vf_threshold.c b/libavfilter/vf_threshold.c
index 1cb4c9aab8..6a64f270fe 100644
--- a/libavfilter/vf_threshold.c
+++ b/libavfilter/vf_threshold.c
@@ -28,7 +28,7 @@ 
 #include "libavutil/opt.h"
 #include "libavutil/pixdesc.h"
 #include "avfilter.h"
-#include "framesync.h"
+#include "framesync2.h"
 #include "internal.h"
 #include "video.h"
 
@@ -96,10 +96,10 @@  static int process_frame(FFFrameSync *fs)
     AVFrame *out, *in, *threshold, *min, *max;
     int ret;
 
-    if ((ret = ff_framesync_get_frame(&s->fs, 0, &in,        0)) < 0 ||
-        (ret = ff_framesync_get_frame(&s->fs, 1, &threshold, 0)) < 0 ||
-        (ret = ff_framesync_get_frame(&s->fs, 2, &min,       0)) < 0 ||
-        (ret = ff_framesync_get_frame(&s->fs, 3, &max,       0)) < 0)
+    if ((ret = ff_framesync2_get_frame(&s->fs, 0, &in,        0)) < 0 ||
+        (ret = ff_framesync2_get_frame(&s->fs, 1, &threshold, 0)) < 0 ||
+        (ret = ff_framesync2_get_frame(&s->fs, 2, &min,       0)) < 0 ||
+        (ret = ff_framesync2_get_frame(&s->fs, 3, &max,       0)) < 0)
         return ret;
 
     if (ctx->is_disabled) {
@@ -256,7 +256,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, 4)) < 0)
+    if ((ret = ff_framesync2_init(&s->fs, ctx, 4)) < 0)
         return ret;
 
     in = s->fs.in;
@@ -279,49 +279,39 @@  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)
 {
-    ThresholdContext *s = inlink->dst->priv;
-    return ff_framesync_filter_frame(&s->fs, inlink, buf);
-}
-
-static int request_frame(AVFilterLink *outlink)
-{
-    ThresholdContext *s = outlink->src->priv;
-    return ff_framesync_request_frame(&s->fs, outlink);
+    ThresholdContext *s = ctx->priv;
+    return ff_framesync2_activate(&s->fs);
 }
 
 static av_cold void uninit(AVFilterContext *ctx)
 {
     ThresholdContext *s = ctx->priv;
 
-    ff_framesync_uninit(&s->fs);
+    ff_framesync2_uninit(&s->fs);
 }
 
 static const AVFilterPad inputs[] = {
     {
         .name         = "default",
         .type         = AVMEDIA_TYPE_VIDEO,
-        .filter_frame = filter_frame,
         .config_props = config_input,
     },
     {
         .name         = "threshold",
         .type         = AVMEDIA_TYPE_VIDEO,
-        .filter_frame = filter_frame,
     },
     {
         .name         = "min",
         .type         = AVMEDIA_TYPE_VIDEO,
-        .filter_frame = filter_frame,
     },
     {
         .name         = "max",
         .type         = AVMEDIA_TYPE_VIDEO,
-        .filter_frame = filter_frame,
     },
     { NULL }
 };
@@ -331,7 +321,6 @@  static const AVFilterPad outputs[] = {
         .name          = "default",
         .type          = AVMEDIA_TYPE_VIDEO,
         .config_props  = config_output,
-        .request_frame = request_frame,
     },
     { NULL }
 };
@@ -343,6 +332,7 @@  AVFilter ff_vf_threshold = {
     .priv_class    = &threshold_class,
     .uninit        = uninit,
     .query_formats = query_formats,
+    .activate      = activate,
     .inputs        = inputs,
     .outputs       = outputs,
     .flags         = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL,