From patchwork Thu Apr 28 23:28:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35485 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b9e:b0:7d:cfb5:dc7c with SMTP id b30csp234975pzh; Thu, 28 Apr 2022 16:29:21 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwxbiGdQXmzUUzzMiUV5oy+8hIKLHfybalPG90rA2c+xnKoos8VCMbLbK5xsJ20jHWElGm3 X-Received: by 2002:a05:6402:350e:b0:426:1bb4:729f with SMTP id b14-20020a056402350e00b004261bb4729fmr9756514edd.144.1651188560822; Thu, 28 Apr 2022 16:29:20 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a19-20020a170906191300b006f3b3d81aa8si4619341eje.216.2022.04.28.16.29.20; Thu, 28 Apr 2022 16:29:20 -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; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b=nxFchDLa; arc=fail (body hash mismatch); 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id AE1D068B2E5; Fri, 29 Apr 2022 02:28:56 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-oln040092073026.outbound.protection.outlook.com [40.92.73.26]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 603BE68B267 for ; Fri, 29 Apr 2022 02:28:54 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QdVglkfOzdU8HTCV8td+1u4lvxJypXEayuca30ctqIeLf0K1B9popxK+RRFNvK5GukNALCHdeisyr6otzdK+5e0V8oDtKyFjl43VE8R/Rr5Nfxn/GdcQ4cscH07GZOqK3ir6GMAW3kHCm4rKxWwVZlwpela7dFViK838iDOKy9FaIxEbumVg760OMF31EJPLRAY1aVIpExxOyEy9KmXGrNYZqbfkR3K8+m6SWBj2X59s72tKRZePLXfPjTdynxXyw0SN8SxkkwBekWYcqYhn50kTGAz2by6juGBqoKA6e6yvvxr4StdyOHmVIrgY2943O24k+Nn2uD1bsFIfqNqAiQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=pEILlyXBu1Md68YxNQlnoHr1s9yJS9TfGwbovm19zQU=; b=dJMaVXX7Qmp+maUAgh5vU3FeQkmukf5rEgP1EhjJuGrE6Bf6gzWZh/Nn6glbSy/xipMBDX60ZaGu+ryNzhP/YkuJA9EBYSbHlbwfs/iQN0dAAIz+4p1N6IstXlhYON8wlyGvZB/Zxjx0G5o1pjQM8dNmDJGjTLtf5ElKacuctHYqzvumDY3hmzCJo9P5igcvtJN3XjbxGLg22MZWYA8AlNyzQe/dvCsrgKuMcWdfW2hny0Nssbjffa4DNmw8yvV1H4g4F1v86cQEvyPiJEG3PheOE8DRnuIENwBjGpvVlGE5gzPKjlU5PBqoH+e05rS3FLqEJjmFiwZpaGlBwAT1pA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=pEILlyXBu1Md68YxNQlnoHr1s9yJS9TfGwbovm19zQU=; b=nxFchDLaSmJqW/W9gyzJbuidDC72hGy98f3dXvZoEmE59z7W3hm4g84YwoPApdGRtkpkN+/qVpcd4vxWZqYl511GC9T10J40y/gzbBJRz3Qy7CmMyfp1PUV2zJJvh3ixg73vC2tGRFnm8AK+qb2LqbXUMx2Q7Kcr8G3pfnOw+MqHYASpT1K/nipI0qJEH1vSrVHm2apGt/tcTP1Rr4L7EJzPZedzqIHiRn32fztqGeyksPFZDtkIr23W9mwInFj6goPmM+HFaezNR2voSFl7HMnradEoi0tG/krFwLsuPpOlaVjfQNIkaTq+fO2NrBj6i57vTQJRCT+suD3FjHewAQ== Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) by VI1PR01MB6480.eurprd01.prod.exchangelabs.com (2603:10a6:800:144::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.12; Thu, 28 Apr 2022 23:28:42 +0000 Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com ([fe80::1854:2c30:7ba1:c431]) by AS8PR01MB7944.eurprd01.prod.exchangelabs.com ([fe80::1854:2c30:7ba1:c431%6]) with mapi id 15.20.5186.021; Thu, 28 Apr 2022 23:28:42 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 29 Apr 2022 01:28:17 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [raKz7uonC2Q0Yb5LEAQ1FxkNHCdCrHtN] X-ClientProxiedBy: ZR0P278CA0054.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:1d::23) To AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) X-Microsoft-Original-Message-ID: <20220428232824.657476-5-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c7bf7977-b0dd-449c-211c-08da296ed4ff X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiRlrIlNS1TwwjxLRzEWC2xM1j6NE4OyKrpbcauKmOeU36pSsrpY/4FEdfEZ83Dr4mHa+6Z/FNeSOrFbdYeGTEld3EKdWNUAu5BaKQkReRwhD/U7mfYgGSiZ4j/nMqCeKmJWqYLIgSNvP/xFNSFspW3LjU49KR9BIfUME4fn6aEdAJnbO1Q9AngUWfmyRsNeKMaV1qj0hAmG01TEBi3j2/jWbOwtlgGmQvs3KtWTKT+6++PcxHGMsZjGcwmuxPW6JVn4NDnikpMnShBVd+A4WW3N2k1oWI89avmKfCsw8/k4XGsADHehVW+GEg4SVGzw3aDXO8/6rFw0UloXYD+kTLa20U+q49qNt3BoLnU8w7FKCyZgyuP9Wp46FdGTQ2ehbVgGDGmuEJn8HbXVP+0CT+YskXvQ5UyPk+fidZYRiocc6kvVKxHJAj3Cs/Jj3WO/ekpDRrz3oSk3o/9EJ4pONoWRsDsmNBjpBuKo0H+WooqXA0u6Zic85YActNa8gzwtkxUAOq1ZH/j0hMoQYojNdz9J4uR68OGtGeA5dfmCEoMeLdoRTYMqEZymRZ41ujENFy6CXipT/mA4PuHmtmGFRCxboEW68VD1P1lj5LqTaXBnuvpn+rLcP+WTz0gUaHwFSH/6RuOQ0s8LpoqnYNcm+GtSmEjPltNGCtNaAXMdCHTzx6lrzfZuj55KYmuhJvwotOyz43p/EgeQQUqhIWlHJKmd0VVP/ELJzVT3XvAOWX82SQVMLYECXdCCQ9U5QUzM2kU= X-MS-TrafficTypeDiagnostic: VI1PR01MB6480:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: +BbV5fZSSDFLNHIxazTbEnQ5EtsRB3AI3Pmnj6kUGM33wyBFngA/rH1xoUxQgKwhwf7eKDKma6TVGE546VF2R5KC741IHKNjudjkwt0YdAHGSzzWdqi6Kx5g5YFQ+TX9Uzbw6XhagPVjcorzuxkWiXzs5OFEfQonjtCyCZQnjzpo7gzzDEKd5716b4WSytkuSVA1lIWtzWbvBQL+1OWNn0riYccJ6mamVMKYVWqPB+wkrS2hidohu8gjXwejY5SW42XSvy70CQfoosPQ5Yn1jTU9U0m1cYfPfp6Ldde1StG2UD0nOCVf254+27Q53wBLr07oYC8+Z6RkmaMoQvsaQU7q1m2fhWEO2b8P25BH8ZnMRYJupjnpf1Mrx5TaYOMnfSsPFkbFj8DqAtXNJBPzhmEHfMKiekYHT2/OhF6s/IoyaZLfzFP7lxinkHNgpyw8AJIe3yCpdD9uHX7oKZYaRA+qGT9+uKB868SQH4qNG+FyY1fMUQ+9U2XyERkueN/LS6UGOesaGreoiXsEjgBJYHue5iI9+ozH0CCd0gt/kIUEf5Bvu1aXkoiUfhBgL2UCe3VSNA8SxaruKVEPcN5ouA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: gMnR2Q8T5jiQDBkrYT4xKxnnixvpujdA9CH80sxALUkehDVkDjL+XENueSMz/mQQA9hvdeksqTcUXNM/y9fpXoByPGZ6oMqU0I1rWTslrIthDODyh0Wm86S9nCOUIuPywpyHloozK2qfuUOn+xq1VsmRB0aGlnc7fn1cVcxoPYQx0J6cdBmQ9J0RnHhk8NTx8x7Lsf//TuYFKFgt2ajeXDVHXpBcJY+Gy50WoBGT2j/G+pNnCUkRM4V554Da899pBzNxVkbydOjg/shdcLMjwMmrWV6WY/qC0yaqf586Bd8V95gyiNO6ABKVrxISKE4K+TQK2BCaAwd9DXABLNasSq7M+EYF039p74koR+tf3/QNi9+756sn8k0yqpHne4PRJiRmQobK0oxMWXiCZzy+bNamRaa458nimmyekcJfehwN4tqnj3D01bzV4d8+jqBuEiJAMlAlTuAVs1f55G1i6SFo+4/Y0gTAjI8Pf96ZuauviKc4RPOJyfd6PABJ0Y/UFZZd72VoJMbe5kkYXbyNgCFvWB2M/zcjxoeGEk63vdF7Ntlj2YGOiwqDArmkwMe1mOils79hHtecHsXHflrN0tXTeJ6Ky1Pt/UEyo/aFA59LqybmRHa7LGkovpy1eUCTfcobnH5R1yyXA9O41Bs803XdVFmW3YuVaodmy59siyhs+ybHdgkV0gBlgKqIJiFwHBzqRVVor6xoLxlDBXf5Z8LgBo7M8L40MCVzrrxBwIleEZPyj9IhL657O3N1H2bsGxoCScp0e0eVAmNecHVBOF8oI9yQVQ4fkkS+lt11Kswq5++Kb3h50ob4s8D/YVvxSdTmYRYJzkS4XKvVxPpgMy7AzJZm9kFqnR4B1nam8cMaFm0rQ0LPQFjxbxzw+Fp56Q5uplu58BhnpNEs/33O9woMIt/ya7xa9diw4tEwlGAf7VLiK/xJ83mVCbYQa5dMY9+loP3bXG6+k/+m6T1F6dh9XOEcaQwPuatrb+CLDD2bkJh7Pv8D9aznXp4jaNc7T2DhWbZQTU635LeYHv2S16Cxx6mxVRS19V8vqo6qFgcAkJVWz8wb8WIPfCxG7fRdfRr5gPxyte7jJDwwVmp3+aCZWdquSTM2eBtuN59Ny1j/0IOw0mIZHBhYtHGAqSkU0tAkQGoHqIT8lKdbUx9QBHYFLbcbrCkkaWgJDJuf2UMqitsUDWfL8nShSFl/4JcC76N70TXjr4Umb+8L0P2y+Utk/YGFIUq026U1gZ3+CTkzy/tF08E+I6OccCh6wQfNRl0C5y6svUWu4pqBJIuNz7ItON60Q0P3H0Hz5ZUXhT0SeKUveTH9AXpU31IMRBn0iAmNQD+6ZV8UXAfh04mzXh4zqRMF44IIXy+lOJxAGwoNXf9ttdTKrbm4hM4eDqRvkaeqp5DivAJmyUq4CNiD4WGW+7X3MX80yvXanZmqw6731Mxf7V3/uPiJaqA8nspW X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: c7bf7977-b0dd-449c-211c-08da296ed4ff X-MS-Exchange-CrossTenant-AuthSource: AS8PR01MB7944.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Apr 2022 23:28:42.5321 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR01MB6480 Subject: [FFmpeg-devel] [PATCH 06/13] fate/vbn, tests/fate-run: Delete intermediate VBN-files after tests 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 3L81flccO6eg Signed-off-by: Andreas Rheinhardt --- tests/fate-run.sh | 22 ++++++++++++++++++---- tests/fate/vbn.mak | 24 ++---------------------- 2 files changed, 20 insertions(+), 26 deletions(-) diff --git a/tests/fate-run.sh b/tests/fate-run.sh index a96ff049b0..3c62246c8a 100755 --- a/tests/fate-run.sh +++ b/tests/fate-run.sh @@ -393,16 +393,30 @@ cmp_metadata(){ } refcmp_metadata_files(){ - refcmp=$1 - pixfmt=$2 - file1=$3 - file2=$4 + file1=$1 + file2=$2 + refcmp=$3 + pixfmt=$4 fuzz=${5:-0.001} ffmpeg -auto_conversion_filters $FLAGS -i $file1 $FLAGS -i $file2 $ENC_OPTS \ -lavfi "[0:v]format=${pixfmt}[v0];[1:v]format=${pixfmt}[v1];[v0][v1]${refcmp},metadata=print:file=-" \ -f null /dev/null | awk -v ref=${ref} -v fuzz=${fuzz} -f ${base}/refcmp-metadata.awk - } +refcmp_metadata_transcode(){ + srcfile=$1 + enc_opt=$2 + enc_fmt=$3 + enc_ext=$4 + shift 4 + encfile="${outdir}/${test}.${enc_ext}" + cleanfiles="$cleanfiles $encfile" + tsrcfile=$(target_path $srcfile) + tencfile=$(target_path $encfile) + ffmpeg $DEC_OPTS -i $tsrcfile $ENC_OPTS $enc_opt $FLAGS -y -f $enc_fmt $tencfile || return + refcmp_metadata_files $tencfile $tsrcfile "$@" +} + pixfmt_conversion(){ conversion="${test#pixfmt-}" outdir="tests/data/pixfmt" diff --git a/tests/fate/vbn.mak b/tests/fate/vbn.mak index 6c3fe82c99..91ce3c9639 100644 --- a/tests/fate/vbn.mak +++ b/tests/fate/vbn.mak @@ -2,34 +2,14 @@ fate-vbn-%: VBN_FILE = tests/data/$(subst fate-vbn-,,$(@)).vbn fate-vbn-%: PIX_FMT = rgba fate-vbn-raw-rgb24: PIX_FMT = rgb24 fate-vbn-%: SRC = $(TARGET_SAMPLES)/png1/lena-$(PIX_FMT).png -fate-vbn-%: CMD = refcmp_metadata_files psnr $(PIX_FMT) $(VBN_FILE) $(SRC) - -fate-vbn-dxt1: tests/data/dxt1.vbn -fate-vbn-dxt5: tests/data/dxt5.vbn -fate-vbn-raw-rgba: tests/data/raw-rgba.vbn -fate-vbn-raw-rgb24: tests/data/raw-rgb24.vbn +fate-vbn-%: ENC_OPTS = -c:v vbn -format $(word 3,$(subst -, ,$(@))) +fate-vbn-%: CMD = refcmp_metadata_transcode "$(SRC)" "$(ENC_OPTS)" image2 vbn psnr $(PIX_FMT) FATE_VBN += fate-vbn-dxt1 FATE_VBN += fate-vbn-dxt5 FATE_VBN += fate-vbn-raw-rgba FATE_VBN += fate-vbn-raw-rgb24 -tests/data/dxt1.vbn: TAG = GEN -tests/data/dxt1.vbn: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data - $(M)$(TARGET_EXEC) $(TARGET_PATH)/$< -nostdin -i $(TARGET_SAMPLES)/png1/lena-rgba.png -nostdin -c:v vbn -format dxt1 $(TARGET_PATH)/$@ -y 2>/dev/null - -tests/data/dxt5.vbn: TAG = GEN -tests/data/dxt5.vbn: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data - $(M)$(TARGET_EXEC) $(TARGET_PATH)/$< -nostdin -i $(TARGET_SAMPLES)/png1/lena-rgba.png -nostdin -c:v vbn -format dxt5 $(TARGET_PATH)/$@ -y 2>/dev/null - -tests/data/raw-rgba.vbn: TAG = GEN -tests/data/raw-rgba.vbn: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data - $(M)$(TARGET_EXEC) $(TARGET_PATH)/$< -nostdin -i $(TARGET_SAMPLES)/png1/lena-rgba.png -nostdin -c:v vbn -format raw $(TARGET_PATH)/$@ -y 2>/dev/null - -tests/data/raw-rgb24.vbn: TAG = GEN -tests/data/raw-rgb24.vbn: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data - $(M)$(TARGET_EXEC) $(TARGET_PATH)/$< -nostdin -i $(TARGET_SAMPLES)/png1/lena-rgb24.png -nostdin -c:v vbn -format raw $(TARGET_PATH)/$@ -y 2>/dev/null - FATE_VBN-$(call ENCDEC2, VBN, WRAPPED_AVFRAME PNG, IMAGE2, \ PSNR_FILTER METADATA_FILTER SCALE_FILTER \ NULL_MUXER PIPE_PROTOCOL) += $(FATE_VBN)