From patchwork Sun Apr 24 03:34:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35408 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b9e:b0:7d:cfb5:dc7c with SMTP id b30csp1220036pzh; Sat, 23 Apr 2022 20:37:06 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxHfgt5nF20UBXtRTkIUYaCERjUFVy3RyTM1/GmMWXbS1dS+aQ+CD+0Fn8mR5WUmfZeU6Be X-Received: by 2002:a17:906:3799:b0:6ec:d25:3afe with SMTP id n25-20020a170906379900b006ec0d253afemr10760473ejc.44.1650771426156; Sat, 23 Apr 2022 20:37:06 -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 b2-20020a170906660200b006e09345838csi10780222ejp.743.2022.04.23.20.37.05; Sat, 23 Apr 2022 20:37:06 -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=QsEEhWSu; 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 8108768B42F; Sun, 24 Apr 2022 06:35:07 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-oln040092068084.outbound.protection.outlook.com [40.92.68.84]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 435CC68B3FF for ; Sun, 24 Apr 2022 06:35:03 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SyoSLCgKOrMBkJUhD06Oh/PzRdL/aMvem33O1x6rvNsaotQYSLrpWDTR3TMEfWtaPohiWhWFhSWv0EEvoLmH48F0Goa9DXx8kSaBHKtnHQpqkrXB5G0NaQZa+6hV9wljpCbyU3CjnqqvqwZetGN4C/tgtevPj3YxyivM+PiGTnvfLYD+8NyevAEEZJm9JaRjzZP8T7BqO8f4pJO1N5NiXWrf2ypeG5VfTwZeQTz2HvVG4ydhd0GwWwpg9TI7RlXrzQD5YZfxjegolHUJxzTe3M4L9R7n/t98I+vkoxw8P9xmH5BieReDRT1AdrtoFCQ64qeByQyZZ0jUOgwm7UdKWQ== 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=Ix7AV0xTu1vq2bmA5982lo+U7frIY+9KYtPtetV9Zr0=; b=TxNRiIMwpD7Xljre5IRbTz2esXsW3acvfrLpF0ZDgVAK6g/63m8UAp+U+9v0NKPAJgqRqw425P9RQ3u4rsW++W2Oo7vYmbYSM8dZngUufDk6WS1qvmErx8fg+xG8dp7mx2dxHue+e/c2QTGxG8Q1Kze3izT49i3I4hdnHQgIOnDEUE/KnidpAU0g+eCq7P7lXbs9qNnf2YdaXIC1vHCtfOrynjbyNlXmwVlZ+7Wayir4/jaUJs0yxFs+HmiyGCvZqoayvtUdqhcQSr+EFq/h6mJY6HEOweErWmwPJ2NQ2SRR5xDksretdrDqbmcLPXJYXJDtqPIedsRi3R9T4xb8OA== 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=Ix7AV0xTu1vq2bmA5982lo+U7frIY+9KYtPtetV9Zr0=; b=QsEEhWSuArDYG60kajDnJKUEg5xZvhM5x9+NLt9jtMwLilsWD7eSAvnvbJIZ92+EIbXEzc5grfdh5kENqVVQFNnmgg6/+Huvycxu2V+Tr8nLkmmzvlHwxj2wz2vwqqj/qiwALOkBo9M65RH7bn0OHSLniGhez65a/7BlJFESRLdUr8rpPDosMmgRjbzS2jAoM33RczJnwmVHKnhynv7p0HewHRw937APO45qNFoc29cvSXS7cukaueJEj6K+kocin/pIMS5eAIABM8MaAwvuc33Ob8Y9Dp2oj0N4ZLtPSWbav3Na+lgQ6y2RLM7Ck919U8WhADSA+uQbReC5QnVfeQ== Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) by VE1PR01MB5534.eurprd01.prod.exchangelabs.com (2603:10a6:803:11e::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5186.16; Sun, 24 Apr 2022 03:35:02 +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.020; Sun, 24 Apr 2022 03:35:02 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 24 Apr 2022 05:34:02 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [7t1unveB5ZOksbhgCKana3ZAFw7g9FXJ] X-ClientProxiedBy: ZR0P278CA0118.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:20::15) To AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) X-Microsoft-Original-Message-ID: <20220424033417.797645-16-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 251f1f86-3261-4dfd-cc12-08da25a36a32 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVNZZwRrMzTbTWNwFwaPCdf+T5sz059MzTyyY1HMNQGjTF7elK1fLsIISdX66tI73Qrup4/IlL6abnPMS8K+m15WCwwMLyNwPq3Tn1FpvbxIiOCwBZUWT0fzGAMyBF9bVAvEnl/BCx1GEAC1bjU3WxSJZSLj3dX9dkA81dvbQPEg+yRzRmKojY+HDHma1KUgFpfAqvsRkzVrVtj6cPzxQ7oR7BouBDBTGoRIDaVffUOSLxZhEDAQTIUNl9BE8n4OzWnTqWxhOeZIUczIOUS1r3cw+I+ZCn7BEIrH0P6cIYHtAWv3Am/rumGYLkc7I7OBetX7QjegOyitKYkFp0WMFB4NU9uomWc8RNEdPgi7t3+nfMfs5CMd/gfJsK5yCPQmw8zUscJBs1IKFNjy1Aq8tud56ESInNMLpx78oCeYjMXNMSa0zcEY8FdHhLXsAv0S+cdAp9lBbd2iubNDc1mG2XTGYj7VEtbCph1gwliy05Az58qUxWZcwz4apMMCXp7muRFzpwKMG79gzTvFlR+pDCS/eTLY4f7XKfpVADFglHp/BfnCUkwp9x6hSyvm7HS2j7EiBRnkVl0E0MlGMUq6xkBoH4N59ZI4HmO4QGdWJYMaKMCfvHSut9uqtOmLpTB5T8h/Ac6BAO0845nHcLy6MYHAoEcDL402PuHkx3oM4yKw3M+8qCyukfyOfN7mHoYa0tR5XIS8PK+qs8cHjYeBWkieEfbIZ9VyjI= X-MS-TrafficTypeDiagnostic: VE1PR01MB5534:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: l7m6IM1kuz3wXS4K6B3AAgnh89XFY9hpuaR0/1uGly/wlE5XiwWmcFHLD7y/HpdwWh2wkDtJUa0VM1eoKVyqO1cHDQlSHAUEsPQdd8uD4TcHZPEOgpSUFIYWGV/x4Goe9oMCgZMAdOXaEpYlhAJ0SW+AUp4ffQJRNz+uuk0IhgCktK3GPEzTh2xlldc0lPL8JWwzeGMiaQORDOsO2mAvvFpHnrlWWXmFaFwtzxWVkAmWpMJGcl+QY/B3Ye3B/p6wmrbbgxBEqexZtLn/5dik0pjlGaDI5P7E0vwR0N9tgUnu+KnQtWnROGy6ef3scg/MxzoYuwCTjMNDjSHP0StI+pPI3htvB7C4cwtXoqmFgU98Np8HdVwRonyF8QPlLvyDzCmiYYNF6msZber5S/7akK2Dly4gFkM6Q4g2VutBWayu40rkczWe1nM/C8CnFiEtOGJAMV8lRB0ChelC+z/nvQU/au+SbotNw3DK5lLPJRh/iEMry1lNo4vkaMu7EdWTqJIEcsvrc1UBgJww6e+2TefRKJmcTVOxGcqgUpl4tt0jV5tcVdecsVdzICWPth41UC8cwPrFyIBgetHrsiqdrQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ypYeE9liNywY8ij5mpozwQzNeER8AyoAavO/I0RLyNJwL5PRjuiuVJ4C63aZb2OqXwiC+JSXjJvITRWPb23M85HJOtREF0S9sTP+ARUHSBdKv1+J7t2h9B+Ds0yaj1dZ77EW2CyEO4QcVW4M4grcztySH+dxMDAHHuMF2B8tIkbvFVhHaxFwfX7K/v8rEAvm1wMOGxDwmXC1suNtVJLVcYrnfkxo+0SwN2GXJhpQb4+xWiEjt5cl621mgloGB4ziuuV8vsopk1Hn0UsMHKNwId7gvVzJdaS9SC1n5UjJHdbnbYscxsmaaHMXXJv0M91nQP6Xde4gwZVZR6lRSlwEZL8Cl6q7nMrWXCSMRKLPJevFbMUK+bCx8Z2CCEn5hlAV589vNfHJgn6SKtAMKXWFtHVwQt2xDm8SO6fT3QbOdN2SAIRbWcIcU0lVs8gwQ1/M4Gnd8Rt3hh9b/WgC3HyhgSPmUuVUhj8kZlOQ/pFDzirsmN9hCcBDO7QMuoWK3668/XV3JFsOIeFBQLV7KGtLdzFKPBt4U/mqK/2wtb67K0f4Bc4P+62S2dN4x9RfUWd882AxcExsstL27VPt/mdgZTS1qQ7haktDPtpMeAjLL4R4agGQ0IbfGQEnn7XwP6Oy62QERFUsaKw3UFE7VXvAM+XOwQ+vqc6qokASqPfIMV3yL98+7Mx3IgcI/UkowbgcrddTf9Pp0s2QpfhBnddfoxRsIEQZSGiwndXGlHy0Vtv4jR1axCUNK3QzGbw3paYz7kJMyayUE6PDH0aADtfoywBfVIJMGdP5EpPuiQ4WGkljgzvpN7Cz6ZkiFUYjfGvy+bagg9qIW06HKOjHLpNPheHbGVC5gJZjA9yLiQtz8gGHxoaFQNgvw+p5ZYTTBJr1FnaRHJfHUISe5cnjfkn5pr6YIJq6MztojT1agKdke9cEC4tPgz6RaH8s+9M+GOGrXGRVuoGu3mumCuK1QwZutCwYbIWTacXWRYQDjFvdCFFcqNarlAOxK1VkByjw0atdAF2ZUSsbNTSFaYamQ5aUCgCs+jz7ziJ0mUVAwOhLXWMy9CKT928hHO4vtkhQPKkywjTjsHyi0SessEI/Sx1ddP5ndmpmA7fpw8V3DbcnDqJKVweKlKJYKEXr/unrRLB0HLqZmI4B4RwZzXc/q3YMI+uvl2TCBt33o4TzSGdZqDWogCom8Ux3ksT3VTYTBvEDJ6bLjXl36WEEBqIRAU2ZVyWK9EwBMUdaQq0+YajisdQKKbUmkzLwCchltjj4rFsn9wGnPU/+8tz5/ahlBNzwIVsT5BqIn6Xw8mhTfweMFcS070MJ6vRauZO5yb1d20qzd3QknL75eTNOMweMtgaBEKXqwM8DBkjLyKy8JW5hthsS8k+f+P+Vy2imX/8Ww1eX5fA59sjyJr1DkIVxbLjFFarGI+SctUWOKxzEhAfTvJ/BLx8WeIRSuGAITc2zXEP+ X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 251f1f86-3261-4dfd-cc12-08da25a36a32 X-MS-Exchange-CrossTenant-AuthSource: AS8PR01MB7944.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Apr 2022 03:35:01.9976 (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: VE1PR01MB5534 Subject: [FFmpeg-devel] [PATCH 17/32] fate/fits: Use transcode for transcode-like test 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: Xr3ZneEj+LuQ Each of the intermediately generated lena-*.fits files is only used for exactly one test; so it could be deleted right after the test. Switching to a transcode test (which is also more natural) achieves this. It also adds checksums of the intermediate files to the ref-file. Signed-off-by: Andreas Rheinhardt --- tests/fate/fits.mak | 19 +++++-------------- tests/ref/fate/fitsdec-gbrap16le | 2 ++ tests/ref/fate/fitsdec-gbrp | 2 ++ tests/ref/fate/fitsdec-gbrp16 | 2 ++ tests/ref/fate/fitsdec-gray | 2 ++ 5 files changed, 13 insertions(+), 14 deletions(-) diff --git a/tests/fate/fits.mak b/tests/fate/fits.mak index ea471d6654..b9e99d97ee 100644 --- a/tests/fate/fits.mak +++ b/tests/fate/fits.mak @@ -6,17 +6,10 @@ tests/data/fits-multi.fits: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data #mapping of fits file formats to png filenames # TODO: Use an actual 64bit input file and fix the gbrp16 test on big-endian -map.tests/data/lena-gray.fits := gray8 -map.tests/data/lena-gbrp.fits := rgb24 -map.tests/data/lena-gbrp16.fits := rgb48 -map.tests/data/lena-gbrap16le.fits := rgba64 - -tests/data/lena%.fits: TAG = GEN -tests/data/lena%.fits: NAME = $(map.$(@)) -tests/data/lena%.fits: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data - $(M)$(TARGET_EXEC) $(TARGET_PATH)/$< -nostdin \ - -i $(TARGET_SAMPLES)/png1/lena-$(map.$(@)).png \ - -y $(TARGET_PATH)/$(@) 2>/dev/null +fits-png-map-gray := gray8 +fits-png-map-gbrp := rgb24 +fits-png-map-gbrp16 := rgb48 +fits-png-map-gbrap16le := rgba64 FATE_FITS_DEC-$(call FRAMECRC, FITS, FITS, SCALE_FILTER) += fate-fitsdec-ext_data_min_max fate-fitsdec-ext_data_min_max: CMD = framecrc -i $(TARGET_SAMPLES)/fits/x0cj010ct_d0h.fit -pix_fmt gray16le -vf scale @@ -35,11 +28,9 @@ fate-fitsdec-multi: tests/data/fits-multi.fits fate-fitsdec-multi: CMD = framecrc -i $(TARGET_PATH)/tests/data/fits-multi.fits -pix_fmt gbrap fate-fitsdec%: PIXFMT = $(word 3, $(subst -, ,$(@))) -fate-fitsdec%: SRC = $(TARGET_PATH)/tests/data/lena-$(PIXFMT).fits -fate-fitsdec%: CMD = framecrc -i $(SRC) -pix_fmt $(PIXFMT) +fate-fitsdec%: CMD = transcode image2 $(TARGET_SAMPLES)/png1/lena-$(fits-png-map-$(PIXFMT)).png fits "-vf scale -pix_fmt $(PIXFMT)" FATE_FITS_DEC_PIXFMT = gray gbrp gbrp16 gbrap16le -$(FATE_FITS_DEC_PIXFMT:%=fate-fitsdec-%): fate-fitsdec-%: tests/data/lena-%.fits FATE_FITS_DEC-$(call TRANSCODE, FITS, FITS, IMAGE2_DEMUXER PNG_DECODER SCALE_FILTER) += $(FATE_FITS_DEC_PIXFMT:%=fate-fitsdec-%) FATE_FITS += $(FATE_FITS_DEC-yes) diff --git a/tests/ref/fate/fitsdec-gbrap16le b/tests/ref/fate/fitsdec-gbrap16le index 78abb5cde7..53ef980b13 100644 --- a/tests/ref/fate/fitsdec-gbrap16le +++ b/tests/ref/fate/fitsdec-gbrap16le @@ -1,3 +1,5 @@ +64526d8da12d1fa07ceea5725647076f *tests/data/fate/fitsdec-gbrap16le.fits +135360 tests/data/fate/fitsdec-gbrap16le.fits #tb 0: 1/1 #media_type 0: video #codec_id 0: rawvideo diff --git a/tests/ref/fate/fitsdec-gbrp b/tests/ref/fate/fitsdec-gbrp index 8767b6715f..23249f492b 100644 --- a/tests/ref/fate/fitsdec-gbrp +++ b/tests/ref/fate/fitsdec-gbrp @@ -1,3 +1,5 @@ +38e232e4c1ca57b5866efa01da70359c *tests/data/fate/fitsdec-gbrp.fits +54720 tests/data/fate/fitsdec-gbrp.fits #tb 0: 1/1 #media_type 0: video #codec_id 0: rawvideo diff --git a/tests/ref/fate/fitsdec-gbrp16 b/tests/ref/fate/fitsdec-gbrp16 index f6368f2c02..9250690e9b 100644 --- a/tests/ref/fate/fitsdec-gbrp16 +++ b/tests/ref/fate/fitsdec-gbrp16 @@ -1,3 +1,5 @@ +2078208c93ba417d3fe150ba42bf5a30 *tests/data/fate/fitsdec-gbrp16.fits +103680 tests/data/fate/fitsdec-gbrp16.fits #tb 0: 1/1 #media_type 0: video #codec_id 0: rawvideo diff --git a/tests/ref/fate/fitsdec-gray b/tests/ref/fate/fitsdec-gray index 488ee71022..b7992bfda3 100644 --- a/tests/ref/fate/fitsdec-gray +++ b/tests/ref/fate/fitsdec-gray @@ -1,3 +1,5 @@ +c02ac3e0a9f2ceeb1e6e66c085a63671 *tests/data/fate/fitsdec-gray.fits +20160 tests/data/fate/fitsdec-gray.fits #tb 0: 1/1 #media_type 0: video #codec_id 0: rawvideo