Merge commit '6a27ae28f9bde981e85c82cf5bf42c5f43fb6f13'

[ffmpeg] / libavfilter / vf_decimate.c

diff --git a/libavfilter/vf_decimate.c b/libavfilter/vf_decimate.c
index 8d54d3901161c2d27ebd7b7036966321778b34b4..267a43502481ec1965ed1540f1d5ed047a52b2db 100644 (file)
--- a/libavfilter/vf_decimate.c
+++ b/libavfilter/vf_decimate.c
@@ -187,14 +187,9 @@ static int config_input(AVFilterLink *inlink)
     return 0;
 }
 
-static int start_frame(AVFilterLink *inlink, AVFilterBufferRef *picref) { return 0; }
-
-static int draw_slice(AVFilterLink *inlink, int y, int h, int slice_dir) { return 0; }
-
-static int end_frame(AVFilterLink *inlink)
+static int filter_frame(AVFilterLink *inlink, AVFilterBufferRef *cur)
 {
     DecimateContext *decimate = inlink->dst->priv;
-    AVFilterBufferRef *cur = inlink->cur_buf;
     AVFilterLink *outlink = inlink->dst->outputs[0];
     int ret;
 
@@ -206,10 +201,7 @@ static int end_frame(AVFilterLink *inlink)
         inlink->cur_buf = NULL;
         decimate->drop_count = FFMIN(-1, decimate->drop_count-1);
 
-        if ((ret = ff_start_frame(outlink,
-                                  avfilter_ref_buffer(cur, ~AV_PERM_WRITE)) < 0) ||
-            (ret = ff_draw_slice(outlink, 0, inlink->h, 1)) < 0 ||
-            (ret = ff_end_frame(outlink)) < 0)
+        if (ret = ff_filter_frame(outlink, avfilter_ref_buffer(cur, ~AV_PERM_WRITE)) < 0)
             return ret;
     }
 
@@ -219,6 +211,9 @@ static int end_frame(AVFilterLink *inlink)
            av_ts2str(cur->pts), av_ts2timestr(cur->pts, &inlink->time_base),
            decimate->drop_count);
 
+    if (decimate->drop_count > 0)
+        avfilter_unref_buffer(cur);
+
     return 0;
 }
 
@@ -235,6 +230,27 @@ static int request_frame(AVFilterLink *outlink)
     return ret;
 }
 
+static const AVFilterPad decimate_inputs[] = {
+    {
+        .name             = "default",
+        .type             = AVMEDIA_TYPE_VIDEO,
+        .get_video_buffer = ff_null_get_video_buffer,
+        .config_props     = config_input,
+        .filter_frame     = filter_frame,
+        .min_perms        = AV_PERM_READ | AV_PERM_PRESERVE,
+    },
+    { NULL }
+};
+
+static const AVFilterPad decimate_outputs[] = {
+    {
+        .name          = "default",
+        .type          = AVMEDIA_TYPE_VIDEO,
+        .request_frame = request_frame,
+    },
+    { NULL }
+};
+
 AVFilter avfilter_vf_decimate = {
     .name        = "decimate",
     .description = NULL_IF_CONFIG_SMALL("Remove near-duplicate frames."),
@@ -243,26 +259,6 @@ AVFilter avfilter_vf_decimate = {
 
     .priv_size = sizeof(DecimateContext),
     .query_formats = query_formats,
-
-    .inputs = (const AVFilterPad[]) {
-        {
-            .name             = "default",
-            .type             = AVMEDIA_TYPE_VIDEO,
-            .get_video_buffer = ff_null_get_video_buffer,
-            .config_props     = config_input,
-            .start_frame      = start_frame,
-            .draw_slice       = draw_slice,
-            .end_frame        = end_frame,
-            .min_perms        = AV_PERM_READ | AV_PERM_PRESERVE,
-        },
-        { .name = NULL }
-    },
-    .outputs = (const AVFilterPad[]) {
-        {
-            .name          = "default",
-            .type          = AVMEDIA_TYPE_VIDEO,
-            .request_frame = request_frame,
-        },
-        { .name = NULL }
-    },
+    .inputs        = decimate_inputs,
+    .outputs       = decimate_outputs,
 };