From patchwork Mon Apr 11 13:31:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 35254 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:671c:b0:7c:62c8:b2d1 with SMTP id q28csp1047541pzh; Mon, 11 Apr 2022 06:32:16 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzljBRKg4zraBqZ2lGYa7mizu/Vi1/HBRhFfPzPChYGaoU2Kp84Emg8qCHRC76PRvyC8sjW X-Received: by 2002:a17:907:6d23:b0:6d9:ac9d:222 with SMTP id sa35-20020a1709076d2300b006d9ac9d0222mr30917963ejc.595.1649683936080; Mon, 11 Apr 2022 06:32:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1649683936; cv=none; d=google.com; s=arc-20160816; b=cszRbYni61oqB1Kgu/AeOuPyp1BfN399H26a4x2fGom1GDlw195SYq8n0VKtVPVp6Y F1XJ0fEQ6Ym3eyfcnlnaiXytvdEifE8R/BKQPh8bS7gHeYwdzC6bKalhSAXsIhAscOYB 77J+28TFADUCNdWtzsgD0dp8Fm01yLkEs/zs3z0Ygdn9uQ1aUcJoXXUjh8CD3TbWiIoY 8E/smkVAuaJD8Jy9ss0mbg6Orc6wLHUhhvN98x3rtn4LSHWUTFU9uvqwVVmDfEI33BL7 a7ij0Q63k04uH+pPffidcHHMEetXmA3BNRQpQ0ivHCMHr7dprFPKP6ye2i6OwYqIIYgp pe/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:delivered-to; bh=TlU6q5z1eGAx0r025m4zBy8GUThbS+RiVsBu5EUojgo=; b=wl7UJZ4BdDZZhRlmTwZg4//wrLw1UwyMVUaqhtCmDyxrcaGwOLxlCLRL6AnRG7hzgy hFYYA2GVX16Qcn7cwEX0TJ40sSVj3t3cfwsUxu63TfxzJ+BaD9orep6qR+FGWGbCaVna U5JJxB2oMl6PP+sEuvB99JNdm1O2tLrVJeGfwcadTAQX9RiSxSRMO5COQlp3EQe0gAqC eL5k05OVkJknA68CP4Pwt87syKY0UGtZuVIF73JFTVCvLgLmsgxjwEMZK/wa5cLe1dLa HslfL1fC5OA6/DElBnAlCwBwO30cAHTw2NgU1l37okOUWsnTVl5IteZNeagGCluHAq1c TMhg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id d7-20020a170906640700b006e8310f72e9si6780987ejm.653.2022.04.11.06.32.14; Mon, 11 Apr 2022 06:32:16 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1363468B23C; Mon, 11 Apr 2022 16:32:11 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at02-2.mx.upcmail.net (vie01a-dmta-at02-2.mx.upcmail.net [62.179.121.149]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8874D68030F for ; Mon, 11 Apr 2022 16:32:04 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-at02.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1ndu9D-0003oe-9F for ffmpeg-devel@ffmpeg.org; Mon, 11 Apr 2022 15:32:03 +0200 Received: from ren-mail-psmtp-mg01. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id du5PntOgxSgGFdu9Dn2hvM; Mon, 11 Apr 2022 15:32:03 +0200 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg01. with ESMTP id du8ynyMyCOPqFdu8yngclt; Mon, 11 Apr 2022 15:31:48 +0200 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.68.29 X-CNFS-Analysis: v=2.4 cv=OcX7sjfY c=1 sm=1 tr=0 ts=62542dd3 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=uKfBovphaaXNn5r_34IA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 11 Apr 2022 15:31:48 +0200 Message-Id: <20220411133148.10292-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfOKuXcJJBSvYI7KNHCK2ofEPLMk6foLu13CgKSWVpHVJggFE1gz6p8KbVKSJkAllJURYVBooGGEFCjborMHppRSbalhN0F9olo+nUHwEoPaj95fWhSQE wv9Et3Fe4ZEd5/VMKNkyJL0nIesJJZB4nM3XB05r1qtlaoLuIVyBFGcj3nkQLkASjZwRrjHYP55v/g== Subject: [FFmpeg-devel] [PATCH] avfilter/vf_frei0r: Copy to frame allocated according to frei0r requirements X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: pK9p73Ku2RCA Fixes: issues with non trivial linesize Signed-off-by: Michael Niedermayer --- 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); }