From patchwork Fri Apr 29 20:22:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35514 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp500772pzb; Fri, 29 Apr 2022 13:23:49 -0700 (PDT) X-Google-Smtp-Source: ABdhPJypoGOnsjGZUs+TizR/ia4QvxzK3PmUSCo6xHUhFy292k+Z2mr9yIUURTfqyl3LL5uNTMuU X-Received: by 2002:a05:6402:1385:b0:413:2bc6:4400 with SMTP id b5-20020a056402138500b004132bc64400mr1073847edv.94.1651263828879; Fri, 29 Apr 2022 13:23:48 -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 cw4-20020a170906478400b006f3a070d863si9814087ejc.710.2022.04.29.13.23.48; Fri, 29 Apr 2022 13:23:48 -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=l0p2XhSs; 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 E775F68B353; Fri, 29 Apr 2022 23:23:43 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2096.outbound.protection.outlook.com [40.92.91.96]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6F97D68B2E5 for ; Fri, 29 Apr 2022 23:23:37 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=f2WHC+OuYpt8YvJthkqs136gsldzBnnm53+Lkt9CeIBivJDbZAicSRkIS6DX2lhQIFHb5pJCxSGghhusXKJYZ7d3Hi4EY2J8x5zJJjmxSv6vQ29dXOV0DXI6tSg/vx/QC4Iwv4qUanta8FT0hAOB5EwKuLKE9dtV6a8u5G371xH8BFyfBjwe2cL2FqlPFSVJwQlgXmdFVOarpRhTsdJYqXSFwRcv8qu8tWl20QqDK0ywiVMDQnZ+Ku8u1SOYLE/DpNFBhsAmM+FgPyY92gz0pgtnnUP9+Nn4r/7SgcHXTbdjKhflpwdv+ovwQqd1kSsbrKDKVDVXM5cfn2PYqnpfHw== 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=nZ6Uq14faCMmFl0xwGPDEMun7lJ2JM/RXikR5kAVP4w=; b=GoTdx0BK5du4086qzgPa84vLB1mulpGMxV5eO9FvE96qEpikYS/t1T7NJcwwqhY3wNIKkWth0JsGelbgnA2RvOxrDK1C2BLvUbPfUnvVmxfV6m93sBHvDcfvuJxEert5wCWY8i0SBjnL0uSvVjR3qR1J1Hp2f8+xmU+U21goftOlVFMr8nwmmm+ACJGx/IuDWjkNeSUDIpq6g5MzPCR9NnaG4xRv2ZA/ssfFFCpDagDHRY0ASx/G91K78VQ2F+InqXFeaZYOPhimQKJTa3GTjCN13fM3BudumEH8YNFN8SURHp2zpnpAkST0geqF7G2fXTbQ724AWkka7e/hjuGO/g== 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=nZ6Uq14faCMmFl0xwGPDEMun7lJ2JM/RXikR5kAVP4w=; b=l0p2XhSsE3sHnGUyFhqaQqO32uf4czjXooqclHu4yMDzFiJ6ViJonJ4RE8ywPL6qIu8o0kZqAFtq3TNotpwv1tj41MICMyUkCk+fWfn3yrd2nQIJOIMs6vmCBva9gxiq8RmJ9h4jK7GaZpyC5A8KHVcBSr3fr4Vstspqymcbin+UJevV3FQI8ZWirlX9hred5/TPTsvTT+G47Nf+V3PrfI8PsrB1MyozhUyHMEhx4D5iStoi3xYSF2yZEcs12QH8qj8C92GdHQgy4gBqmW8Wkif/pnwoAhYQOUDBHgJWohTAIl7VUFPzCVCvAJCmxM0jKAyJA6tw8GNVa8oG40KLew== Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) by AS8PR01MB7526.eurprd01.prod.exchangelabs.com (2603:10a6:20b:2ae::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.14; Fri, 29 Apr 2022 20:23:36 +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; Fri, 29 Apr 2022 20:23:36 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 29 Apr 2022 22:22:59 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [AMh+TOMdEJ9EnQBYxBe0P7k3Mc0KLpHF] X-ClientProxiedBy: ZRAP278CA0014.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:10::24) To AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) X-Microsoft-Original-Message-ID: <20220429202302.996974-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f8bc3d80-8b61-463b-0dea-08da2a1e2355 X-MS-Exchange-SLBlob-MailProps: dEG5jEBie8lfVH3dIhk3L9KlsA3mdXGtwqLMhcdbG52EYCCm3+6EEuNHZul2jux+ztLLH/C8pHe2PlCXu8rfgLZnfV1SZAG8dtwaECWJo8I1Q8Hg4ChAQdSrPa4fk4gw01MG7fCp7pkl2K2FIZoO4nAa77jcDqiy7na73OJoXBM+RW0BAmGWt1YcswkDGnKCJHvrjncoTGvY+Kw9xYJnXVtvn9t6tprY8UPoprhogp4fz/09X+qmkJn7ThV7bCZg1HI8Sn34UwtmA+JMc2NekUeuI22mvkUC/P00mjDRPK7DpoWwXV5aRcM8xjZ62/FL4m8Ify1XFPgWQZlwqdri0GQuZil8yN5DD+XI0j1FLqX9nFal/HolD66pCy1asPOmNwVGShuZb3piQF53UKbVjvnAQP8x+b59ECjvBZZ/En5Tbd1ETwWcdFhDBNRRWNiOoRo6FVi/BFfApg1H0tzuMpJYNkw5tpl6i1kbgb3gWJLC9corgJ/JxKxJEtdyxzkrBtBfg+t0hvLnWr2IuFg4ecd6YzrfR6fs+tYDRTTWsayM675RTHRUMw5Fi4wZX0+6h85l5VDXmQKP1Wet+mZ8qLF97djJmcLgnu8ySV756gQ831YYT9hVMdI5sjxMH8l+dBWcGRodlq70g2NLidLzjIJUc8dsWnSXw2U6uBJFdGXyvwaTOK01XQ== X-MS-TrafficTypeDiagnostic: AS8PR01MB7526:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: V0HNGotejoxVd3w8evpuc4WgVXFFw8vJtMq8hnuKC/Sk42hz+YXv8oYxxPJNQmgeyynSR6rQfrSgLadxp4+kQYg3IX60XjVME3vd6juZLLqJow7EkDbdOCAgfDUjVj4EvHX3va3zzjvWaEctbbAzpK5WWD5kUGcE4VHxyHj6Wjb+cJfwI+wiieEyoM+Zn8xAml91XZR+cszX+zWkaxFPbVLbMS09msy9Cdd8YMVAdD9Z53cIfKVyY0kR41LJbbxqcG8n0Cyy8QswfdKXqnupDpiaCXyOwb82vDLB9YDnojBxrXZqgpXaGgix8qL4YUDaLLVVEB/+ep2GNd11azxHNhIGLwdIJuw9WMvTsuNdY/wh7U/Nkbtlbz2IxxyjWuTwTg2OBvmxvzWPaN3Igo2dJis5ODmxwEz5PnjneVGDbsa2ubksQEBfrYKIQLDcmBS21fM1h+uL9m3SfE0wICyx57YwwqsLtxAwfoLgjSWpSMH/Q78v/kL9oyTHHgDVJVXmWOvIDz5Ftf1dxWXQ3q53ywwimr6sv/Zo7YO/zInbxquAMqXoifqFlRLcfNgaWPj7Z+XviRuerVz1wYFYZh8QqQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: s4Ab/YjC5HGzYfml7Cz4UNiMzeL2j01HRa6JxSI5ASAV9Vlo+FbIyyRrvIW5aTFhC9TmascXMi3LVEa8v3GE8dC4vRG+8vdsCYrCp1ZN9CG5CkTsuxYfTFNmvL0Ys8HPMCFdzpn9mmZz7Z5q4+3USwyI5Ottu9eEBWFFgxQD1M88G8kliuv3fJjb/LYisb8nHIu2M1N9xsGXoJM+eq54SdrGEqhYjBVXDfhERl5bGnwnOvO1RenkHlWcsgx7BxWdFrb5PKwnJI4RIrGV3a5ozpsFJ9Pe5VERsk2b7X1mftMA/g9jsQM8MSlYAK9Wp8ATDJ9Ue35TKCqGY5zHf6HjCArtEhe5E/w+1xjcrFGmfatiwbU3hzTvWM6sDT+EIr6KicNyzP+1RpHAx20we3yFgvg2MziT9Xz32SH99r57ZnR+sPaTDJrvE4hNLHsJepIfhAINVqUm+IG9uOtfdOg//t8faAjkcxHrL8mjJ/CgjFRw5sQimvSSfQ9Kau3wDtxpVa52kCg9Wo5oALFcBEDQD6TnX9DvgzH/HumXSCJ9KTucnHr9gOLrr+adGsFrgvw5Ga2dCrkgTa1t/7LoFua2Uhin9XUoKkdurRNpMIGKUdpHEQBFMb68XiqIFa/l+PbWyozIa3wINo9BIT/Ch4myhfm39JRs4CRaXO/mA2tK0aEWjgnp1hDLYWQDfsshquUZm1upS9I5weZ8jPPyn7zh9Z9GMHXWAuNe2QV/6tKV2TpEqO8Bu+2schelcntXSyYsKNN6eV+6YZUQd2kv3Y/elgIsxD1fiSu4A73lfznS8twKnN6fxoXj9JbSFVa21yK/B1PdFiPjmfQ8XNTiGcZoh3tELLo5xjQhyjRscBU1TIWiXm5XKCbNuieXieeI9/BieSc4iB2qJEIacg2DJyjG9DQwKcbNt6Aooqj+y6jMi3rNfu8CwtJuDbxM0PB91OZMUuCb+OaDTMy8xuvjn96wbP0A8h159k9MbskK5qDUzH0hwxP4nt8CdXIvzbbtUO82sTRRttNkqkjFL2D2H9J9vo1fMqtZDrfjZ02jUbEZgCJCHsl2e8sE2K8yH2OFLVaVu5j6N0qvc1YhtHPpXklPFnTYU27tjji2QWLAYyP9KyHG41L0lixdX8qtdtFtsvojoZpZh34JzBTdCTvic7QRDEf1AG+T6V8SZTnORdr9uTf4FyCKK+y698ItcS6SMEMijPvPbdSVeLq9nzLUD3+Hpy6EaaD5qkATGFsXTR16bxwJl6wLbTHOY0quUpKeKOFsnslG4vL30J4/4KWNC394Att2twaJP4PMlHvYTMSVxHaCPRoOlEW6bMOUGJ07ESXLHCpDNYEmmHOMBkVNjZIxWHXb4F6O+M3w8QTigLqTDqKvJv0BQ0Nu8eQW9jftH0IozZ1ReOhKgGTcM1/TQeOoiZJaouYOm3FMowsN4Qfj5yTpDkv+PDKsv/fV+Hc6aufCrURxH2MSeiXh/fYwa/0RiA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f8bc3d80-8b61-463b-0dea-08da2a1e2355 X-MS-Exchange-CrossTenant-AuthSource: AS8PR01MB7944.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Apr 2022 20:23:36.6208 (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: AS8PR01MB7526 Subject: [FFmpeg-devel] [PATCH 16/19] fate/lossless-video: 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: mFdpsl0tsapt Signed-off-by: Andreas Rheinhardt --- tests/fate/lossless-video.mak | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/tests/fate/lossless-video.mak b/tests/fate/lossless-video.mak index a81c6e9ab0..05a8ba29e1 100644 --- a/tests/fate/lossless-video.mak +++ b/tests/fate/lossless-video.mak @@ -1,7 +1,7 @@ FATE_LAGARITH += fate-lagarith-rgb24 fate-lagarith-rgb24: CMD = framecrc -i $(TARGET_SAMPLES)/lagarith/lag-rgb24.avi -FATE_LAGARITH += fate-lagarith-rgb32 +FATE_LAGARITH-$(call FRAMECRC, AVI, LAGARITH, SCALE_FILTER) += fate-lagarith-rgb32 fate-lagarith-rgb32: CMD = framecrc -i $(TARGET_SAMPLES)/lagarith/lag-rgb32.avi -pix_fmt bgra -vf scale FATE_LAGARITH += fate-lagarith-yuy2 @@ -19,31 +19,31 @@ fate-lagarith-ticket4119-cfr : CMD = framecrc -i $(TARGET_SAMPLES)/lagarith/laga fate-lagarith-ticket4119-vfr : CMD = framecrc -i $(TARGET_SAMPLES)/lagarith/lagarith-1.3.27-black-frames-and-off-by-ones.avi -vsync vfr fate-lagarith-ticket4119-pass: CMD = framecrc -i $(TARGET_SAMPLES)/lagarith/lagarith-1.3.27-black-frames-and-off-by-ones.avi -vsync passthrough -FATE_LOSSLESS_VIDEO-$(call DEMDEC, AVI, LAGARITH) += $(FATE_LAGARITH) -fate-lagarith: $(FATE_LAGARITH) +FATE_LAGARITH-$(call FRAMECRC, AVI, LAGARITH) += $(FATE_LAGARITH) -FATE_LOCO += fate-loco-rgb -fate-loco-rgb: CMD = framecrc -i $(TARGET_SAMPLES)/loco/pig-loco-rgb.avi +FATE_LOSSLESS_VIDEO += $(FATE_LAGARITH-yes) +fate-lagarith: $(FATE_LAGARITH-yes) -FATE_LOCO += fate-loco-yuy2 +FATE_LOCO-$(call FRAMECRC, AVI, LOCO) += fate-loco-rgb fate-loco-yuy2 +fate-loco-rgb: CMD = framecrc -i $(TARGET_SAMPLES)/loco/pig-loco-rgb.avi fate-loco-yuy2: CMD = framecrc -i $(TARGET_SAMPLES)/loco/pig-loco-0.avi -FATE_LOSSLESS_VIDEO-$(call DEMDEC, AVI, LOCO) += $(FATE_LOCO) -fate-loco: $(FATE_LOCO) +FATE_LOSSLESS_VIDEO += $(FATE_LOCO-yes) +fate-loco: $(FATE_LOCO-yes) -FATE_LOSSLESS_VIDEO-$(call DEMDEC, AVI, MSRLE) += fate-msrle-8bit +FATE_LOSSLESS_VIDEO-$(call FRAMECRC, AVI, MSRLE, SCALE_FILTER) += fate-msrle-8bit fate-msrle-8bit: CMD = framecrc -i $(TARGET_SAMPLES)/msrle/Search-RLE.avi -pix_fmt rgb24 -vf scale -FATE_LOSSLESS_VIDEO-$(call DEMDEC, AVI, MSZH) += fate-mszh +FATE_LOSSLESS_VIDEO-$(call FRAMECRC, AVI, MSZH) += fate-mszh fate-mszh: CMD = framecrc -i $(TARGET_SAMPLES)/lcl/mszh-1frame.avi -FATE_LOSSLESS_VIDEO-$(call DEMDEC, AVI, VBLE) += fate-vble +FATE_LOSSLESS_VIDEO-$(call FRAMECRC, AVI, VBLE) += fate-vble fate-vble: CMD = framecrc -i $(TARGET_SAMPLES)/vble/flowers-partial-2MB.avi -FATE_LOSSLESS_VIDEO-$(call DEMDEC, AVI, ZEROCODEC) += fate-zerocodec +FATE_LOSSLESS_VIDEO-$(call FRAMECRC, AVI, ZEROCODEC) += fate-zerocodec fate-zerocodec: CMD = framecrc -i $(TARGET_SAMPLES)/zerocodec/sample-zeco.avi -FATE_LOSSLESS_VIDEO-$(call DEMDEC, AVI, ZLIB) += fate-zlib +FATE_LOSSLESS_VIDEO-$(call FRAMECRC, AVI, ZLIB) += fate-zlib fate-zlib: CMD = framecrc -i $(TARGET_SAMPLES)/lcl/zlib-1frame.avi FATE_LOSSLESS_VIDEO += $(FATE_LOSSLESS_VIDEO-yes)