From patchwork Thu Apr 28 23:28:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35481 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b9e:b0:7d:cfb5:dc7c with SMTP id b30csp234747pzh; Thu, 28 Apr 2022 16:28:42 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw7+X2QZrSjN73fZfuRCnsQSYeGuRJg6dWwTOSfeju7RQn+ogF+KuzX1tLiLtV/d69sJOG+ X-Received: by 2002:a05:6402:40d5:b0:423:e40e:351c with SMTP id z21-20020a05640240d500b00423e40e351cmr38685569edb.52.1651188522553; Thu, 28 Apr 2022 16:28:42 -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 l17-20020a056402255100b00426138eb190si5681406edb.613.2022.04.28.16.28.42; Thu, 28 Apr 2022 16:28:42 -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=JbxNOGOX; 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 B160268B27B; Fri, 29 Apr 2022 02:28:39 +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 8BF8568A848 for ; Fri, 29 Apr 2022 02:28:33 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SiV5zc8CfBjt0Mb0vYDmwybqKs2Z/5JZWH7IDuQ/2b7q5/XyCFxdo70hcSD2B3Pma2jT2z9ZGP8fhmR1nWuUZr79laxpDlhB7DFV8OF7uo4/pya/NKh/0XYWp46aMkdOA3gEp8UZkx3z7nu3V8wQsxWrCVXQIu+5/3GWd4EJnNsUkcjjEr2MvV6dkk2/juGStVxHLuk+DzLWq2vt49S0mikclL49J+c408N9/3w1fVh0rDJLtXA1ZLjwXnlFXGeuJPc3jdZKMnxG11rDzmPA39YxLZutIZpvj97jWV0+4soR3BwwAh3YjnFbCLp1orI3l0l2s1+DjO3CrDzI3r/WvQ== 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=61Ee1OCLRYEUBv5p0wp7ueiqPeP3EeQFLxDssAqpH84=; b=e1Yd/Zo7G8FkzDJNxZ8K01531fYXDqFhb4hNUl69jy65P/+xJPvrVmKL+/KUCrHa4q7q3Flaakr2TR89RKXa//KB0RFfXhz1L3UyWa2wel8gN04JEnFufephULndHCpLucptthYRgDL7embRlyuoN3edA+lQ073AIm1pWV3nu8A5L60BGdUMa2VQPfUIuUrkhhap7nGZzrciQPtSdvf3o0TtVO5jmuJK1KZVAHWHi1Edm+dEsj2nrUjFdZHsqkBINhfoILMdN4M8t2Vmu85BIl5TqGOMuzAnAz/T/L8y6mcdQfno6C28+9LbBWRKe/aTsEt3AUhMmlMe8n6VQvj5Yg== 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=61Ee1OCLRYEUBv5p0wp7ueiqPeP3EeQFLxDssAqpH84=; b=JbxNOGOXSKZCcoRoKr6xHIjNIascXC6VwS5olPXuecrI7jXxe5lZziqU/9WxCPe3nCxSyEvqU26dEWMivTuXY4EoMtcf8qq7vIORc554evGA9DzXFd/sI24PpC5KblLAl9p8HoDTaeLlio8SKswmkNywza+wXQqjz4dml/oGrtwXG3RKQ7Ik9gHajLSOEhOR90Ctb2RJnSOUUgGJK8jIYh9lI7FnSo7sNHNboVK3UgUHhRXJ4aicKt7z78+IHro0U3LArUpUiyqxloQArH71ZmkreTyoQsjmW7AKz7965u756zRbw7pM/niC/aLPNn7lq/p1hWWLMdGr+0fRAYn++g== 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:31 +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:31 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 29 Apr 2022 01:28:13 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [B6l6cxw9GU/+WpTezTPTeAQMoZjkXRp+] 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-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 6bd68a65-ec24-4789-62d7-08da296ece80 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVjun0oR/i13GVUp6sVtsqgmqNBCNqnqHyOyAznOTCQYPryaHK1bDIgvUHzM30ysndfT0tGXz4CS5PEbHCF/DXbkYnIxKtneFE+8Dd8Ycavevp3bsQOxQutMV0PpZDOc1EPOOfEJuTov9N5keKXm9my2fhX0MRHtA9Vz/GNiZOXdpOPahTT1z/kF3I1weFCGqfaxGo5Gc3PNxWDGosrn2vAAC/QGAYTDsBCqO+fU7NvzfYxpHyL2slZ1FszlSgr5y9Pq+YTkLE/7ObnLJujZ1w4a2KWgNH+LxWmWirp0ZK3lJJy5w8WK5xzm9TVzisSzZTSahdHZOWWrlb1U9FDEhTmtYglsa8A7t9Tvcd296ewZ289rbPMRhLFF7GQWRBF0g23uDBkX+gBMmOPkHlOYQWqCWZkUlTNkkRoRHbpxDyi2rGwqYP94Mh9/a1pekS1QhLNI//AGlauciiYzcUXFXKxyqYBzl5BnGyejCFXCNc94ywP1Pn5UZXTsj+jSBCayvlAToCJDan1SvphiOChV1n87v+g9Nqz2rLNXWR0koslhCdjnbs+bhd5Cer8uJ25R4ZXMqLURnj7vM94o1nNuZLLDzuO6VoewvGz5x+5WX4ivIOnkjfxCqY7lYXlinvtHHw4gRcJwHW7GtXF5YODNdnhfK4SbjD7M13XUdjL3yctdb+q1/xotW9dzpxSF4ZVVmSMx3Xysw4cG9gmRtZ8aSUa5iq0nSqGetM= X-MS-TrafficTypeDiagnostic: VI1PR01MB6480:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 0Y6Ki2xo+eKHZiY65Sd7EyaTdu48d3ilso61IHo16nvcVC3fnPucoAGOW63x6Dxoa4s9FL9KySWWYCQLhAgyaZFHJNolL3aUSFSVsnqyxjeWGZINYCnZTXpaLeGZh6ZNrBa2w2gwOCYNjKQGtgDauiLHq5GQh64zkkvZjGcH70WoiUmwVYxHNHKDm7E0wW1y2ZKrYX1a0HV/7loga6oFILApl9PAqU+P8EuZZxiknFai3Hp34eJK11lHxBiO/TKhzi55kNbxiKrVis2KCabNaA3msPEWGcAXlT2rm4x/itBWR2/AljVxKZfrC+jvNH0eIR7nxBGsP/pbUrCV4PvXhFQgfd99zPmtGHp/aytNqnGJV8bVZp53GJhY+HYqI+ysUAkE8FxhivS4+CEtT8TnKEdWCXZsjo1oOCGcju9FpUiJkz4j683V3fwYYxKtyzYL90cQLzU1DUkMRJXZMCHIjPmV3W9C43Hi0jlPJLrVZphVpPJMDnPmd8Vh7+ggPdEBujVmWZx7Evj36tJnbDiVHeMgBXDUSK+5VGTLDip0rrCDq9TuECbDm4/OFkNFLW1hb7jII68BnTh3v/LYUmOeJg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Hkf8LL+L8jaFTnfh6u2nI0vY1TUWdC2lASdKOXRFunn9zNs/kgC5cONTt6MuUVAWs9yTmjXbspnsRSiaCVQkLj3Zz8+GKErOaAUIFP3KLLflBFdks/ZHSZGTtxCNvN7LyLllZ9ou6rWkh6JvflPD/ua9bovxohluajztD24VbCO3AGBYIOAj/xevlt+5fWMEfDXe46+FW4qtIR3zqY/iXAwbg2bvBF1pYHAmE/ZQ2Sxuqjyhri3eOduoydGt24IvNy1Qn2DPlY1SZiKyEKPmpQdToEXUDuIifvhc+wF/4QuelGTeda68NNT2iBqead9hY7Cgae0OJ/T5H/KVVw9Jja4fUZg3t2A6/zB5uhTGR6P0HTu2gh/36PRalPe2jQTTq8SHzu/f0VeBnN7hrQSf9bl4tQfgB8dM5bh76b7txGh+sv2/dJuTnkz462ChJVRTUWjMFf6U1ngZBMzrr6s7JhZEjkxC6rP8jcZBohqSuBgfo0Sa48PDGcdyz1F4xRji8jffXx60tieibs4rVmFLqyW0K/8msc0flUlE/9LNWE7w/5RFdJcUzof2W6i1sg2xLpxaQdzUJeWSuvGyz+2nKxfse5d8Wt6hdMH0Rk5ZdO/TmFac5rwLmwSA5K7FdUaahpUrbAFwyQEb3ZdeH1dU2J39GvJGGpJChFmn8sPl32zEt1Gm1Rzwqe1S+kzlcuBUSeNS38JtJEbxhbbBNAIY54P4+TJW6jlmh8ScdeIKA8QGdhfxVMOkjAyQYCT7jv8yPbWIgWAYrOMXMvhD2OX6T5k3bI9TWYdrEc5Gz2pbU5PAcyAMB0baVLltC0bzsOp3zx3EYfq5mS69MzVfg3Ry5xlDzPMap4MOhcPBh2JQpJ9W0EZJ5zkN+HyvvYbsYv/caD7/W/ZLyyMwHW1eK6i0ri8oOTsapd5EL4v+d+jFgTx0pd35G/QuCuMvLc5at+OlO3a/iBrQOjmOnoex0b2Xz5fW7sNLOMiEJhSDsrOBV9MRKexw1tnHefl6TQN9niW5QltJ9OxduvCBDgtwYc8gWcVU3i3tZnAXVQZe5sEcMJdt2bJSf2/1+kUvHqJnWijBFEjKY372XmtkJJrE7SWia3RH0g2ZG/LaXR4W2AH7wuQ+Hxu6K2W/M++Lam1B5GOB4DT7igYbzg2KYh6g3xt9CGSzzmHC95qJyAde+qxOwJJOE/a1R20O8IxdTMjR7QhNu5kupshN8iwQC7rzEWgbDBVXxv/uRX8718JS/bWNh6SVEo29TzSmE7Hu07tSFRWRb1k5XAloRM5qSQV1/wO7A0Ut/M8YEjLkjeksqeGw74eIDtNX5U7Y2CBwbCZGKuHCWTUD56BxUp3qBz3bCt2JRmquxNHlCSI8YmF0k5UnvoS49mhm4BcY+ld4wmpdr9DEWUJ46oXtI7ToyS83yuvZVEqvR5T1kxQqa18dw2CvMwkOkiGkpVx3qWOI+mmm4LGJ X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6bd68a65-ec24-4789-62d7-08da296ece80 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:31.7757 (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 02/13] fate/canopus: 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: DKZ2C+hH0pWU Signed-off-by: Andreas Rheinhardt --- tests/fate/canopus.mak | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/tests/fate/canopus.mak b/tests/fate/canopus.mak index 3d664ff911..4e50716813 100644 --- a/tests/fate/canopus.mak +++ b/tests/fate/canopus.mak @@ -8,7 +8,8 @@ fate-canopus-cllc-rgb: CMD = framecrc -i $(TARGET_SAMPLES)/cllc/sample-cllc-rgb. FATE_CANOPUS_CLLC += fate-canopus-cllc-yuy2-noblock fate-canopus-cllc-yuy2-noblock: CMD = framecrc -i $(TARGET_SAMPLES)/cllc/sample-cllc-yuy2-noblock.avi -FATE_SAMPLES_FFMPEG-$(call DEMDEC, AVI, CLLC) += $(FATE_CANOPUS_CLLC) +FATE_CANOPUS_CLLC := $(if $(call FRAMECRC, AVI, CLLC), $(FATE_CANOPUS_CLLC)) +FATE_SAMPLES_FFMPEG += $(FATE_CANOPUS_CLLC) fate-canopus-cllc: $(FATE_CANOPUS_CLLC) #lossy @@ -21,7 +22,8 @@ fate-canopus-hq_hqa-hqa: CMD = framecrc -i $(TARGET_SAMPLES)/canopus/hqa.avi FATE_CANOPUS_HQ_HQA += fate-canopus-hq_hqa-inter fate-canopus-hq_hqa-inter: CMD = framecrc -i $(TARGET_SAMPLES)/canopus/hq25i.avi -FATE_SAMPLES_FFMPEG-$(call DEMDEC, AVI, HQ_HQA) += $(FATE_CANOPUS_HQ_HQA) +FATE_CANOPUS_HQ_HQA := $(if $(call FRAMECRC, AVI, HQ_HQA), $(FATE_CANOPUS_HQ_HQA)) +FATE_SAMPLES_FFMPEG += $(FATE_CANOPUS_HQ_HQA) fate-canopus-hq_hqa: $(FATE_CANOPUS_HQ_HQA) FATE_CANOPUS_HQX += fate-canopus-hqx422 @@ -30,5 +32,6 @@ fate-canopus-hqx422: CMD = framecrc -i $(TARGET_SAMPLES)/canopus/hqx422.avi -pix FATE_CANOPUS_HQX += fate-canopus-hqx422a fate-canopus-hqx422a: CMD = framecrc -i $(TARGET_SAMPLES)/canopus/hqx422a.avi -pix_fmt yuv422p16be -an -vf scale -FATE_SAMPLES_FFMPEG-$(call DEMDEC, AVI, HQX) += $(FATE_CANOPUS_HQX) +FATE_CANOPUS_HQX := $(if $(call FRAMECRC, AVI, HQX, SCALE_FILTER), $(FATE_CANOPUS_HQX)) +FATE_SAMPLES_FFMPEG += $(FATE_CANOPUS_HQX) fate-canopus-hqx: $(FATE_CANOPUS_HQX)