From patchwork Sun Apr 24 03:34:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35405 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b9e:b0:7d:cfb5:dc7c with SMTP id b30csp1219858pzh; Sat, 23 Apr 2022 20:36:27 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwVabIrezHIO2LIpT1RmJBAI4vL8b3RogiAEV7GBtqkYinw1++R+X7QARPoL3Pzr5mx5vg/ X-Received: by 2002:a17:906:dc8a:b0:6e0:94bf:1ec3 with SMTP id cs10-20020a170906dc8a00b006e094bf1ec3mr10326790ejc.447.1650771387442; Sat, 23 Apr 2022 20:36:27 -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 s20-20020a170906355400b006e87c64e80fsi10440866eja.86.2022.04.23.20.36.27; Sat, 23 Apr 2022 20:36:27 -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=sQZ+fxYD; 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 EB58868B3E9; Sun, 24 Apr 2022 06:35:03 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-oln040092074062.outbound.protection.outlook.com [40.92.74.62]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F307D68B2F6 for ; Sun, 24 Apr 2022 06:34:55 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=N6Q/TNHfFLdyfRXK4SFD2ovVwJSwIpbRqWrS5qygtu7r9E49JAMGPTucor9UxNu7mE98W8Zq/awoaYjyw+Podiayc9ZiFQG1//VxJenf50UAqMSPV9rTWHmcAPgT65Vjucd9389G6peY/1JgstXkUpx2E2fBB0nt4m2xk1d/8hBRPheOfyaj4Kc3zABPX86kFtoA0XB2CV+3SSBJM/9oBqa9GUC7ODnKAr1i2GktgsDOTF2Ipn+rEARV+4jEeaWkgAkgI/wrQuZ6Nmvaw1X4EoXiqaLBNriyG7QasHTLIUoSe+cfHruglblEtD782avJGkdub8rSxwwaoWmSfJHttQ== 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=IMtuj5waTdpMfNxyae8mS4Rp0s+MdVIz4gSs25xw+YU=; b=gCxzabdSqSQS56ph80Na1//LiIwxgMCYuaOpxnaknk28L0yOwswMXr/XpGbjysciiK4NgdE8OWZKJ0ER5LULa3O/OKzLCF0bMX4NVuCHfXR9ZpAqB0h8vPe1rVGXxDoMFERbzcyh3LBpzvMiPoCdFS8IJOrTEYWiWO1VW349XDMOBt9DcWiGxCiE+eysFQFxrMU9EC5Pcj4aT8Kp9oJXuKvvsfWoi2PTgpQ/87/qyME6mcfPT1aS6KiVhAf6MCdwED3FVMh78IxxZ7S/dkj7V1jw6nHQ3Cyk1auPqEpIcl8HltvFqKSkEOn9ZeaU96c3nk/SApTOif6VpYEEFaJCRw== 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=IMtuj5waTdpMfNxyae8mS4Rp0s+MdVIz4gSs25xw+YU=; b=sQZ+fxYDY9VBDma7+wsOXiCorIkBRc9aUuj4BrAukThdEDjnk/vyZO1m39w3eh7ZcdTKuyzwySwd+4TIzkPRrqvDER1uQFKHFRtF/Mr597ne7rMCWzhC7ULZECQGdwR70svuC7NL/xke6AZgrllCymhULgVLqqy8p3P7iMJ/6sy83Vg7pFPYwpJ3E5zUcUifJBxyDvm6lenUvVOuwS5Fv1zuctlpLpoKAb7/5hOyF9bCKBKclmGgOB73L2YYGc4rJDXhGNva7r/+8Pc6cVxYy6JllfUTTqjjkFySKNGKM5ZdYwA8j6zFU8WuAs5uDllQdSTnhhk+JxpI8MkKnm9jXw== 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:34:53 +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:34:53 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 24 Apr 2022 05:34:01 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [/TIaTqDLSrXKZmnKD219M9/6T0fy28T6] 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-15-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 49fc71f6-107a-469d-54c5-08da25a36515 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiT4+P6zBac8z1eXEhCqSjjDakgk9ou+wVxje5Cp1JMeyFfyLgwor3/3br4QoswymLMevwSL8PaEgdEiLg/ncji9Xx2L70nSB0yy3oxzjnbYISp6rXqow1agVgnFGk5jEB0fvBUBmikOHjR1tFyNXSgQUt/spuIoOFg4ED3063mfXzFMZy3H7TzNPNWequfZBdNus8ceIHyMQnZszWfovGB2Wxjga2GGYqCW/qu+aimeiu/62FeLDWFnivRj9o88I8fyisQPWqIrMf2ofONyi2cPRdF10iGtIpxWFuSCAMD9T/szhOuviLev9fDF4gvYUtyPLtHTImCoyrx6KubBL5tHn6BJDmEQbrkD0tXvV5Nqqtf3PwjawYt37Kigoayc9MtB0C3Q3tfKB/aCpW/42dTIN2dCrYxgmGcAl6AQ9FdwruJtJFH1Td1Ks8rDtBptbG2/uf/6ov3pE7UeXeuUWfxUrXweTAMGlbdr66Ac8av56t55E/xI2YfaKX+tWXPpNByJCIz/tWq27W9dmJCPzl5fwIitNzY5A/yTrV3o6rqtwDNoBSH48SzYT7gYZt7TWHgSQE+R6wuJjuR8yk3IguGdI8/9ljmp+0KyoCDmzepkkgrP/9eA4FXNMr8CpTzYdynk13Igu7ZFoCggn8B6NwK/U9rTbaO3xzAA+Sm9D5bMqD9txzfE2pjCiM1UykiCdoCHzIkGwtYkcLWCKTx/ZDy9sVmQ2NgTBD6fW0o5ef1BgZfXoNjVhrC3BYFtjB1rdXY= X-MS-TrafficTypeDiagnostic: VE1PR01MB5534:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: RcVn4UgKmq8/QfMYQyl4DoFuYZzWWieLk3uZvWKoi947yUb4n1/Acf4AcCV9Mzt+hMvfZcNky0faq5lYcLFIEoV96OvmXofEuN7AuZgZ41T9OysQJS2iKzrqzKJhTpX0qyE57dfeKGxaddx6NLsqWGzRtHg1IgvcY1inFdAw5fqrOUb1K+wuGRBsHG7QwHIoI2rr1LXJg04WD6lTYCAky8q2oPmIOLPjrU/rSX9ew1gIaccHyT2zkO85Og+/xeILh+jxS581U0Q24yYvubrZNgceFI6U/IZ45hCxiQ/cvo+4gegSquTJ9ddPPy3ccrWb9Pi9Wd1qUQjGSOwP6rAATSvefN6anshhybKe0YILV2KFf2kr+MiHB+12C1TnX6dI8ZJRHSl/sraA9fcwCYnMU2M93t3V829xW2zgxDFAW6LsqAGdh5Xs4uklFrldG/yUOQ5fHzPPVmdl8I2J77qlrAR12onfqLKwwr/1g+syrbVdy/Mk0Ii2wepZc9t0sHQkFjwwrbXzlIQDBBbKp6EozA4SGRzgI1YQ119XtC0NkCguHNtxD30xMbYjQE03pl7y7gk+Cpw+v1sUCmBI0lSggA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: JVX5oRAXUgz3DeYxYDM/b2t+fKMbMdNq3KDgHtjStKB93ijfSWDgoyHEUSNt/xURf2euFYujFtVZfwQWfxSI+4Ok6mQC4nQXKlqalVsU7Eg/4ZkkSXzFhqBOHU+rlxlLK6YBsZLmqhq9YJyKVpqaS+vVPp6igoUkSEkOzOTtyXwSbXpYWjMCBs68UF/mEzZHBJl8b65Dulq8aBIuOwRCHojj9eIGiYIPsqekTL3gxnPgdokU7Xu0HlwIRPEVXOcNDg2QFd6Inh9YMgIiSCpA47J3ZFVhBSYcDcSAcfDeR02tb4E16sETV3TmpdXT2qeylV2cv2yDyt1WgeULc7GBzzYOoV0oJ2FA9yYh7U6iML+vacOvXdtngY2M/CI3h+fXw3/pKhyE2N/TZdYFkXjxQvDGlFWxoyKasrUBPi4omj7wk/VE5KqNWeoPqgi9R3Vulu3WrWpz+n27xQ9GC5Yy9GO0ufk+GH86l5HnOuUvnXHXh6+zLm8LdYzDkRz1jugXgoOsQdGslrsIgBeK4ialbnYiflr803WfRSX6QksQSecRIXTukMHMoALoST0jWUi1QCNZ2/YyW823TsYDN6iuAUXjxALsDZWWUdlkSqoiN2lcljY6SOlNha6QejNRPA+jFdt3fSiWM/DOTHHaUtZakzXQrDzpyXuVmq+3tQ8hr7R0LL49Q2vDJHJMXhf69Dh7DrnLHdoRjSFTPHuGc18LIe4bJfaZ48ltGEvPEel2mQ0iozAYAJx0BHe/qjV+7QjB0wFBqxCU2x2svq6/tCdC9BbulQOHVMRbV7QXYagfuEKhtx9JtSrVznuCaiMdESEBfNb4n7iA1FBC4F4xjP3BUSEYHkbg3C56VDe9B4krzP9efgkRBNzyUEBSc8bY1PEqrSMY4uL4LbuIlqs7D9zqQ14Q70i3Fg4A4C3ILBhs2XJm8p4KAY7poX8hqSQMOvNg+6ra25bdVxv/ZKzO+40sZ22A5MdvikiOlLArYZ/t2kX2s7vm7goy9Wytuh1TjTqpmZg6+X51KMbb4msR1pGkA/lP9gQl53lvDZuqPkbF1x7R1CTKkeZk/0FyW+ryn4mCFtK/PTTqx8hHEcq45LZKkJFX4WW0dr1YkpcXCk8bpgNyMWcnwpYCRZZClFowzTuh5z4vNzFaST7AAbw3s4oZ5L0mgTFJygz8mConP1PT6XghEeamwy8D71h7qXdHvUyJRzVg8qzsfy30b5yepeu5Bc2/QHyuOYkRq9c8FBQK6F5Kq1GSkcOb1OzqgK9k5txxGC8rWwqkZpNJ6zyp2D6wqK6cF0HDcGsk4JOrYD9pwuGA8baARCxMVFQ9200sTAnetZwz0aaSBLPnb4XTqAT+TGeZ+m/A621lc8zrkyOHKTPQ7pySIZRxZ8n8EB6M1YrjXROC8c+vDokjWkGjI9dxiz/MhB9BusOnbsPgSzArnubYRcwOEmsUDIRIthj18h07 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 49fc71f6-107a-469d-54c5-08da25a36515 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:34:53.4014 (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 16/32] fate/fits: Fix test 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: bQAUMB2EObgC Signed-off-by: Andreas Rheinhardt --- tests/fate/fits.mak | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tests/fate/fits.mak b/tests/fate/fits.mak index f16fc83266..ea471d6654 100644 --- a/tests/fate/fits.mak +++ b/tests/fate/fits.mak @@ -18,19 +18,19 @@ tests/data/lena%.fits: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data -i $(TARGET_SAMPLES)/png1/lena-$(map.$(@)).png \ -y $(TARGET_PATH)/$(@) 2>/dev/null -FATE_FITS_DEC-$(call DEMDEC, FITS, FITS) += fate-fitsdec-ext_data_min_max +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 -FATE_FITS_DEC-$(call DEMDEC, FITS, FITS) += fate-fitsdec-blank_bitpix32 +FATE_FITS_DEC-$(call FRAMECRC, FITS, FITS, SCALE_FILTER) += fate-fitsdec-blank_bitpix32 fate-fitsdec-blank_bitpix32: CMD = framecrc -blank_value 65535 -i $(TARGET_SAMPLES)/fits/file008.fits -pix_fmt gray16le -vf scale -FATE_FITS_DEC-$(call DEMDEC, FITS, FITS) += fate-fitsdec-bitpix-32 +FATE_FITS_DEC-$(call FRAMECRC, FITS, FITS, SCALE_FILTER) += fate-fitsdec-bitpix-32 fate-fitsdec-bitpix-32: CMD = framecrc -i $(TARGET_SAMPLES)/fits/tst0005.fits -pix_fmt gray16le -vf scale -FATE_FITS_DEC-$(call DEMDEC, FITS, FITS) += fate-fitsdec-bitpix-64 +FATE_FITS_DEC-$(call FRAMECRC, FITS, FITS, SCALE_FILTER) += fate-fitsdec-bitpix-64 fate-fitsdec-bitpix-64: CMD = framecrc -i $(TARGET_SAMPLES)/fits/tst0006.fits -pix_fmt gray16le -vf scale -FATE_FITS_DEC-$(call ALLYES, GIF_DEMUXER FITS_DEMUXER GIF_DECODER FITS_DECODER FITS_ENCODER FITS_MUXER) += fate-fitsdec-multi +FATE_FITS_DEC-$(call TRANSCODE, FITS, FITS, GIF_DEMUXER GIF_DECODER SCALE_FILTER) += fate-fitsdec-multi fate-fitsdec-multi: tests/data/fits-multi.fits fate-fitsdec-multi: CMD = framecrc -i $(TARGET_PATH)/tests/data/fits-multi.fits -pix_fmt gbrap @@ -40,7 +40,7 @@ fate-fitsdec%: CMD = framecrc -i $(SRC) -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 ALLYES, FITS_DEMUXER IMAGE2_DEMUXER FITS_DECODER PNG_DECODER FITS_ENCODER FITS_MUXER) += $(FATE_FITS_DEC_PIXFMT:%=fate-fitsdec-%) +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) fate-fitsdec: $(FATE_FITS_DEC-yes) @@ -51,7 +51,7 @@ fate-fitsenc%: CMD = framecrc -auto_conversion_filters -i $(SRC) -c:v fits -pix_ FATE_FITS_ENC_PIXFMT = gray gray16be gbrp gbrap gbrp16be gbrap16be $(FATE_FITS_ENC_PIXFMT:%=fate-fitsenc-%): tests/data/fits-multi.fits -FATE_FITS_ENC-$(call ALLYES, GIF_DEMUXER GIF_DECODER FITS_ENCODER FITS_MUXER) += $(FATE_FITS_ENC_PIXFMT:%=fate-fitsenc-%) +FATE_FITS_ENC-$(call TRANSCODE, FITS, FITS, GIF_DEMUXER GIF_DECODER SCALE_FILTER) += $(FATE_FITS_ENC_PIXFMT:%=fate-fitsenc-%) FATE_FITS += $(FATE_FITS_ENC-yes) fate-fitsenc: $(FATE_FITS_ENC-yes)