From patchwork Wed May 18 12:26:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35815 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp305888pzb; Wed, 18 May 2022 05:26:54 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxPvpW3ld0RQ1wqMhV72APpIk+LZy4vb2iAotxNjRVN8WPIoFHLzV5TAaHpT6P7gxxGjUc0 X-Received: by 2002:a17:906:301a:b0:6f3:fdd3:4d1c with SMTP id 26-20020a170906301a00b006f3fdd34d1cmr24035570ejz.235.1652876813886; Wed, 18 May 2022 05:26:53 -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 gi2-20020a1709070c8200b006f47e8eaf84si1716223ejc.645.2022.05.18.05.26.53; Wed, 18 May 2022 05:26:53 -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=OptmOyAK; 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 B137D68B4A4; Wed, 18 May 2022 15:26:40 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-oln040092075082.outbound.protection.outlook.com [40.92.75.82]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2F7A568B4A0 for ; Wed, 18 May 2022 15:26:34 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TaTP7Mvd8jiRhRUZYqC7Hwb3OgwiGtv1FQIx1BnbQmq3KGBv41zQptQy2cm649yLikBjagPsHSZ6seacdUxoZ/yU0S6F2vN0ku0P8K3yi+Zb4LtZ4DM4Tny9mZlFQISxNawoQmcfvzeVfTuA2jTGrq//rHOu/t1bPAWjlyhJN79wiipjwObbDp0+1PY292c9jbf8Eylq/BBuc4JsbQAo6k1LYdi02aFmZUoH/WelZg8uMkdfWCsei1ff1uBTDt0xP0M3lI5m/w5zlVEzi8k90cXgcxoiTfJvCniPADcvnRnGQIKD/kveCRkqI2p19nJEVBdUA5pT0D7zntToyeQrCg== 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=yp7jxgpdYmHGMcT2aX5mX/qDn8skz44Nvu9LkVoVN6Y=; b=ekMKEGq4rr9RSt0xotA2o6+epuP9nTY5nc84AEiCAlHLdm0Bi5cFx3JQUi8z4miYZHgNoGwhvwYbSZZcG3hWvN6WNvZBg3ALzFgmhHZAmJpneZP55b+z6lszOYfbCEhFvR63FupvjIbCYFNkQ5wkvh89vHQny02G9bKcwHQD+WEtCPOW8/q6IbI9f/m8M82bIXs83+17351Q8Xxs2ktExFVwY/5E547cw0AAg7FEo4NbkgbYZrzAKPsO+Oa0RpwxGPhenkzWlcYv2W4xFsIP272kxgeM+MW7aLwN2JwSCiX2QeeljMFpdcHmPYLs2qPckRxWHvXoZqrC0LsByueT/A== 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=yp7jxgpdYmHGMcT2aX5mX/qDn8skz44Nvu9LkVoVN6Y=; b=OptmOyAKL2nxD9cS0I75uNRleJlHGxMgU4d/M5ec5T953vcMG3nICEQlUt17PS9q6F7hmxOHzWdZXvtzJxp2CMa+vIm+DloY++OHQX8Uw0+lOUkUmH+TCQsFIHdniJqgWYT/SeUNJHGYDkd2aqQRihGmoZuicDoRVA8/ZNKqto0hhqp/SebBectnMUKmsvxvOTs0MQVZNmCdXj2ULo//HeTIt3DnJq1hb9Ct5FHjEGSVoJdyjsl7ftCEUlPzyVwBFQHlfqC4dLBRn+Ih3iMQUj57ByyH/4uPp97Li01VFfwaofBvJSxSmuJArD1++xYdU6bv2fyKvORi5JaK/9asJw== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by AM6PR01MB5911.eurprd01.prod.exchangelabs.com (2603:10a6:20b:e2::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5250.17; Wed, 18 May 2022 12:26:25 +0000 Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::60b9:9f29:40cc:f01c]) by DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::60b9:9f29:40cc:f01c%10]) with mapi id 15.20.5250.018; Wed, 18 May 2022 12:26:25 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 18 May 2022 14:26:12 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [fQCz21QmBdz2GN+UTaLyEWCmbYtoc2Bf] X-ClientProxiedBy: AM6PR04CA0060.eurprd04.prod.outlook.com (2603:10a6:20b:f0::37) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220518122614.1295310-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 91459f5e-3170-49d8-2f1b-08da38c9a007 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVetrSOn5BNf9taOIHTpJPJNmeb5Wi+uirjQ6mq2Bhmj3BZVrZPQcGUy165cb6vx1kwXoJWdSIYpzn1PtaDHDM9vxxHgBc/uz+m3B1BU4YteqR8Hil9pkX6GTEAiMpslpRKQWNQK5qTGYfq/iHbvFJNrX3E7BZmxIylXOnEJJ5p2rxrqkaBUcZQpZ4UONau4RC5oAgfOenWoUG/ETAMWeCQIyjDdFWwbOh8I1Asswjww7j8PejRa2kQOviC2/9Wm+ZG7R75jgzXx9WT4MhA/vAo94sfejfGrhzAmifk0s5d35ia4j3mlZjR4SVZkfHH8RxQRLbpzTmWtU/66TrSqyEmLfTheeDD/lNd/lrWO3LurbnGpmslPmmbfgj8EXGi4SM4ITzrQZFcWusJPw2uepwFIik55AjlrNoYuPlgFyWQ3Lf4g7gOa6ld81ouhNkDAi/cL5sBU5MVB2ix0V1TtyTnLz2Tr7ye1yTijgl8K+kbtdGHWcA9sxieJvKtKGDiMDEtD3RTj128pIZGwYlz0Y/JZJKxs5nNfLTakFIG4GyO0A9dQ3fygpgt2rcJj/L7VT9iLWRvXuF/a5CE7ECLq6retHd5bOE4bU+fUTTwZ1bXhoGLaEHazN4mrToXlsdlvzsI/bYssH5su/QkUEQhtxQGJJ+amHheW51C1tfcVcqFeaaTMvknlTF5kP0CV7U23Z/x+0w8H/J55+X5BLt6NRAidmqp3M3Chfg= X-MS-TrafficTypeDiagnostic: AM6PR01MB5911:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: BxKwz88Eh1JjqUUAzumtUvDJd4Xfk5MksDOdjahnWWys4elYzBBg7SS56WLPmS+ix2ccxk/H39KzCN6+4gPZEfkaTQHznqPbHxyFB21QCFPqhhKg8ctIM8UVjB8nmu6U7sbybZfWaNlbQoC2sSgVC37ZvF3iwAH4rqeQ/X+fwSoolbmXuTCeARkHY1KfCU/4+inGewwZwOVAHNbnIbwNMe/+6WD/NjibZiTEtwUD+OtvP9N2xwHpA8ToYbOAm/DiJX62RejB0BHNza77t/cduX+sCfdASD/RiQFgA2Ppu30VrNE9WtK67mKHUdWXgx7jhROSm82Nw5XVZ321mMoeRc/+p5ZSO4TNPYfLkizgHmWCJ1p21N+mJsA5rGSFu1HLN4u1pWfow3FCwjCUn6H84NhUfzNt+PNOUrflCzreEt1SxPmrAaKztJb+ko4OUJru27D0f9TgupP0GWyafqtAFqFMRW6Rhh218/lllWyakKTNkVll0Ajbl8qiAW/NXfpdZ+dzsl4G/05PwBLxykYGUAOF/ln5VGOXUgaxUHUU/TfcIB2s1rsDiHRxHI+9ujkCFKdIArUN18V9lDi8T+uD8A== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ZH9y3gSpzF0LgpkUQefZkD+k511KJ98vzYM2SlPSuimlEwmpyClkUyJeBvH1fa+qB2FWOrX4r8d2xx1dluCW5O2EOCgOKBPSjmCr70nSKxa44jWHm72Lqm/hUXdvih88m9MtCiazfO9vTA39un8aDxcXIaO2PHsJZYM6Jl7+ua45cNQBsev1t8rgJUgPMxdsaJTsp/MUuQOBkenpNw9Oa/z/AKTABdqkxis9aVn1vaB8Li8UGlLC/fETt/+NQtkJfH/pbJONpmrcZ11H/vaqjUYoZDZ3Q/Qy1B0kGnPqOkLjRToWyTFcZNv0rALh0o2Fe8OczoZRLr8AL0GwgP8bBO0qvJC8jTXSZxKSizYHCmAsRNMXSg3MRi26Uwv1c0tY/qOP30E70XiK3mhm95aVP4RhoHv6Ioo7HGRuwhUUQFuDFXHT23s+zlzrM+SZKDREEal8YjfSonixSYR+yp3XxA2YhdNHQonBvP4NjD4vFqsB+kK+BoTwEjajM40c3D7k2qBv5a0jX+cKeStcMiS5kz/6C2k4RFxUEO8piM5S44dT1QbVYcPo98AZyMi5wCi//IiCACOE3+I9bfL9nboel5TL4xj6GA1Oi+z8/tJYIs5JYYQ7JBlxNOXUVCE//LgINlBfo4Jx7/IJhcMu82q9AnadsQcCTapqWQRB6fkDU4ZSZeHXotTCP2h/wdoifzQS/4bMcQtOE5k98/y77w5kKm08TSA60u7VTQTX+kYwit9YneXT1bWhWkT+lBKSq57cMq96NjvZVGmQQQAeQNosPm3lNhSZRMrn7rC5yms+T693VL2WlrZOI4yiXqYwRRlr83wrNml2rbzJPRRayWRmMD2a80Lfb2Ty3EZD1J5eecfEtOPxoo0qxQPPZ1cN1SMGN1/YyrMIOl0s1+N954/QrAkF2W2NJB8Jcri0kZ8KdwFrDJhAS1lT/w2VhUVMVz3YnMkqYfuFlWrXjYn1iyLKoNjiu8MQmMWmxV14YRWpRGpjuAbFd+kjSL3In/pZ6f3V6E5j4K1c2XIPma/vve3MoH6yriNSCx1GVMicw0kXOQKNqvtYi/Roaw9SbfQoTLLV1Ee2nLxcI2ZJC5++ypwKRm4It0B5Jk3xD/ML3S+WJZyJmHMSocgyETw2TMIma9VhsAEGdgxHI3MEP8TUkjoD6i5Kq4GySV/0inyKmWzba1xb6JKJN1t/1xaCc9ZDzh5mXxWOPFdmeQ7VmI87U2oNeAsgM87U7lq+5J1RqguCqRF2Gckp5RSGlnUP6x3AkObon8fzD9082W4FSC+G5hS86HWzmJdXORSeMaumHMVcG1irwcWrXS3XOrYrK2fyCYsqwY/GG9MgvVgX89uO3/3sX8SB18L7bvUYsxEyjVd3fbEiBLu/BaDfIAU7Ow6jvQKBfHR85ZuHJl8peZ0L2aGEu64OoAUjYs+V6kz/4MH7tbuAFq6iJNHelqCjd/Gbk3Jk X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 91459f5e-3170-49d8-2f1b-08da38c9a007 X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 May 2022 12:26:25.3097 (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: AM6PR01MB5911 Subject: [FFmpeg-devel] [PATCH 4/6] fate/filter-video: Avoid duplication for filter-removegrain tests 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: oAdYEinayksk Signed-off-by: Andreas Rheinhardt --- Is there a simple way to create the 00 01 ... 24 pattern without recourse to the shell? tests/fate/filter-video.mak | 85 ++++--------------------------------- 1 file changed, 8 insertions(+), 77 deletions(-) diff --git a/tests/fate/filter-video.mak b/tests/fate/filter-video.mak index 31fa5a2d4c..a169d408a1 100644 --- a/tests/fate/filter-video.mak +++ b/tests/fate/filter-video.mak @@ -274,83 +274,14 @@ FATE_FILTER_SAMPLES-$(call ALLYES, PNG_DECODER APNG_DEMUXER FORMAT_FILTER COLOR_ FATE_FILTER_VSYNTH-$(CONFIG_PHASE_FILTER) += fate-filter-phase fate-filter-phase: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf phase -FATE_REMOVEGRAIN += fate-filter-removegrain-mode-00 -fate-filter-removegrain-mode-00: CMD = framecrc -c:v pgmyuv -i $(SRC) -frames:v 1 -vf removegrain=0:0:0 - -FATE_REMOVEGRAIN += fate-filter-removegrain-mode-01 -fate-filter-removegrain-mode-01: CMD = framecrc -c:v pgmyuv -i $(SRC) -frames:v 1 -vf removegrain=1:1:1 - -FATE_REMOVEGRAIN += fate-filter-removegrain-mode-02 -fate-filter-removegrain-mode-02: CMD = framecrc -c:v pgmyuv -i $(SRC) -frames:v 1 -vf removegrain=2:2:2 - -FATE_REMOVEGRAIN += fate-filter-removegrain-mode-03 -fate-filter-removegrain-mode-03: CMD = framecrc -c:v pgmyuv -i $(SRC) -frames:v 1 -vf removegrain=3:3:3 - -FATE_REMOVEGRAIN += fate-filter-removegrain-mode-04 -fate-filter-removegrain-mode-04: CMD = framecrc -c:v pgmyuv -i $(SRC) -frames:v 1 -vf removegrain=4:4:4 - -FATE_REMOVEGRAIN += fate-filter-removegrain-mode-05 -fate-filter-removegrain-mode-05: CMD = framecrc -c:v pgmyuv -i $(SRC) -frames:v 1 -vf removegrain=5:5:5 - -FATE_REMOVEGRAIN += fate-filter-removegrain-mode-06 -fate-filter-removegrain-mode-06: CMD = framecrc -c:v pgmyuv -i $(SRC) -frames:v 1 -vf removegrain=6:6:6 - -FATE_REMOVEGRAIN += fate-filter-removegrain-mode-07 -fate-filter-removegrain-mode-07: CMD = framecrc -c:v pgmyuv -i $(SRC) -frames:v 1 -vf removegrain=7:7:7 - -FATE_REMOVEGRAIN += fate-filter-removegrain-mode-08 -fate-filter-removegrain-mode-08: CMD = framecrc -c:v pgmyuv -i $(SRC) -frames:v 1 -vf removegrain=8:8:8 - -FATE_REMOVEGRAIN += fate-filter-removegrain-mode-09 -fate-filter-removegrain-mode-09: CMD = framecrc -c:v pgmyuv -i $(SRC) -frames:v 1 -vf removegrain=9:9:9 - -FATE_REMOVEGRAIN += fate-filter-removegrain-mode-10 -fate-filter-removegrain-mode-10: CMD = framecrc -c:v pgmyuv -i $(SRC) -frames:v 1 -vf removegrain=10:10:10 - -FATE_REMOVEGRAIN += fate-filter-removegrain-mode-11 -fate-filter-removegrain-mode-11: CMD = framecrc -c:v pgmyuv -i $(SRC) -frames:v 1 -vf removegrain=11:11:11 - -FATE_REMOVEGRAIN += fate-filter-removegrain-mode-12 -fate-filter-removegrain-mode-12: CMD = framecrc -c:v pgmyuv -i $(SRC) -frames:v 1 -vf removegrain=12:12:12 - -FATE_REMOVEGRAIN += fate-filter-removegrain-mode-13 -fate-filter-removegrain-mode-13: CMD = framecrc -c:v pgmyuv -i $(SRC) -frames:v 1 -vf removegrain=13:13:13 - -FATE_REMOVEGRAIN += fate-filter-removegrain-mode-14 -fate-filter-removegrain-mode-14: CMD = framecrc -c:v pgmyuv -i $(SRC) -frames:v 1 -vf removegrain=14:14:14 - -FATE_REMOVEGRAIN += fate-filter-removegrain-mode-15 -fate-filter-removegrain-mode-15: CMD = framecrc -c:v pgmyuv -i $(SRC) -frames:v 1 -vf removegrain=15:15:15 - -FATE_REMOVEGRAIN += fate-filter-removegrain-mode-16 -fate-filter-removegrain-mode-16: CMD = framecrc -c:v pgmyuv -i $(SRC) -frames:v 1 -vf removegrain=16:16:16 - -FATE_REMOVEGRAIN += fate-filter-removegrain-mode-17 -fate-filter-removegrain-mode-17: CMD = framecrc -c:v pgmyuv -i $(SRC) -frames:v 1 -vf removegrain=17:17:17 - -FATE_REMOVEGRAIN += fate-filter-removegrain-mode-18 -fate-filter-removegrain-mode-18: CMD = framecrc -c:v pgmyuv -i $(SRC) -frames:v 1 -vf removegrain=18:18:18 - -FATE_REMOVEGRAIN += fate-filter-removegrain-mode-19 -fate-filter-removegrain-mode-19: CMD = framecrc -c:v pgmyuv -i $(SRC) -frames:v 1 -vf removegrain=19:19:19 - -FATE_REMOVEGRAIN += fate-filter-removegrain-mode-20 -fate-filter-removegrain-mode-20: CMD = framecrc -c:v pgmyuv -i $(SRC) -frames:v 1 -vf removegrain=20:20:20 - -FATE_REMOVEGRAIN += fate-filter-removegrain-mode-21 -fate-filter-removegrain-mode-21: CMD = framecrc -c:v pgmyuv -i $(SRC) -frames:v 1 -vf removegrain=21:21:21 - -FATE_REMOVEGRAIN += fate-filter-removegrain-mode-22 -fate-filter-removegrain-mode-22: CMD = framecrc -c:v pgmyuv -i $(SRC) -frames:v 1 -vf removegrain=22:22:22 - -FATE_REMOVEGRAIN += fate-filter-removegrain-mode-23 -fate-filter-removegrain-mode-23: CMD = framecrc -c:v pgmyuv -i $(SRC) -frames:v 1 -vf removegrain=23:23:23 - -FATE_REMOVEGRAIN += fate-filter-removegrain-mode-24 -fate-filter-removegrain-mode-24: CMD = framecrc -c:v pgmyuv -i $(SRC) -frames:v 1 -vf removegrain=24:24:24 - -fate-filter-removegrain: $(FATE_REMOVEGRAIN) -FATE_FILTER_VSYNTH-$(CONFIG_REMOVEGRAIN_FILTER) += $(FATE_REMOVEGRAIN) +FATE_REMOVEGRAIN := 00 01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 \ + 16 17 18 19 20 21 22 23 24 +FATE_REMOVEGRAIN := $(addprefix fate-filter-removegrain-mode-, $(FATE_REMOVEGRAIN)) +$(FATE_REMOVEGRAIN): MODE = $(word 5, $(subst -, ,$(@))) +$(FATE_REMOVEGRAIN): CMD = framecrc -c:v pgmyuv -i $(SRC) -frames:v 1 -vf removegrain=$(MODE):$(MODE):$(MODE) +FATE_REMOVEGRAIN-$(call FILTERDEMDEC, REMOVEGRAIN, IMAGE2, PGMYUV) += $(FATE_REMOVEGRAIN) +fate-filter-removegrain: $(FATE_REMOVEGRAIN-yes) +FATE_FILTER_VSYNTH-yes += $(FATE_REMOVEGRAIN-yes) FATE_FILTER_VSYNTH-$(CONFIG_SEPARATEFIELDS_FILTER) += fate-filter-separatefields fate-filter-separatefields: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf separatefields