From patchwork Sat Apr 30 06:25:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35520 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp707989pzb; Fri, 29 Apr 2022 23:26:04 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwiF8efBe+rFytRaf6Xn4w13l3AHz1vz7PzDj1FOoNihpiYD1NDYhCpAvZR7jwLpp+lJISQ X-Received: by 2002:a17:907:9493:b0:6f3:9be8:237 with SMTP id dm19-20020a170907949300b006f39be80237mr2661543ejc.598.1651299964463; Fri, 29 Apr 2022 23:26:04 -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 y99-20020a50bb6c000000b00425c2de7c41si7898630ede.506.2022.04.29.23.25.53; Fri, 29 Apr 2022 23:26:04 -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=rfGxSiBN; 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 4A6A868B2D2; Sat, 30 Apr 2022 09:25:49 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2032.outbound.protection.outlook.com [40.92.90.32]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4DDFD68B0F6 for ; Sat, 30 Apr 2022 09:25:43 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nYFsMUjVF5PWybaoI/P0mR9vB70u1pSHHfg2VYxCSelBu9znowC4+4oaJp9gDn7/585jeBWi6M4w3ntAvkrpgo+52uiyBj+PmntkIx4WiQV+YsYsaf7I0rfCNqwc3f+XESbn7EwbGCOipLr7rBXRzZ6ULKhM/zc+G8lILmJZWQwMZ3gj5DcLMNWGDa7EAfyrH19cANKMlnGyPRFTZnTWIr7TDV0i9VjNCN2/67iDloAavZ0CmR7GAo8HPvTRgsyF5eBEIZTkvoR0mEhiCDwROlwB7hdO5NBVQkyAxOjLnvKes6AEyacAIyJ82toRfIl7W0KAEwEZMWKE6valVBp5Aw== 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=zrLICwQyLTgTEauircI4iQnsOHZVB97quz6Fs/yHVgA=; b=O+/KhXtXuaw8KBYLvRYTBV3fZBwJMFgbhFslkIPdHr+alb00yF6aYdiUSLnalecM7fnrURjQJel+G11uoluKDvVdfKkDQJjlbOWZ+w1JDhTjtftodjzQVAhuxqkeMKNGo4a1DCh/kiZm090RCi4VtMKrAInfDcbOQcSP56qIS2b//m5CZiARkAReTbu+vvMnLP2exzvHEYk6usmy5JUa579OgzBq5uIVHVXznVkJGRXnl9Bj/DEsutqA/mGHJcjJDjSiKrpSUFSmtGj/l7lWqS3ftdcWRl/PfXZfIPN8dGIvhCeVY7AuRCYIf+0aadiL6+vGk1id/8+gJRbMgwZvpA== 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=zrLICwQyLTgTEauircI4iQnsOHZVB97quz6Fs/yHVgA=; b=rfGxSiBNcpUaFL0XJpl/LzesnbMkqADw2ivaqoDpvqVMXC4GmozYEFkI3Gf0Bw4FUwr2Cft8VslcUaqpfnkShhfyMCWA73Gi2kDii0HjSSpRUXmwlKMCObMGlzRGDb25xL/UIBawgDPjkBXQaSnj2lA37R7B38BD94MkBz9n2aIp7tBiqLQUPqmD8+LFcRRqA0DnScJfgGsXyfp6sLWXJ0YRDpuCbqEAAJxG2HqweSTiEK3MFRrhOX9r4E2otpTkOU1JZU62BYiDTGSxTm5OMz0IIx+3t+H8XwiAWAfKQrjgvBiPQ8n1UNu+YJnkfEh/rUTcMEHbCN/AP3RoFxeSQQ== Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) by VI1PR01MB5406.eurprd01.prod.exchangelabs.com (2603:10a6:803:cc::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5186.15; Sat, 30 Apr 2022 06:25:39 +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; Sat, 30 Apr 2022 06:25:39 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 30 Apr 2022 08:25:19 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [BrPw81kZ0+k9ZBF/fbvi8fEdlHKa5hvN] X-ClientProxiedBy: ZR0P278CA0192.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:44::16) To AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) X-Microsoft-Original-Message-ID: <20220430062523.1425391-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 80bbeb91-dcd7-4a75-cc15-08da2a7239ec X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiSp1XYbE3vnwUBkebNAZYX6UALY1zVyxz4updc1LfeqR2NV0F9KZ07KrBD2c5Fv2hw4n4uwEKwGah/m0cYWu7vcBYuHUfU3YGSXQ0QEviXemYLtcAPJbciFCEOwiHaLULDIYLPDjZkDHqpRmuZQalSbjbSY0ak03yu+0gAO97nirWj/NX3HvAlFNk73p9xePmAlS8NfMSgM/Dng6kLhp4aObV9TMnTx61AFGeq1dyjDUAb6uweWwV+3ZYBKC6y2Ih5FS42Zet+yvb7PPeU/jvVSE1YMcILF/Ou+8czck2W3SuS3bzUz8yh7HTuDb/6nxvX/GRswv1w9m8/QX+MQrbavT0/R2LUlFcs0bLAzpvYn6s65FcBb7WomF56uGPusGVy5bdqxfSeDsI9vncQIl3ZTAs6iyhczlweQDnWtQBX3d81KGCVITWaL7is73B3pCUwfb2ZauVt9LACqnXvGBaiTOXwEDfwJE4Z6fTNZ5rQ4jP4BJn08C1K2U2WF2OaY1xjqS4LwxVAeBOkZKpqGQpWALEbmvLPE2GW8PRxVVVHzv1rX8yxIZi38RXKZXCriO0b35ntvrIsqBvtkV2UC+GM6Um9vKsuIWCNewCqX1KE8vJmX/Tx44n4RBvJy10oG5BGX/7NRzqkrr04LGqipX1m/5zS4tnTCKnq2IV/sMPG3IvWKeM9yZlHba6ClwUWJfr++GzriqztLHSXTCOthLfZ0zGdYiNy6jl8Rohe/vdfmiRaw5t5VkXrgO/K5LJmC2Tw= X-MS-TrafficTypeDiagnostic: VI1PR01MB5406:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: RbWTyT66Fu/N7+wQVzVzBPeZEf6JZ+GxoN7AUKVfBbAy2Hx/s++B6GC/pS79Uisiw4Ia8KBzu2l5kIAR8Gof9EK4VEe71BK4wVjvExzV4r19lpifp/JRqVvCVeXUg1F5Ng7ZsT33etZJ33V/OHPEiuN1iwVkUTGpIOSPaCVWHG+Y8UOeOjyq4EG0GSVgDt1AGPMIrzR+YNTLsinUfgzuC8co9v8hKg30/Mw8wDeth8mHGvHHR13Q5/JNxk16bQYHKuVnUoJLMtIpURfw8uan2HhxeRdXSvfK1XcdYHfNStgj77JpSeuYJWLsAVkkpzZDqQR5MnKZ4pk69GXQifekDTNf+OtpeMdwoXMY8ck3YFDALOqSYylu8KHo5hJp+tMdZwjU1soI13fk73s58V8/7kkMTR4X413P1D9qzKVBvx0j9nL1jRIZWaxJ7dsEcG9XNkypJsUHZro7dZhIgggXZAXjpRrMb1cbTa0+P3OjDPQX/pht6jcApK4KNOZhhAufprbqIcaMBV0KBOfdq79lei4WhI/pGcww+wAHXU7tOVfemyVKULItFQKfdRcVQV41sLuIy9erVtNvwBKEnLWoUA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: nXNeTiklPDMj6cuI1FAXcpo80irtncuhm4FYXNAY+XCb8+h2VhZdH9zbGMhIhU3TLu2OaRHgrDqMORSk+wQ+Uwc5LiDlsaraObhRxSrlCz3eu3Q16B4bc67FUnlnfaCtJUmJi7fXgpe4wX02wecUf16YVx7XqkOK/EjYRqS5/FHtgy6UOOOlCK0YylYIxxMYrMMuhGcv9H93qmDUZBU1sfA6KGeVDM3qbxThdJgd64UuY7cTuNEQ+p3WDq6KMu6Mr4QlpXRzkOFV2Dmo34rbPv2A3/M3jjuNTF1KxvVu16Yud2SvxrmV/rKTvY0aSXv3J+QsErHHe5tTRGe8pwmIr6JalkJwnW6UeN3Tr8uwBvaZG5x86Ze2k3mQwHWK7+/+Xv0exSTbBz5iLVF3jncV/pfAUIpG1bMKMcD0+tdI2l+uCCwX0QKTCkwYx8n8E7XkCMGdM6MmcfZvwOHk5m/HZe+wL6DLHrGvXtMKJ1pb58QqFDLJSIPYPUN1Eo9VEtxB66DW/fVKdJ/QgWr30TBvNd12JxvGMxq/12tzqpvMNBF61apVVNgWOej/0pkS53h7Zpx85qhM0IjCqzBZnra8G1Yq+vKllO0bABmLplrvUSVPHltKUxMDWjmcxc+Yjpgs0Onb8wc4y5AHQSntBUnJhT/d/eiLe2X7NFDYI3HNOvisb4hipF2tY2onTVHeGflYdjCpmYn3mHOaJFhyQ7zcg73butmqeWVfbRvFseYo8UVyDeDmNzr7aEGr2ZrGfr/TH7Y5eSmke+6B3UGnsSTNQA+aYEq1zCsTYc4DHs2eBaPUVSUgFeCOYrtxA2y3QL5rROHtOtrJ+jPrngbOtgylJQizttVfSqNNxx3VGC6BJWN/LzDAuMp8MSGnHqgKFtruBZ2rx7qa3RFojEE1UXMPLbXyFxemXV058p2APqdo53FnCfd6LdFfs9/SEDyYXtz7FlNEzna3cnzvA+IAHom1ZAulVODXb7hvUXlQAL6md7nPmMMtBpPex8b9R1VpPs+Gy1+LPeT23Kl98D4wHWKny/Mr9qHdB4kaQdpTAhGoC5qAcSC68HzK72itYBLsmmviscruyEDKOkqegHAFb2cST1LQKC4wbkMQdnKHZSEop993ZvNbDSa/UjmMFq0uEcUBc9/tlEK2OoBlc0x2UK2LzYKypoW72w4/OmkJiMapGzxvIMJ96oS6Or2BUl291UfXPMmilokOX7FfDf0NyNWPv3HiPxeQhXOTqEqp6IqpZROdQkF3+hzJ5r+KZjh3H2d2rofckt4aXIJnp78QrrOM7QAqtZ5ajSBI43VCDFd18l46IOPi0e0XNFMnwiHatSRw4VRn4JfRvHsnICeIfmo05fiD5GW1xAhe6QTE8v7PMrn3eMLGqkljMZC//prtPPhuwG5rNbzR2ueKp4rCwGh7n3SM3dMn82EfcGTs2R7cpyv7H/p3IiGT5x0+y2fisnFv2rmaeZPsV2VrBUuwte7BdA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 80bbeb91-dcd7-4a75-cc15-08da2a7239ec X-MS-Exchange-CrossTenant-AuthSource: AS8PR01MB7944.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Apr 2022 06:25:39.8648 (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: VI1PR01MB5406 Subject: [FFmpeg-devel] [PATCH 20/24] fate/qtrle: 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: /ppxztewvkUc Signed-off-by: Andreas Rheinhardt --- tests/fate/qtrle.mak | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/tests/fate/qtrle.mak b/tests/fate/qtrle.mak index 3dd0afbd3f..3adefd2009 100644 --- a/tests/fate/qtrle.mak +++ b/tests/fate/qtrle.mak @@ -1,23 +1,26 @@ FATE_QTRLE += fate-qtrle-1bit fate-qtrle-1bit: CMD = framecrc -i $(TARGET_SAMPLES)/qtrle/Animation-Monochrome.mov -an -FATE_QTRLE += fate-qtrle-2bit +FATE_QTRLE_SCALE += fate-qtrle-2bit fate-qtrle-2bit: CMD = framecrc -i $(TARGET_SAMPLES)/qtrle/Animation-4Greys.mov -pix_fmt rgb24 -an -vf scale -FATE_QTRLE += fate-qtrle-4bit +FATE_QTRLE_SCALE += fate-qtrle-4bit fate-qtrle-4bit: CMD = framecrc -i $(TARGET_SAMPLES)/qtrle/Animation-16Greys.mov -pix_fmt rgb24 -an -vf scale -FATE_QTRLE += fate-qtrle-8bit +FATE_QTRLE_SCALE += fate-qtrle-8bit fate-qtrle-8bit: CMD = framecrc -i $(TARGET_SAMPLES)/qtrle/criticalpath-credits.mov -pix_fmt rgb24 -an -vf scale -FATE_QTRLE += fate-qtrle-16bit +FATE_QTRLE_SCALE += fate-qtrle-16bit fate-qtrle-16bit: CMD = framecrc -i $(TARGET_SAMPLES)/qtrle/mr-cork-rle.mov -pix_fmt rgb24 -vf scale FATE_QTRLE += fate-qtrle-24bit fate-qtrle-24bit: CMD = framecrc -i $(TARGET_SAMPLES)/qtrle/aletrek-rle.mov -FATE_QTRLE += fate-qtrle-32bit +FATE_QTRLE_SCALE += fate-qtrle-32bit fate-qtrle-32bit: CMD = framecrc -i $(TARGET_SAMPLES)/qtrle/ultra_demo_720_480_32bpp_rle.mov -pix_fmt bgra -vf scale -FATE_SAMPLES_AVCONV-$(call DEMDEC, MOV, QTRLE) += $(FATE_QTRLE) -fate-qtrle: $(FATE_QTRLE) +FATE_QTRLE-$(call FRAMECRC, MOV, QTRLE) += $(FATE_QTRLE) +FATE_QTRLE-$(call FRAMECRC, MOV, QTRLE, SCALE_FILTER) += $(FATE_QTRLE_SCALE) + +FATE_SAMPLES_FFMPEG += $(FATE_QTRLE-yes) +fate-qtrle: $(FATE_QTRLE-yes)