From patchwork Mon Apr 11 21:21:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 35263 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:671c:b0:7c:62c8:b2d1 with SMTP id q28csp1255439pzh; Mon, 11 Apr 2022 14:22:02 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzBWtQi5qwfLIMB3FyISRh2z6c22igheCEVb9FbFq+LyggYeG72ap76KxahLv/O7Ojh4DMw X-Received: by 2002:a17:906:4787:b0:6e8:9252:5bef with SMTP id cw7-20020a170906478700b006e892525befmr6462001ejc.679.1649712121953; Mon, 11 Apr 2022 14:22:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1649712121; cv=none; d=google.com; s=arc-20160816; b=oPT+8Szq1Q3UdYaqvAsWEO0tbYdp9f72cboWWPjoaqC5JjdA64ohHyxIpWVjGu2/mu fpst5z7toSmFNlTd8qJs0YC7EMOKaVInOj8NH8AlG3f2A76dMYACM0X40j/kw6fNPtDL N1HzIbH5b5//YMVdqyZS1QBWMNwEk8B5a3x3rkPK1vQIQ2rEyC/Ec02/o7GqoAby35pS txA0EVBWhM4nb6n/U/h53VVwogRNRYnd8DwO1zbeplhgRxCsA5qo87PRohad5mym7RFd yyl3SyO8PaYYcOKe0LWlQclo0thJ1bycHaqUxr06jiaUsTyGjUmtZXe9wJTwvl8wyNCP Lqpg== 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:references:in-reply-to:message-id:date :to:from:delivered-to; bh=/MEkLAseUq8+bjGZ9fsySXaZOageQ3a4wAWYgC4Gekc=; b=ineevJd0sLkz/7rbzxcS56I7umcD5OmubydQ2n1sYu6P0YVrDAeGgp0ShuwZFU2isd 8huJMXUTe97dGRvIaFHVwk+t8EliTO/g2vt+YM6O1o9nnYme+kdP+wSVIZQsRqsK6nRS gTy2FHonQDAVZvt7bjzrPLG9114WMLeZGjYE2TLtHuRkQw1L/dAkdJHoSLHEKnsEYKvz oslU0jY4Da15+dMAQ4wSL+p1GS+HS2OTIXnLo2eBacspb9RQma9Ft0Gbjh+yEJq8InHr GaIwlh0h0g3coGSyLxsf05Xm6Wd6hNYTHQJb6u/LC4PskW61Pjt75AGs1RVDCRKprcRJ 26tA== 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 ky10-20020a170907778a00b006e83a4e3606si7479552ejc.92.2022.04.11.14.22.01; Mon, 11 Apr 2022 14:22:01 -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 0904A68B32E; Tue, 12 Apr 2022 00:21:52 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at03-3.mx.upcmail.net (vie01a-dmta-at03-3.mx.upcmail.net [62.179.121.153]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CFF0668B072 for ; Tue, 12 Apr 2022 00:21:42 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-at03.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1ne1Tc-0003XX-1v for ffmpeg-devel@ffmpeg.org; Mon, 11 Apr 2022 23:21:36 +0200 Received: from ren-mail-psmtp-mg02. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id e1TGn9zsGSgGFe1Tcn3knO; Mon, 11 Apr 2022 23:21:36 +0200 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg02. with ESMTP id e1TNnIIre8eSWe1TNnKtki; Mon, 11 Apr 2022 23:21:21 +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=KKE5sHJo c=1 sm=1 tr=0 ts=62549be0 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=zIZbi1sURjetFJsjxGUA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 11 Apr 2022 23:21:20 +0200 Message-Id: <20220411212120.15692-4-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220411212120.15692-1-michael@niedermayer.cc> References: <20220411212120.15692-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfHHnwBIPYkgi55qJ4D19bu6E+tTi5PU95Q2ALMRX0+VmX09+gOl3X53i7bNl38pA9uyfvZb6kKyuR8wDVkZrZ3Z08wGrfGL1UnoA1UV2gOVpKCyD3LVQ FyJ8Vs/8C8EdinEqzutA6/oUfNiNG50I4FMM116yybU1zw6qmW4JotxJ9vwJWOqfMiiU0JHWvjfTkg== Subject: [FFmpeg-devel] [PATCH 4/4] 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: NVfZzPyBbqI3 Fixes: issues with non trivial linesize Signed-off-by: Michael Niedermayer --- libavfilter/vf_frei0r.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/libavfilter/vf_frei0r.c b/libavfilter/vf_frei0r.c index 9cd0098e73..f11ae6e55c 100644 --- a/libavfilter/vf_frei0r.c +++ b/libavfilter/vf_frei0r.c @@ -353,14 +353,20 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) { Frei0rContext *s = inlink->dst->priv; AVFilterLink *outlink = inlink->dst->outputs[0]; - AVFrame *out; + AVFrame *out = ff_default_get_video_buffer2(outlink, outlink->w, outlink->h, 16); + 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 = ff_default_get_video_buffer2(outlink, outlink->w, outlink->h, 16); + 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 +375,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, @@ -465,7 +475,7 @@ static int source_config_props(AVFilterLink *outlink) static int source_request_frame(AVFilterLink *outlink) { Frei0rContext *s = outlink->src->priv; - AVFrame *frame = ff_get_video_buffer(outlink, outlink->w, outlink->h); + AVFrame *frame = ff_default_get_video_buffer2(outlink, outlink->w, outlink->h, 16); if (!frame) return AVERROR(ENOMEM);