lavfi/alphaextract: consistently prefer "cur" over "in" in filter_frame()

[ffmpeg] / libavfilter / vf_alphaextract.c

diff --git a/libavfilter/vf_alphaextract.c b/libavfilter/vf_alphaextract.c
index 35402f656d31d0d57b2f0e1064f42ff623bc28cd..8c0209e7a8e01f0b6a37b892d4f188ec4394a59a 100644 (file)
--- a/libavfilter/vf_alphaextract.c
+++ b/libavfilter/vf_alphaextract.c
@@ -28,6 +28,7 @@
 #include "libavutil/pixfmt.h"
 #include "avfilter.h"
 #include "drawutils.h"
+#include "internal.h"
 #include "formats.h"
 #include "video.h"
 
@@ -59,39 +60,47 @@ static int config_input(AVFilterLink *inlink)
     return 0;
 }
 
-static int draw_slice(AVFilterLink *inlink, int y0, int h, int slice_dir)
+static int filter_frame(AVFilterLink *inlink, AVFilterBufferRef *cur_buf)
 {
     AlphaExtractContext *extract = inlink->dst->priv;
-    AVFilterBufferRef *cur_buf = inlink->cur_buf;
-    AVFilterBufferRef *out_buf = inlink->dst->outputs[0]->out_buf;
+    AVFilterLink *outlink = inlink->dst->outputs[0];
+    AVFilterBufferRef *out_buf =
+        ff_get_video_buffer(outlink, AV_PERM_WRITE, outlink->w, outlink->h);
+    int ret;
+
+    if (!out_buf) {
+        ret = AVERROR(ENOMEM);
+        goto end;
+    }
+    avfilter_copy_buffer_ref_props(out_buf, cur_buf);
 
     if (extract->is_packed_rgb) {
         int x, y;
-        uint8_t *pin, *pout;
-        for (y = y0; y < (y0 + h); y++) {
-            pin = cur_buf->data[0] + y * cur_buf->linesize[0] + extract->rgba_map[A];
+        uint8_t *pcur, *pout;
+        for (y = 0; y < outlink->h; y++) {
+            pcur = cur_buf->data[0] + y * cur_buf->linesize[0] + extract->rgba_map[A];
             pout = out_buf->data[0] + y * out_buf->linesize[0];
-            for (x = 0; x < out_buf->video->w; x++) {
-                *pout = *pin;
+            for (x = 0; x < outlink->w; x++) {
+                *pout = *pcur;
                 pout += 1;
-                pin += 4;
+                pcur += 4;
             }
         }
-    } else if (cur_buf->linesize[A] == out_buf->linesize[Y]) {
-        const int linesize = cur_buf->linesize[A];
-        memcpy(out_buf->data[Y] + y0 * linesize,
-               cur_buf->data[A] + y0 * linesize,
-               linesize * h);
     } else {
-        const int linesize = FFMIN(out_buf->linesize[Y], cur_buf->linesize[A]);
+        const int linesize = abs(FFMIN(out_buf->linesize[Y], cur_buf->linesize[A]));
         int y;
-        for (y = y0; y < (y0 + h); y++) {
+        for (y = 0; y < outlink->h; y++) {
             memcpy(out_buf->data[Y] + y * out_buf->linesize[Y],
                    cur_buf->data[A] + y * cur_buf->linesize[A],
                    linesize);
         }
     }
-    return ff_draw_slice(inlink->dst->outputs[0], y0, h, slice_dir);
+
+    ret = ff_filter_frame(outlink, out_buf);
+
+end:
+    avfilter_unref_buffer(cur_buf);
+    return ret;
 }
 
 static const AVFilterPad alphaextract_inputs[] = {
@@ -99,7 +108,7 @@ static const AVFilterPad alphaextract_inputs[] = {
         .name         = "default",
         .type         = AVMEDIA_TYPE_VIDEO,
         .config_props = config_input,
-        .draw_slice   = draw_slice,
+        .filter_frame = filter_frame,
         .min_perms    = AV_PERM_READ,
     },
     { NULL }