vsrc_mandelbrot: switch to filter_frame

[ffmpeg] / libavfilter / vf_geq.c

diff --git a/libavfilter/vf_geq.c b/libavfilter/vf_geq.c
index 548e3c32e56a4587c69ea356e909ae368be98c0d..cd893339a761097467e4b8f16ad02a781b460be6 100644 (file)
--- a/libavfilter/vf_geq.c
+++ b/libavfilter/vf_geq.c
@@ -4,19 +4,19 @@
  *
  * This file is part of FFmpeg.
  *
- * FFmpeg is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
+ * FFmpeg is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * FFmpeg is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * You should have received a copy of the GNU General Public License along
+ * with FFmpeg; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 /**
@@ -152,22 +152,28 @@ static int geq_config_props(AVFilterLink *inlink)
     return 0;
 }
 
-static int geq_end_frame(AVFilterLink *inlink)
+static int geq_filter_frame(AVFilterLink *inlink, AVFilterBufferRef *in)
 {
-    int ret, plane;
+    int plane;
     GEQContext *geq = inlink->dst->priv;
     AVFilterLink *outlink = inlink->dst->outputs[0];
-    AVFilterBufferRef *outpicref = outlink->out_buf;
+    AVFilterBufferRef *out;
     double values[VAR_VARS_NB] = {
         [VAR_N] = geq->framenum++,
     };
 
-    geq->picref = inlink->cur_buf;
+    geq->picref = in;
+    out = ff_get_video_buffer(outlink, AV_PERM_WRITE, outlink->w, outlink->h);
+    if (!out) {
+        avfilter_unref_bufferp(&in);
+        return AVERROR(ENOMEM);
+    }
+    avfilter_copy_buffer_ref_props(out, in);
 
     for (plane = 0; plane < 3; plane++) {
         int x, y;
-        uint8_t *dst = outpicref->data[plane];
-        const int linesize = outpicref->linesize[plane];
+        uint8_t *dst = out->data[plane];
+        const int linesize = out->linesize[plane];
         const int w = inlink->w >> (plane ? geq->hsub : 0);
         const int h = inlink->h >> (plane ? geq->vsub : 0);
 
@@ -186,10 +192,8 @@ static int geq_end_frame(AVFilterLink *inlink)
         }
     }
 
-    if ((ret = ff_draw_slice(outlink, 0, outlink->h, 1)) < 0 ||
-        (ret = ff_end_frame(outlink)) < 0)
-        return ret;
-    return 0;
+    avfilter_unref_bufferp(&geq->picref);
+    return ff_filter_frame(outlink, out);
 }
 
 static av_cold void geq_uninit(AVFilterContext *ctx)
@@ -202,15 +206,12 @@ static av_cold void geq_uninit(AVFilterContext *ctx)
     av_opt_free(geq);
 }
 
-static int null_draw_slice(AVFilterLink *link, int y, int h, int slice_dir) { return 0; }
-
 static const AVFilterPad geq_inputs[] = {
     {
         .name         = "default",
         .type         = AVMEDIA_TYPE_VIDEO,
-        .draw_slice   = null_draw_slice,
         .config_props = geq_config_props,
-        .end_frame    = geq_end_frame,
+        .filter_frame = geq_filter_frame,
         .min_perms    = AV_PERM_READ,
     },
     { NULL }