[FFmpeg-devel] [PATCH] avfilter/vf_frei0r: Copy to frame allocated according to frei0r requirements

[Michael Niedermayer]

Fixes: issues with non trivial linesize

Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
---
 libavfilter/vf_frei0r.c | 40 ++++++++++++++++++++++++++++++++--------
 1 file changed, 32 insertions(+), 8 deletions(-)

diff --git a/libavfilter/vf_frei0r.c b/libavfilter/vf_frei0r.c
index 9cd0098e73..c9b698897f 100644
--- a/libavfilter/vf_frei0r.c
+++ b/libavfilter/vf_frei0r.c
@@ -349,18 +349,41 @@ static int query_formats(AVFilterContext *ctx)
     return ff_set_common_formats(ctx, formats);
 }
 
+static AVFrame *getframe(AVFilterLink *link)
+{
+    int ret;
+    AVFrame *frame = av_frame_alloc();
+    if (!frame)
+        return NULL;
+
+    frame->width  = link->w;
+    frame->height = link->h;
+    frame->format = link->format;
+    ret = av_frame_get_buffer(frame, 16);
+    if (ret < 0)
+        av_frame_free(&frame);
+
+    return frame;
+}
+
 static int filter_frame(AVFilterLink *inlink, AVFrame *in)
 {
     Frei0rContext *s = inlink->dst->priv;
     AVFilterLink *outlink = inlink->dst->outputs[0];
-    AVFrame *out;
+    AVFrame *out = getframe(outlink);
+    if (!out)
+        goto fail;
 
-    out = ff_get_video_buffer(outlink, outlink->w, outlink->h);
-    if (!out) {
+    av_frame_copy_props(out, in);
+
+    if (in->linesize[0] != out->linesize[0]) {
+        AVFrame *in2 = getframe(outlink);
+        if (!in2)
+            goto fail;
+        av_frame_copy(in2, in);
         av_frame_free(&in);
-        return AVERROR(ENOMEM);
+        in = in2;
     }
-    av_frame_copy_props(out, in);
 
     s->update(s->instance, in->pts * av_q2d(inlink->time_base) * 1000,
                    (const uint32_t *)in->data[0],
@@ -369,6 +392,10 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
     av_frame_free(&in);
 
     return ff_filter_frame(outlink, out);
+fail:
+    av_frame_free(&in);
+    av_frame_free(&out);
+    return AVERROR(ENOMEM);
 }
 
 static int process_command(AVFilterContext *ctx, const char *cmd, const char *args,
@@ -473,9 +500,6 @@ static int source_request_frame(AVFilterLink *outlink)
     frame->sample_aspect_ratio = (AVRational) {1, 1};
     frame->pts = s->pts++;
 
-    s->update(s->instance, av_rescale_q(frame->pts, s->time_base, (AVRational){1,1000}),
-                   NULL, (uint32_t *)frame->data[0]);
-
     return ff_filter_frame(outlink, frame);
 }
 
-- 
2.17.1