From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id D7AD84281C for ; Fri, 1 Apr 2022 06:26:51 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6D94668B25A; Fri, 1 Apr 2022 09:26:48 +0300 (EEST) Received: from server6.ceeqoo.com (server6.ceeqoo.com [178.77.101.243]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CBC7D68A380 for ; Fri, 1 Apr 2022 09:26:42 +0300 (EEST) Received: from mailix (www.noaport.de [109.90.164.154]) by server6.ceeqoo.com (Postfix) with ESMTPA id CBF55BD5E2; Fri, 1 Apr 2022 08:26:41 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=noa-archive.com; s=default; t=1648794402; bh=5BRdq33P7YdSC04IfOMAaTwL8Brjpgf/f7x286b+eiI=; h=Received:Subject:To:From; b=BarogYmgJVgzBO5bz3/0JXNh8dpq5xLYyMX2k644QR7M6Pp71FKRtKrM+CVTGJGR1 0p3anMmpdXpNgixgsOE57O2fsUR276O6brmVmCeolxYee0W8MKuTgLyRsAYsqz1bX7 fivaSLiMNnrrUYyqVp8olFMdLt9d0SqD+ERnW020= Authentication-Results: server6.ceeqoo.com; spf=pass (sender IP is 109.90.164.154) smtp.mailfrom=t.rapp@noa-archive.com smtp.helo=mailix Received-SPF: pass (server6.ceeqoo.com: connection is authenticated) Received: from [192.168.0.125] (Unknown [192.168.0.1]) by mailix with ESMTPSA (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128) ; Fri, 1 Apr 2022 08:26:41 +0200 Message-ID: <42bd5083-b047-e4e2-7ce8-767b28de099b@noa-archive.com> Date: Fri, 1 Apr 2022 08:26:40 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.7.0 Content-Language: en-US To: FFmpeg development discussions and patches References: <45f5a877-bc0c-51b4-075f-264f29451938@noa-archive.com> <20220331213017.13913-1-cus@passwd.hu> From: Tobias Rapp Organization: NOA GmbH In-Reply-To: <20220331213017.13913-1-cus@passwd.hu> X-PPP-Message-ID: <164879440224.18797.1679800505910621858@server6.ceeqoo.com> X-PPP-Vhost: noa-archive.com Subject: Re: [FFmpeg-devel] [PATCH v2 1/8] fate/filter-refcmp-*: make refcmp_metadata fail on empty or truncated input 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 Cc: Marton Balint Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On 31/03/2022 23:30, Marton Balint wrote: > On empty input the awk script was always successful which caused the > filter-refcmp tests to always succeed. > > Also fix the command lines for refcmp_metadata compare function because it > needs auto conversion filters, and update reference of test > filter-refcmp-psnr-rgb because it was missed in > a7fc78c1a638a32c3695c06f727774c740d675c2 but was never noticed due to the > original issue... > > Signed-off-by: Marton Balint > --- > tests/fate-run.sh | 2 +- > tests/ref/fate/filter-refcmp-psnr-rgb | 80 +++++++++++++-------------- > tests/refcmp-metadata.awk | 5 +- > 3 files changed, 45 insertions(+), 42 deletions(-) > > diff --git a/tests/fate-run.sh b/tests/fate-run.sh > index fbfc0a925d..5e8d607d88 100755 > --- a/tests/fate-run.sh > +++ b/tests/fate-run.sh > @@ -377,7 +377,7 @@ refcmp_metadata(){ > refcmp=$1 > pixfmt=$2 > fuzz=${3:-0.001} > - ffmpeg $FLAGS $ENC_OPTS \ > + ffmpeg -auto_conversion_filters $FLAGS $ENC_OPTS \ > -lavfi "testsrc2=size=300x200:rate=1:duration=5,format=${pixfmt},split[ref][tmp];[tmp]avgblur=4[enc];[enc][ref]${refcmp},metadata=print:file=-" \ > -f null /dev/null | awk -v ref=${ref} -v fuzz=${fuzz} -f ${base}/refcmp-metadata.awk - > } > diff --git a/tests/ref/fate/filter-refcmp-psnr-rgb b/tests/ref/fate/filter-refcmp-psnr-rgb > index f06db575ac..20abd3dc5a 100644 > --- a/tests/ref/fate/filter-refcmp-psnr-rgb > +++ b/tests/ref/fate/filter-refcmp-psnr-rgb > @@ -1,45 +1,45 @@ > frame:0 pts:0 pts_time:0 > -lavfi.psnr.mse.r=1381.80 > -lavfi.psnr.psnr.r=16.73 > -lavfi.psnr.mse.g=896.00 > -lavfi.psnr.psnr.g=18.61 > -lavfi.psnr.mse.b=277.38 > -lavfi.psnr.psnr.b=23.70 > -lavfi.psnr.mse_avg=851.73 > -lavfi.psnr.psnr_avg=18.83 > +lavfi.psnr.mse.r=1367.642090 > +lavfi.psnr.psnr.r=16.771078 > +lavfi.psnr.mse.g=885.804382 > +lavfi.psnr.psnr.g=18.657425 > +lavfi.psnr.mse.b=274.825073 > +lavfi.psnr.psnr.b=23.740240 > +lavfi.psnr.mse_avg=842.757202 > +lavfi.psnr.psnr_avg=18.873779 > frame:1 pts:1 pts_time:1 > -lavfi.psnr.mse.r=1380.37 > -lavfi.psnr.psnr.r=16.73 > -lavfi.psnr.mse.g=975.91 > -lavfi.psnr.psnr.g=18.24 > -lavfi.psnr.mse.b=435.72 > -lavfi.psnr.psnr.b=21.74 > -lavfi.psnr.mse_avg=930.67 > -lavfi.psnr.psnr_avg=18.44 > +lavfi.psnr.mse.r=1356.681152 > +lavfi.psnr.psnr.r=16.806026 > +lavfi.psnr.mse.g=958.161560 > +lavfi.psnr.psnr.g=18.316416 > +lavfi.psnr.mse.b=428.238312 > +lavfi.psnr.psnr.b=21.813948 > +lavfi.psnr.mse_avg=914.360352 > +lavfi.psnr.psnr_avg=18.519630 > frame:2 pts:2 pts_time:2 > -lavfi.psnr.mse.r=1403.20 > -lavfi.psnr.psnr.r=16.66 > -lavfi.psnr.mse.g=954.05 > -lavfi.psnr.psnr.g=18.34 > -lavfi.psnr.mse.b=494.22 > -lavfi.psnr.psnr.b=21.19 > -lavfi.psnr.mse_avg=950.49 > -lavfi.psnr.psnr_avg=18.35 > +lavfi.psnr.mse.r=1387.254883 > +lavfi.psnr.psnr.r=16.709242 > +lavfi.psnr.mse.g=939.230957 > +lavfi.psnr.psnr.g=18.403080 > +lavfi.psnr.mse.b=493.913757 > +lavfi.psnr.psnr.b=21.194292 > +lavfi.psnr.mse_avg=940.133179 > +lavfi.psnr.psnr_avg=18.398911 > frame:3 pts:3 pts_time:3 > -lavfi.psnr.mse.r=1452.80 > -lavfi.psnr.psnr.r=16.51 > -lavfi.psnr.mse.g=1001.02 > -lavfi.psnr.psnr.g=18.13 > -lavfi.psnr.mse.b=557.39 > -lavfi.psnr.psnr.b=20.67 > -lavfi.psnr.mse_avg=1003.74 > -lavfi.psnr.psnr_avg=18.11 > +lavfi.psnr.mse.r=1433.291260 > +lavfi.psnr.psnr.r=16.567459 > +lavfi.psnr.mse.g=990.005859 > +lavfi.psnr.psnr.g=18.174425 > +lavfi.psnr.mse.b=550.512329 > +lavfi.psnr.psnr.b=20.723133 > +lavfi.psnr.mse_avg=991.269836 > +lavfi.psnr.psnr_avg=18.168884 > frame:4 pts:4 pts_time:4 > -lavfi.psnr.mse.r=1401.25 > -lavfi.psnr.psnr.r=16.67 > -lavfi.psnr.mse.g=1009.80 > -lavfi.psnr.psnr.g=18.09 > -lavfi.psnr.mse.b=602.42 > -lavfi.psnr.psnr.b=20.33 > -lavfi.psnr.mse_avg=1004.49 > -lavfi.psnr.psnr_avg=18.11 > +lavfi.psnr.mse.r=1385.949341 > +lavfi.psnr.psnr.r=16.713329 > +lavfi.psnr.mse.g=997.065796 > +lavfi.psnr.psnr.g=18.143566 > +lavfi.psnr.mse.b=601.962952 > +lavfi.psnr.psnr.b=20.335106 > +lavfi.psnr.mse_avg=994.992676 > +lavfi.psnr.psnr_avg=18.152605 > diff --git a/tests/refcmp-metadata.awk b/tests/refcmp-metadata.awk > index fa21aad0e0..850aaac5a3 100644 > --- a/tests/refcmp-metadata.awk > +++ b/tests/refcmp-metadata.awk > @@ -50,13 +50,16 @@ BEGIN { > } > > END { > + result = result && (NR == ref_nr); > if (result) { > for (i = 1; i <= ref_nr; i++) > print ref_lines[i]; > } else { > for (i = 1; i <= NR; i++) > print cmp_lines[i]; > - if (NR != ref_nr) > + if (NR == 0) > + print "[refcmp] no input" > "/dev/stderr"; > + else if (NR != ref_nr) > print "[refcmp] lines: " NR " != " ref_nr > "/dev/stderr"; > if (delta_max >= fuzz) > print "[refcmp] delta_max: " delta_max " >= " fuzz > "/dev/stderr"; Looks good to me. Regards, Tobias _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".