From patchwork Wed May 18 12:22:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35813 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp304323pzb; Wed, 18 May 2022 05:22:57 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyWZGrVts9IipACn1cyWOXg7DvcKWuj7ObacVgY3KQEyzXSH3TIRVGxgGO9bM4XQA2tW7NK X-Received: by 2002:a05:6402:f07:b0:42a:e705:b6c3 with SMTP id i7-20020a0564020f0700b0042ae705b6c3mr3500903eda.310.1652876577285; Wed, 18 May 2022 05:22:57 -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 co25-20020a0564020c1900b0042aa47fd505si1954262edb.125.2022.05.18.05.22.56; Wed, 18 May 2022 05:22:57 -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=QssF3L6x; 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 982EF68B47C; Wed, 18 May 2022 15:22:54 +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-vi1eur05olkn2099.outbound.protection.outlook.com [40.92.90.99]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 60E8768AF3B for ; Wed, 18 May 2022 15:22:47 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=do85WpGfZ9RIt85o5QgisfNzfubVeiP+FdsDo2onfLa5UeWtcSbEEJrXEH1iHDd0onx1PcFdyLHYiplDchBxTq18o97cFVOo5+aUoyxfrT7yo8OoecrP26vllYKyQ31J/FEG1hsqvHHx0JDHGmSZbeDViN6PE7rw7KoMhwtC6Z2HXNYBjyEKuyaxfrFkdngNgj9fBjJiAtMgiOWX56OwNKTv695vDBRTPfMZ+dzdhLcqwD2SEi70fTK1JnCnlLHgKPiNZyRnvoMbg4TkZTgBhC5NlGisWtpj/qvI9C4VPlHqbJFAwE4jmoUTIq1W/jbYIkH4aQEPH3R/DfHVYz8y8Q== 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=5Qvx/TcXsDvUUd+JZ2XUzWHBNG1WhIwYOFHnLQkq/co=; b=E0vRLWKrpPccT5x+uVtfNiy4IYVGwAqf3rXRGT1Jcts5AMI1SPtWU6/WSJintNEe/FmwKau+K5r0p18zv/ObZjE+CcPdXNRubmntn4w7md8OUwxpcVi5JA5+oBWsJSvkApDutaqHv7TtD9wF41gzEcwz5I1WIBUYhVdhbRhQy/dLw3bB10y+Ttv2n0XsMw4O3wOUf5KV2ma1SOcrnJgpxVn557TuMXJEyIkZgdRcI2Nvhu2Ynlgrj7KOLqt7ECoW9YRtWlM+AcRzF9V7UwfzD4n2DJLC3NwOQ7BEIFCE20L+hw6yBTP1Gdr6YzJt/Zm/D/Pnrk0LpipbAj4gHKQi/w== 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=5Qvx/TcXsDvUUd+JZ2XUzWHBNG1WhIwYOFHnLQkq/co=; b=QssF3L6xDzTad1u5HtRfld6tH4ha1kuLmsMy02mSVERwFz033f4IkeR07aE/xet69JPYHhygP1KJeIXa+qiagvHU6JohxoWlcUtc93WaR7C7RO79O61mPuscgugPrUlQ1lnQBeJpXLAeAnIRBsR2Fa7hOOyO6NsBgmqf1jRDHOnWoAQYjAX5EaEYHoEXlCQs6UJW/uAScDmy3InbdKuTNXkZ+pQxPm4ytm0rvQ93fyKEYhXKh8MMZJHj4PblBipwt287pV6GERVW7hgVDrPpwxwB8Puf6w8aUM8LMeaieKk0nfr41yGNLvOBJiuAiXBvS/IKuCZ74H5FeFOiFv1JVQ== 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:22:45 +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:22:45 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 18 May 2022 14:22:31 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 X-TMN: [wvhlYqoOiqrHxzP5ar23K2d/dAyx53D+] X-ClientProxiedBy: AS9PR06CA0538.eurprd06.prod.outlook.com (2603:10a6:20b:49d::25) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220518122236.1295176-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 159753c6-98b8-45a8-48e2-08da38c91cbd X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiTPyXc9TS18sCnS93pjpiOSZQzq6FBbJ1i0UdioRvoK5oUXL8CUySfcYHQ/oilNZdcyhM2r4UUQfBlqmR70PqDHu19xe0w2TvJswKuMQ7YBdZKjnMWMK5LmDiMquiSJDaJISdSljDGdxCC0Tyhe1T5Uwj2EInM/H9aspQm3RAvi/McCB2KTizK4/bUG6wwTzAwtTtNjidNFEpCklR3MlT53qVPz17a17zcLpX5ObEUBGhsQUCQi+52TGpl67oxgrT8TRu9P6v2igM2xaJnKrYfk6KM3tMfKSARo5Uts7+mRs4My+3bz9N55COEViqxSm7aabQt1nL4gZK7mEvxoF1O2XkbdW1EUuNVG3T2l4BeX2e6f8DnjTDR893V8VTqamSRo8AeHQSBkiogEC2CO7AaVyFvqYzSksBYLZyAzi6RfmFqIFzq+U6Lb1CKSoUEBwSWbGtSgIGnIsTelogbgs7MoPMcmEEfqOyGdYH1mIogd+D9WCtTgaEstTV/5uEI4rveUOFmcPorc5A+SQoA1sLJxthok5VMlFPt473dmKgPu7ogUsPeP+f6uGrESERaNDDZahe7NbcKZKopkHrryshrYjP8moIdMuKiUeek+booMAxGjCWcmVoKQaZRosS4IT1gqrYzRvb8Zf5zR2pKoJp2yrPNDDBL8GgHGlYcUuFeIqIHxz8Jp4gGYoON/9FTCFrR6Pl7zkDoCCuF735zF5O+38gwszWeTso/DwUvI7OIhz+v42TK4jAtWZxZAZsF+tjk= X-MS-TrafficTypeDiagnostic: AM6PR01MB5911:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 5KUvZHLZNXachf7S/rCKhFGmADYC2/e59+kEUPLbEY3yTinfJVLUHAkyeUXtgrXRiBGf94tgBJkyZ7oQr8A4Jre4fLGV5wlj1Q1HhGjIRU7s5/y8BlC9kmXwnJIAV0BU65fFkJ7MWgj27Tw6FnGnPsN+3gRwfjBVQf9ZyudSCx09ogzG6vjqbgRq/mD/DTYzB9BLwbyQQscN9Pr90fq/9xbPNNZpIIHquKE2ispC/q8uzTEU7RrYOBJKq1ztwzaO5jmvctwTqYiLP1jmanuti59p/3s/xpOFYYsBgcJW3EkCyZtWNHRe5OzBS47oLptMdn0JZvOsdnEqTTxPFAU753Mp9wXpmif5CGmPtsMR2Ww2zO10szubqrFynqiFkexisvRp32jLDfovqBIN57yg95YWIFn5G1+5ynULZCSMhmSF+/ZkyXEkkkWkwWZH5/4OvCc9KnK18sCpSxrzha98naPcIGGtajXCt3R1W5urWn1m+IAiqT+JK8lj1Nsyr4flZ+aj4DWTwo3liRf89AnWzb5Rth/BtrHyo0xatGWA2xqK3RgDuoc8l+oBraQpr/MBWzTKMGvIntgBI1/u95TcNw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: aJ3txITnJh6QxoXa3OY9cTTsgbSwKP81mIxqtgCUbBHlRcNh+dKcrDA5/9+4zmXKAlJ+2TOyHrpfXU/zLe4bJxnrLR8IUpPFQlfyNnryHUSveQc12qfLQGuYasckTHocrlKKnH8Jj1UStNonReNY9gnk7FHVSMQZ0Uw+9ELehw1YK4Lu05KX1cpRiyku02D44fPotyvWFAATZLr669Nxqxlloxy4s8DKscgZuSWXrMduFN343xd/UUPNnJmOW6cpEX/Y1fRxbWCYrD2VR+sjNO4D5qqfdrddj8T71GFjnm5RNHbDN9CD0tQfpERu0tazhMHAYZgHsq2GRm56pX8sK9q10aQ+nBTKQyoWEVi6pAXcK7U8fvFWGkFO3nHTFlgb30DTyggeS1pDtNOi2L+VDLr7xDbaBOSZd7Z3NzVris0FzfsxS0nUI8K+VRE4S9Hq8cb2raWRkLOWqeh//hQjyTxTjpLRxacVh7XoTxDwfwP4ZM10aEqDYhkwh7opEPiyy65KAjl6OFtj4/b2UZjFsf6UYOYv0IvfAw0heNp7uhJ9Vzjupp+NfjsDxEdGLbTD7s4HV6YxyKcpxfG0MWcy0QnMw9fkfvr5gkhZST33jqXr6b28vMKuWwCX7xuyVB3Ok02jR0MOQvR5pLxQMTWWGZ97xZmdakt0fw9yvUv7fjOC83RuXvEi/tqAfWulydzNdnJb+CsRQDnGABXt8zRx03ABbrzTE9cGBvlrQg+DPVYlJZVa0+xSKajs4oh1N3TzxYivWz/7CkigB3HJmJndbfDa8xk/N5NZLNAzGsk9BLv1/4Cd+6ukSxlH2FVJci4axGeBCfcf8V/dS+mae/RFQFqkZE/W/KQiKsD3eiSp3ixnZ1izETkbvlArlZFi0hAA3Ny3J7iHb09nWFRfWi+VX9tUHbMPoJm+ELd1UYam61N34601fC4ZDZQE5nopMCELA7c7aevBguKNBEngWUxeCTseUuYohhhs3mubaX1YbOkX6rqGzZT0mUbKefrmW6EW5yTEHn6QXWJdoe+AyKKXs9u0r75F7Ojh09eXcl/SLomRfqFyuhJzfUR2fmZjI1eF8qPxC8rOk/mn7zD5/K0mLxnDRZieppmiMu/G90ws0/lWEM9Hbcvx9BG3hZuk4vfE8uScXfzeAy0NS6wnXAS8O8pgtod+hkllyxi66X+3b3DucZ77TZu1/hX+HZlatcmkZAmzOEgq6enf44gv+iI9imBbs1gi9aoLn79TjJAw8kMumhMHiHUUubQk/OVaaC5GMV55vIOrGU066QkASK929PjFzTBvujGekOTOKcMsNTOWPCzLCQjmYF5YWrHnCdj+rTVjDO6OmXkOuY/AUi0XfV2FRzTbCD/3Z0pBUJeXgKNq/7lli6EzudmAbmlrmQDjrchF767bmcdyQeoCocBb7RPnPyFJT6ReRSUKh9+xvsRVEL5VBpUdT4yIkDt28QHYlrRbgzvzHkFHx0uPXK3W0w== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 159753c6-98b8-45a8-48e2-08da38c91cbd 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:22:45.2313 (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 1/6] tests/Makefile: Remove FILTERDEMDECMUX 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: n1lm2n4K90Xq It is unused and given that one needs an encoder to produce packets from AVFrames (as output by filters) this is likely to remain so, because FILTERDEMDECENCMUX is better for these scenarios. The only case where one can use filters without encoders is with the lavfi input device: It outputs AVPackets which could be copied without another conversion to AVFrames. Yet the variable to check for this is CONFIG_LAVFI_INDEV, but FILTERDEMDECMUX is designed to work with demuxers (i.e. CONFIG_*_DEMUXER). So there is no usecase for FILTERDEMDECMUX. Signed-off-by: Andreas Rheinhardt --- tests/Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/Makefile b/tests/Makefile index 7ddfbcfd7e..5cb33b6c65 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -111,7 +111,6 @@ FRAMECRC = $(call ALLYES, $(1)_DEMUXER $(2:%=%_DECODER) $(3) \ DEMMUX = $(call ALLYES, $(1)_DEMUXER $(2)_MUXER $(3) FILE_PROTOCOL) FILTERDEMDEC = $(call ALLYES, $(1:%=%_FILTER) $(2)_DEMUXER $(3)_DECODER $(4) FILE_PROTOCOL) -FILTERDEMDECMUX = $(call ALLYES, $(1:%=%_FILTER) $(2)_DEMUXER $(3)_DECODER $(4)_MUXER $(5) FILE_PROTOCOL) FILTERDEMDECENCMUX = $(call ALLYES, $(1:%=%_FILTER) $(2)_DEMUXER $(3)_DECODER $(4)_ENCODER $(5)_MUXER $(6) FILE_PROTOCOL) PARSERDEMDEC = $(call ALLYES, $(1)_PARSER $(2)_DEMUXER $(3)_DECODER $(4) FILE_PROTOCOL) From patchwork Wed May 18 12:26:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35812 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp305753pzb; Wed, 18 May 2022 05:26:34 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzaiMyXBohs6CyArPGCJu5XXmVRpgwD/aroUuQu0B8hJloQ4E819ILBXNlYM2fr+0OZC9cG X-Received: by 2002:a17:907:628a:b0:6fe:526c:ebc with SMTP id nd10-20020a170907628a00b006fe526c0ebcmr10244039ejc.531.1652876793832; Wed, 18 May 2022 05:26:33 -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 qw12-20020a1709066a0c00b006e8bf488698si2494371ejc.202.2022.05.18.05.26.33; Wed, 18 May 2022 05:26:33 -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=A3YohVK8; 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 C7CFC68B493; Wed, 18 May 2022 15:26:30 +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 E02AF68B1F6 for ; Wed, 18 May 2022 15:26:23 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=klrbUt9xNNx5vMaAnSTIqRx2kigtPdWLTt3bBxRgF6ANvSsyhTbWk0IpE55tbhGtbEOkk5ReGX+gjUUNYFEzG28T2GpJH1RC5AeIPO28eVXj8Y+W73kXipgdvg87DOaJZclW9WwpXELeCuxqTX3bpZuOKXlyNKTXoggRgoxxIdz6wc4/newajzQxJY6NRLOacMHHdKzjPn3oIqJt/E9XWTi6zvEOfxgc+bcDijH3aI12S1VdME44eJYfVp9LVHKoe3pqU47rxu/Fi7VG4z6yNA2lbg9sroSUjuSDYkUs17dLSuLv3R+NgWW1jYNTf4/GLQh+4RTdEULRc+GNe6ZpJg== 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=F7TSqngq0PPVn5+G53gW7Ms+4VvQu+37LFkMollyILc=; b=JynccMNRafPEQ57VWabeYsgoYmw/N4YoprTe9mxHkkrK0qbBjDUKXltOfBVBeam/xyvGEZZkFKLXQTVqA3bt+ulwjXGgiez4LeFMvGsLQcm4ai9kfYtrj1QwRh77nzTdRP0b0/TrDbgebxZ+e5lSWB/xFCqpRUCOjUWwn03SnZrtDsnShCSFigigzHOr0xgpezf5K0XcHuG1eomTzEDw/aGNtuTYY418Aeae94DrvrYMd0iYH1vWXTmwMGfgz6D5iVx3HGhnBO/5KBayJE2PXdSSXsDPlubnM5ujjt0Q2q8q4AiCXJ/I/5ZXDr1I9rd0uAPjDixvcAVxqC2DTyf2Hw== 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=F7TSqngq0PPVn5+G53gW7Ms+4VvQu+37LFkMollyILc=; b=A3YohVK8nJl34kRAXGHQRsZJEN7K/2UgeKYETaJr+qGYqWduFLm8vFwrCZQAHzn8wbhk10ln6SGjpYkMxPkgCGpj+PUge9tmN8LDBwU0SECIndXamG38A5Qj5EOx/eAciEmIv+32I9mFAKln3+18pUlgW/ZkqBg/Q75DLboM+VL90DFZ9SUyZZ5mKSB1bFODJuueb6hjTDHVIlNgByDmRIm7KMpQxIEDFGxXqVq9dGMrukT/mxh2UKGnFbfDAUj+YorZJazGMR8pKi4QVETCSsRYqW+VnaX+AAKZ7tXdkbUekKak2Ubi6ygd1Rjt7cvIbrAip5B9dpCNp7Hwd9LiaQ== 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:22 +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:22 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 18 May 2022 14:26:10 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [Y/cm/120EX6zclrqcjyWjzyPTOq3WYR/] 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-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e1237aef-a223-433f-c394-08da38c99e2c X-MS-Exchange-SLBlob-MailProps: +LiGfBxqLEsS2ePgsgvfWYUNc+grnheHmSHtLvpzBwOVh798a49YpWn1L8B6vawy71wgs29okw5iRo4Z5c8StkfDrtwePFu8DrydnRCzcDwMZ3N2g30vFT3R+lFRzun6n1vAtiC/Fkzg3MksTytfpE/shA2CxSeQBjPDD2sQHAHJdujmjgirliSOQ6io+NDSxGKZ6CHCgFwLsmhRebnVahesu4ase5PsXwpS5TP9oy19IK14RJ3aILcCMGu5oP+/myW3ebEMrgmSjbz9HjHMC+kBb0ikoNvmPHAXxVS4nV1aRjFA+Z33Wa9nOSaK0SFCwXrRc6RGRD1DmLUUa0qnPbfLcpEuyOkWBjsLHplfCtTIWAEWHRqTOzkTxBlaJeZ32kNl8hwVav807HjurHPznEmbiohynVJ+6HxtwwdL0GZzXrGHYNtWffhbozzqCVFbmKG6eMjtGKLg/SgpfSuI8Xi0OU3vJypVEVAeLxoIG96FqAgsMAvjWoFXpryUx8qlYDrCt3Bfn6lxwib08c8ofOR7Qa2MVtXI/PTmvpaErH6JBYe1/+3U8wmnwc9gOs18V1dQD0ntoUV8r7KsN7O6DhLlUC0BeRqVihot8+hYB7Zwos8GLlQOT1uaC7kJ0e/DcfCVKi30/R/pTFB+SHqWn0WfFHkxeZVbF2cpdxY4SGCDw/Asw8RY4jArzVgh1QmqXNdhLcigmTjnkFa2IxxyJwQWL1hOGsO+jZ7QxaOmvnuoppYcJJo7FwYykfoyS4NAzmba1yIxXD/UfjgWkZxiKzOQmJaZoKU/ X-MS-TrafficTypeDiagnostic: AM6PR01MB5911:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 5AbpBRayhWqLE6sj6s/pIDUQ8vKangJ8PX55RV5otNjcXIWz6Wj38Z+TmjAVfspzi+dcyztmGh7wUrgwhiGgzqyC7NEzLHVrnFfDMHYA07/EnndLYxYP+lhOlrTkFfLqiDrwHFM2QMCylsNbq+wieQMkaJUGPVUcknSiNf4O+G3OP7hJ2zbRuRpaPJuulzQEEvH6pyx3j/LfAzvCxJVBB4TnV3ec7BX3sZR3s8//LOdb9/4D+obbYMuTtrD/Bfnif/UJ6fzyw2uFK7ytaFbpCAHiYooYoSi91VYO4jbsPyrI1EPelQnSFQYsYgd7WOBbIDkrDVfFMd4zWXh2x1kLVcxCdBg2rNb6SKP/9j4ZGjez6QNq4FHyXchHQb62gsIiRGxlAQqRjBt65kN3uzN4/fGqiklTzmMb3tFZsOLb8Cye9QTDo8QGVf+h7jS24qnjZ7B2HciGWht8ou/p1nsJ7/8orZAzZVdU9F6Jp5QbHELkvExspySIuL7aIbaVQ9LUOUU/bxJoo8TWKVJFdTGfeX6x75a04QNMZ7QSFvx8lohA8KKK2NoFbsXCSOzCZTmxbtchkJEYIK6kv1ayNnP++g== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 3wrMwL36YvpbzGdUs9zDOpdjubQfM+DcIQzzYZHrRgQqcDbE6M6yXpSvIEyZdS/8ozOkxKlmlv3IK002JPHB5sUWw5q175frgE9j1ljUhTegAp7b0/1HxfFxM2c20YK9GU8QnlvKWNNfWLrUe5WnpcWnFJ31DsiClmdH0PeMcVg42HgHg/LBr2/Hiem9nePvEjeBoIdUv+iZJwrVLNrE3lbA0RsaRTjX2PMig/ZcM+HH+vf/Y63keGM+pqHA5BIWIx3niLcmqcbk9ZQn+NcM3+y+EDMj9/3T3dY8NhWQvK+mQmdhK4uaguSgL2YnsNbH64YRSlZAI6dLv+Ji5kXqy2RzSzdqdXuR4KC58VjGz3/lhbsV+XtIB6za0YKWlNVeBS8ahvNkuI3uTffllQSPH2g1hGbeJKKPa4ctSNI1SRK2fq6xF6skBQxw8/Pn1V1cU5hbgVzvjv7uCwwvG0XLxF0zGMFiT6VK0FqIyMf9NYjEudvjqUNapo07757a715x0kCJ34KcOc/9ufm9ZoXoz3s312Y1BXz76i9pieJ9Rt9bWNCu6JzTDxKuTPK9HtcP/48KImBgeJQANuFe14MJrvF/mn3K+oZKLTonU9rtuYWj3+HIE+ZGKI10cRb8/gGH9QQBZvXRxAxW77BnkrF1PH6jWNpvtyVEb9pPnsPUyQ6RfbUYYj5yV/LMZ8UM5APz+QTeUw7m13yvCzeIppGR4yoKytw16ux5pqe8ANFMvPk/0ax4/alZapTLyrf7bxoeBilsFLpua5CwYxuTHIxo+q/HMmSMHAWC8yDoDUbkQsIodZYqqTZTr8dpd3zedHEvhPHoPWv8AnNtToVYj1TzlKtlKVu3eP5nhiJDajanMpvkCk6tgA5nNqqefrykEVUkYPOsYiVcDXnW+6RJTB/NBv5NHECd9HcnvZYGl8MFJU0401Hk4F7YIDiZo06yzbdNJhUZ2VT/VZjcld2N0gtFduLEVA8/2SHDgf8lGTLssXSDoZO2j5h60jtDoYOR3GNZApwWpSzSWrXWM/t+usssjcRhtZ3/8J1mEB/za+BTviBD26PmFr6krr5oS4Icu4FB3H8fDUQP7l+s/mm/bBLu8RfW7okEigwEDPloFZQenJPCQ7t/UH29VLZe5hnEdL2zNYesIYcqxhaWBcsfeR99rsVth7qgmiZMS1/5utbMcaye+lP4VVyF/LDBkUApCK9XnAGmWAAvBiTDKWtUnabd8R1RLNS9vr3bghZE7rveu3kuwcIfwtc9N/guPk1GyLQ+wZTYRU5KyG881cePn5IhTutEd80n8tiswiH4wVYbNITmsI0gwBmZ8b9PKKlxVuWZtjvoSBSYY/prf15ZQI+AMK3PEqxuOjxbNXxulW4dZvGX768NT16u0GGeAdxp0rHugPViD2zISfY/2ymqkBQ1E/6fXKAUjkkMDh7SgBRt0Mm3qDutn1nlDcQWog/j3RJTmOc5bMV7HFMMMnu78V3Wyw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e1237aef-a223-433f-c394-08da38c99e2c 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:22.2162 (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 2/6] tests/Makefile: Add FRAMECRC variants for filtering 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: gHEmluVHtAdB Lots of tests use the framecrc command together with some filters, so adding a special function for it seems worthwhile. This commit adds one new one and modifies an already existing one: All users of FILTERDEMDEC already use framecrc and the more general FILTERDEMDECENCMUX can be used in scenarios where more control over the used encoders/muxers is needed, so use this in cases where an actual input file is involved. Furthermore, add FILTERFRAMECRC for the cases where no demuxing/decoding occurs, because the input is generated via lavfi. Signed-off-by: Andreas Rheinhardt --- tests/Makefile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tests/Makefile b/tests/Makefile index 5cb33b6c65..7622e5c984 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -110,7 +110,13 @@ FRAMECRC = $(call ALLYES, $(1)_DEMUXER $(2:%=%_DECODER) $(3) \ DEMMUX = $(call ALLYES, $(1)_DEMUXER $(2)_MUXER $(3) FILE_PROTOCOL) -FILTERDEMDEC = $(call ALLYES, $(1:%=%_FILTER) $(2)_DEMUXER $(3)_DECODER $(4) FILE_PROTOCOL) +# Variant of FRAMECRC for the cases with -lavfi where no demuxer is involved. +FILTERFRAMECRC = $(call ALLYES, $(1:%=%_FILTER) $(2) PCM_S16LE_ENCODER \ + RAWVIDEO_ENCODER FRAMECRC_MUXER PIPE_PROTOCOL) +# Specialization of FRAMECRC to be used when filtering is involved. +FILTERDEMDEC = $(call ALLYES, $(1:%=%_FILTER) $(2:%=%_DEMUXER) $(3:%=%_DECODER) \ + $(4) PCM_S16LE_ENCODER RAWVIDEO_ENCODER \ + FRAMECRC_MUXER FILE_PROTOCOL PIPE_PROTOCOL) FILTERDEMDECENCMUX = $(call ALLYES, $(1:%=%_FILTER) $(2)_DEMUXER $(3)_DECODER $(4)_ENCODER $(5)_MUXER $(6) FILE_PROTOCOL) PARSERDEMDEC = $(call ALLYES, $(1)_PARSER $(2)_DEMUXER $(3)_DECODER $(4) FILE_PROTOCOL) From patchwork Wed May 18 12:26:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35814 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp305816pzb; Wed, 18 May 2022 05:26:43 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwBKxOlALqJdWB2CMxM5OJJHD9TWJoFpMXTXuopx6IBVdCIQrQ2TmfQXpdk5V74pKj6OyrO X-Received: by 2002:a17:906:5d10:b0:6f4:e263:b574 with SMTP id g16-20020a1709065d1000b006f4e263b574mr24880448ejt.435.1652876803534; Wed, 18 May 2022 05:26:43 -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 dn14-20020a17090794ce00b006e89f4b0cd2si2224045ejc.403.2022.05.18.05.26.43; Wed, 18 May 2022 05:26:43 -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=lgCzL9qA; 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 BED2768B49E; Wed, 18 May 2022 15:26:35 +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 0E4E068B477 for ; Wed, 18 May 2022 15:26:29 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AOkYbKRiA729zKc6O/vL7Lrh+kiF/UA0fy/Cb6PUxrKGS1+Cu61N9jVg3FwBwz/9w6w2y5TzXUhcfhCb0FnBhm7DQdrPTdxRadj3j+O7UDDPQbhikl5WTTIF810jrXY8VcQna+6errzGUvNckmOi0OHbnyn9ASMcE9gzaiUp+y6HFVSyTG1EplH4pi7g+jLVdKGes4McLPBZsvYWG3nTJLxZjfM3KXm5i2f7oaysiPkagunkaUSBjQamIbe00IbVfInqBTzH/ioM8Qxz10xIrnKONxlJa7CcN7DM1IQst08s9Z3o6zl971pKGD9stmBr+A24BAK3qiw7eGkse2vcfw== 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=6OZ0jdJI+++mMSiUOapkmaF8wiJ7x4sZdgsjBMJex6k=; b=g3lO/CnUgvv8HCEgTL6Cc6EQHdXCBVRj0PjcAyn2npEKG1mxaFk2rPjEFpw1/TtIOB6eLHTgd7kNI74oO8IP8yU4UmbW/VxAIQ368O1LnHHqKMfqXeyNsObtwzHMurhgpdRLXryuSxeG9cHhpZvFLFIJ+Nvg970SLfzHUCQ9xJQcohzvzBEMOeRLq2ykth24b5zXiW49rIW68zYBeTUhcX6LsHYpRkQnokXmBLQtkvfEX+UjtnG/Q2j/E79WsLeAFQu/eyA23w4HM6U7trmg7KfFzonpvXzfTVZyz3Ay1Iy3VBIag9aWcW0U5XFHJ1RMPwllwY4YvERDMkfrY9N2Sg== 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=6OZ0jdJI+++mMSiUOapkmaF8wiJ7x4sZdgsjBMJex6k=; b=lgCzL9qAClJOWLNuJgKZLniBUJFvb4t7GhtqIh9HqNu/R2TgWh55+QxFkBPVAlhEJVWj03urmIcney1ef7o8Zg+XdPTgBVM7M3e6YMuiv0yaxO59jlz7R2x7ewOqbq6O1h7GupESf6E2MPNLX2IS/vGcjPp+dEvW6Yd7rhVdVX+0cU64aQ4p8JmFAQxXRiifjruVNWfvatzOL4VynQspOKmaJbtriG7OCN7QpdFceBApvgZL8NGj0whwiMF++aesBmL5qelSWX/oYhpGVh7pbUUYdWeNUls6fugG/VzrpMiaXhqtBQbWzZjChJ21SFPLiIBpwLGwasltjLHUq+K3dw== 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:24 +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:24 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 18 May 2022 14:26:11 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [jdb6KLt/MgL58usxTexY8texG5IPh0Qz] 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-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 020729b3-d10f-4cd1-88d8-08da38c99f5b X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVetrSOn5BNf9taOIHTpJPJ4CVLAEL2B1JKprn9ZGItTt46yNNqVhMnIIzOFsbyKHTjRnak9kz5wPMugpIML4A10VWeA88A4IzTA7lJlHpyynnsBxU46OO1OUAd3cGZwmJiZ7WfKZg58tnXjInDa4cXP7isvit66jaAhUGWVdiW+To3BNOgYa1Mi6V0VTsIP28idX/KadU4vYkdPH4getaa+AXzFToLZUJci5quvALkD74bIue1K09vGRNGH+NpSdaHVJeFGqODVNZ2eWxeoqP69E6IJR0d83tV85HqewD4mGaQG84iYp/ElI8baLik7qgVuJxrZodgKBVp6FV8JkAqtJCf1Yd7zHGN03GqEjaMOOBTIJ/pmI9vNz1ao5C245vpFcsdmru57TTx8+Qwmfivh5PDYimVZrjhM5CLYOhNyPx9kjTAQXMuGpq7tL86NSoa5WolPa4RZVRKKEmCUKBw/KJDuOgtvT3LgFd+UT9ib/7SOk8wSa1N069uCgsmpDSjA9yZ6iue1hD10YrYn2I1IJTfJpJbv5Wi92r8ht550kM24d1bp5HByssEt8/WO8eehHkP/QAHWTa33OSdfKaXC1OYtz5xmGL11B8bF1Elvs7L+hAukbGNe4S6bK+PTALX3hQ73RlGwTWqhCBsafew9ztN6TdCl0I3TSgD9mRBPhTM0VzRaByBtSSwdAX49HUI6yFbgV++TLX01ByBvwxO2saiIv4rzRs= X-MS-TrafficTypeDiagnostic: AM6PR01MB5911:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 26nvsBEOIezlOLVwa1mHSrGHaUWnB4iJjcRO8JIp+do07E+st9EZokdG4Pg1JyRAYYoxzL5iSJ2JJZmLCKL13+q4fyqze5v55vlNPvs/HnJr1DDo66erg85MjSaaequCLSQdgGWiNcVQIj/so70WOQc7tIAHQIAyoX/Ru4k2zIu3Xl8waIGIdtG8K6QsU1llFn2U0GtJ7Wb6R6IQR6HAFJP6izDEZ0nuFrdpGi+HzuE9a/osLBTnJwrx7sS2i+0CZs3uhipkMymnSOP17cLVMHZy9pIv2OLYLHdeqggTgY3e+UXwq+GYikwntzLS8GckE96a8tqfv3mVWdMR3PcTW3+UJ0tFGbolhxsOuJAUPjAobksJN73w5BYFMAGjCkf0CN+zRmxVi9ZV7DDYpy9LxN79MzhrhdkL6Z1b5D5cWSc/p7hOvdSDU0spk1TzWEhMi0KGkBTkHcket4mYeyl1V1YW43tu72w4e+XS5KIZW1AFjgZEUoxqMrAGGdIxfg1Iuqmm3EgPSloBpxZChtPq0mdQb0MgOyNJM0G+fUiwmL+AgWGp11wwivzcS+8bVrAEEnMdU0Is7kHNIYYvxv6Lpw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 0YdECWMXApC20t0mRMgRWElX6JJMXR8XOE7UrPjY/352qKCsrQhOGVrV75Vvi8EyLlfwl9BPXzkDasJ3uKXItsL27N9N5lB4qU3oWRn2XUf5+t3eREsRTOztJYIfG9eujoZHJojp4dbRFYBSjojzzhTf/ygsf5fUMwE49uiEpe5wjVivkgbLsr2NNKShr5MfR6QP0zdnwJ+fwobgBtk+58BdMKHn1OCZEpzXGewRD62ApqiWetl3NdcgFPzqBYMN3L+hw1iceQqFWn+gUfSGojkmGwPdWs7NclZAqHHq+ITV+V2p8D0yoLnd6AOQfulkvX2RZI2pVWLKe54KoNkMDRX+H27n4VYlhPIV2POzxM8i/TX7y2hIft6XG1DNAVOtyVQ+blZceDxF/COoj1mi255uRWSGZrEKEx4mDN84qaiIL1/dZTFXf7bBzsxnkVfnz7xal+a8rSAEztJlde1GWksnfPLIgr8s6RswRstMkTAWzOYqqNLHKDg7aUtFUB6edVTY1QoWY84pWgBj4T5mgXZCUWbpJSu3ymub7+j60OIBsw2vAAzgtwil74aoPAhHgE7tDn6CLg/9o2LoZ5NprdwoN+K+0B0Cw8EmM9iO8NcUqc3ELKwyczU9IXmsQ1c+jI9NE/dZojvWCjExvky3rer13a45fHBQUjMREz+t5SpCaZX+0Jtx64x0Y5reYLEXOINTc1t/PFL/E5bwf14l6kV/pCcFulM85uynpkPIDx+tbd2zJDVSPS7PEZltAWVfx1km0r7SQLtCDJxFwrm2V/0VHQtAxTElDtAtrik5gCHSOLKv1eug8CpToJoBwWtEw/Xr37vJHGarcHDYKmr5eLAtRw6MFIX9DNCvOQ5RUmKzx4VqYCe7c/Nq/nsNo4ZZ2qAxjnwZ5MUbgyDGzJNk8EBqUY1cp4uFxQvGoL1MA1Mst3CN1qdK3j6NobWwkBeC+wA8J+rwPQtVnGSUq0gPWZie8ytihWCdmqzvB1OfPNWtTnov8wYugyuBtpeUjG2xU/oIMA0ttIB37dYsyDqUhufcVVYPF/rvlA8nY29Di48QJJcoP5qLrpuWzaP+3j0DwSWs1lJf4PHNtsei65Q2zMyTRIejpheIDKoWV7gNoSaEX59eAmsUhYXITZZ+/uAHwDjPqTHMFyBrQbjgyQCn9KFjvn5icGo+5fhQPISnpH49UyO5RkmO+cUtyWlKO4+az5xE1oOCfIQRQReqm9/9XiWtE3IoUcQnuxPrrtg66Leg2t48QJV/+KJzInc3ojf/B6c97H2uK4NG3fN4Ov8ZmJD+CgRaFpkKdANtDcSAQq+xaopOGm9VLmpL/9gxc2eJa4SsEwQz88Z7yP2+MRRv+i6sBGY9CYvRg1UY7ET9GbOW/zlzNsS+S1qXFLOJmdjb3YOprA/jV04Tz5OjcNwaorVt2ySsMEMxvGKdDB8dp7DGHJGAlzcRXSl9bHE/G2Xh X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 020729b3-d10f-4cd1-88d8-08da38c99f5b 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:24.1848 (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 3/6] fate/filter-video: Avoid duplication for fate-filter-stereo3d 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: cMCrwuMdB65t Also fix the requirements of these tests: Only the anaglyph tests need a scale filter, yet it has been inserted for all tests without any check for its presence. Signed-off-by: Andreas Rheinhardt --- tests/fate/filter-video.mak | 81 ++++++------------------------------- 1 file changed, 13 insertions(+), 68 deletions(-) diff --git a/tests/fate/filter-video.mak b/tests/fate/filter-video.mak index 86408dd58c..31fa5a2d4c 100644 --- a/tests/fate/filter-video.mak +++ b/tests/fate/filter-video.mak @@ -617,74 +617,19 @@ fate-filter-setdar: CMD = video_filter "setdar=dar=16/9" FATE_FILTER_VSYNTH-$(CONFIG_SETSAR_FILTER) += fate-filter-setsar fate-filter-setsar: CMD = video_filter "setsar=sar=16/11" -FATE_STEREO3D += fate-filter-stereo3d-al-sbsl -fate-filter-stereo3d-al-sbsl: CMD = framecrc -c:v pgmyuv -i $(SRC) -frames:v 5 -flags +bitexact -sws_flags +accurate_rnd+bitexact -vf scale,stereo3d=al:sbsl - -FATE_STEREO3D += fate-filter-stereo3d-ar-abl -fate-filter-stereo3d-ar-abl: CMD = framecrc -c:v pgmyuv -i $(SRC) -frames:v 5 -flags +bitexact -sws_flags +accurate_rnd+bitexact -vf scale,stereo3d=ar:abl - -FATE_STEREO3D += fate-filter-stereo3d-abr-mr -fate-filter-stereo3d-abr-mr: CMD = framecrc -c:v pgmyuv -i $(SRC) -frames:v 5 -flags +bitexact -sws_flags +accurate_rnd+bitexact -vf scale,stereo3d=abr:mr - -FATE_STEREO3D += fate-filter-stereo3d-abr-ml -fate-filter-stereo3d-abr-ml: CMD = framecrc -c:v pgmyuv -i $(SRC) -frames:v 5 -flags +bitexact -sws_flags +accurate_rnd+bitexact -vf scale,stereo3d=abr:ml - -FATE_STEREO3D += fate-filter-stereo3d-sbsl-abl -fate-filter-stereo3d-sbsl-abl: CMD = framecrc -c:v pgmyuv -i $(SRC) -frames:v 5 -flags +bitexact -sws_flags +accurate_rnd+bitexact -vf scale,stereo3d=sbsl:abl - -FATE_STEREO3D += fate-filter-stereo3d-sbsl-abr -fate-filter-stereo3d-sbsl-abr: CMD = framecrc -c:v pgmyuv -i $(SRC) -frames:v 5 -flags +bitexact -sws_flags +accurate_rnd+bitexact -vf scale,stereo3d=sbsl:abr - -FATE_STEREO3D += fate-filter-stereo3d-sbsl-al -fate-filter-stereo3d-sbsl-al: CMD = framecrc -c:v pgmyuv -i $(SRC) -frames:v 5 -flags +bitexact -sws_flags +accurate_rnd+bitexact -vf scale,stereo3d=sbsl:al - -FATE_STEREO3D += fate-filter-stereo3d-sbsl-sbsr -fate-filter-stereo3d-sbsl-sbsr: CMD = framecrc -c:v pgmyuv -i $(SRC) -frames:v 5 -flags +bitexact -sws_flags +accurate_rnd+bitexact -vf scale,stereo3d=sbsl:sbsr - -FATE_STEREO3D += fate-filter-stereo3d-sbsl-agmc -fate-filter-stereo3d-sbsl-agmc: CMD = framecrc -c:v pgmyuv -i $(SRC) -frames:v 5 -flags +bitexact -sws_flags +accurate_rnd+bitexact -vf scale,stereo3d=sbsl:agmc - -FATE_STEREO3D += fate-filter-stereo3d-sbsl-agmd -fate-filter-stereo3d-sbsl-agmd: CMD = framecrc -c:v pgmyuv -i $(SRC) -frames:v 5 -flags +bitexact -sws_flags +accurate_rnd+bitexact -vf scale,stereo3d=sbsl:agmd - -FATE_STEREO3D += fate-filter-stereo3d-sbsl-agmg -fate-filter-stereo3d-sbsl-agmg: CMD = framecrc -c:v pgmyuv -i $(SRC) -frames:v 5 -flags +bitexact -sws_flags +accurate_rnd+bitexact -vf scale,stereo3d=sbsl:agmg - -FATE_STEREO3D += fate-filter-stereo3d-sbsl-agmh -fate-filter-stereo3d-sbsl-agmh: CMD = framecrc -c:v pgmyuv -i $(SRC) -frames:v 5 -flags +bitexact -sws_flags +accurate_rnd+bitexact -vf scale,stereo3d=sbsl:agmh - -FATE_STEREO3D += fate-filter-stereo3d-sbsl-arbg -fate-filter-stereo3d-sbsl-arbg: CMD = framecrc -c:v pgmyuv -i $(SRC) -frames:v 5 -flags +bitexact -sws_flags +accurate_rnd+bitexact -vf scale,stereo3d=sbsl:arbg - -FATE_STEREO3D += fate-filter-stereo3d-sbsl-arcc -fate-filter-stereo3d-sbsl-arcc: CMD = framecrc -c:v pgmyuv -i $(SRC) -frames:v 5 -flags +bitexact -sws_flags +accurate_rnd+bitexact -vf scale,stereo3d=sbsl:arcc - -FATE_STEREO3D += fate-filter-stereo3d-sbsl-arcd -fate-filter-stereo3d-sbsl-arcd: CMD = framecrc -c:v pgmyuv -i $(SRC) -frames:v 5 -flags +bitexact -sws_flags +accurate_rnd+bitexact -vf scale,stereo3d=sbsl:arcd - -FATE_STEREO3D += fate-filter-stereo3d-sbsl-arcg -fate-filter-stereo3d-sbsl-arcg: CMD = framecrc -c:v pgmyuv -i $(SRC) -frames:v 5 -flags +bitexact -sws_flags +accurate_rnd+bitexact -vf scale,stereo3d=sbsl:arcg - -FATE_STEREO3D += fate-filter-stereo3d-sbsl-arch -fate-filter-stereo3d-sbsl-arch: CMD = framecrc -c:v pgmyuv -i $(SRC) -frames:v 5 -flags +bitexact -sws_flags +accurate_rnd+bitexact -vf scale,stereo3d=sbsl:arch - -FATE_STEREO3D += fate-filter-stereo3d-sbsl-argg -fate-filter-stereo3d-sbsl-argg: CMD = framecrc -c:v pgmyuv -i $(SRC) -frames:v 5 -flags +bitexact -sws_flags +accurate_rnd+bitexact -vf scale,stereo3d=sbsl:argg - -FATE_STEREO3D += fate-filter-stereo3d-sbsl-aybc -fate-filter-stereo3d-sbsl-aybc: CMD = framecrc -c:v pgmyuv -i $(SRC) -frames:v 5 -flags +bitexact -sws_flags +accurate_rnd+bitexact -vf scale,stereo3d=sbsl:aybc - -FATE_STEREO3D += fate-filter-stereo3d-sbsl-aybd -fate-filter-stereo3d-sbsl-aybd: CMD = framecrc -c:v pgmyuv -i $(SRC) -frames:v 5 -flags +bitexact -sws_flags +accurate_rnd+bitexact -vf scale,stereo3d=sbsl:aybd - -FATE_STEREO3D += fate-filter-stereo3d-sbsl-aybg -fate-filter-stereo3d-sbsl-aybg: CMD = framecrc -c:v pgmyuv -i $(SRC) -frames:v 5 -flags +bitexact -sws_flags +accurate_rnd+bitexact -vf scale,stereo3d=sbsl:aybg - -FATE_STEREO3D += fate-filter-stereo3d-sbsl-aybh -fate-filter-stereo3d-sbsl-aybh: CMD = framecrc -c:v pgmyuv -i $(SRC) -frames:v 5 -flags +bitexact -sws_flags +accurate_rnd+bitexact -vf scale,stereo3d=sbsl:aybh - -fate-filter-stereo3d: $(FATE_STEREO3D) -FATE_FILTER_VSYNTH-$(CONFIG_STEREO3D_FILTER) += $(FATE_STEREO3D) +FATE_STEREO3D := al-sbsl ar-abl abr-mr abr-ml sbsl-abl sbsl-abr sbsl-al sbsl-sbsr +FATE_STEREO3D := $(addprefix fate-filter-stereo3d-, $(FATE_STEREO3D)) +$(FATE_STEREO3D): CMD = framecrc -c:v pgmyuv -i $(SRC) -frames:v 5 -flags +bitexact -vf stereo3d=$(word 4, $(subst -, ,$(@))):$(word 5, $(subst -, ,$(@))) +FATE_STEREO3D-$(call FILTERDEMDEC, STEREO3D, IMAGE2, PGMYUV) += $(FATE_STEREO3D) + +FATE_STEREO3D_ANAGLYPH := agmc agmd agmg agmh arbg arcc arcd arcg arch argg \ + aybc aybd aybg aybh +FATE_STEREO3D_ANAGLYPH := $(addprefix fate-filter-stereo3d-sbsl-, $(FATE_STEREO3D_ANAGLYPH)) +$(FATE_STEREO3D_ANAGLYPH): CMD = framecrc -c:v pgmyuv -i $(SRC) -frames:v 5 -flags +bitexact -sws_flags +accurate_rnd+bitexact -vf scale,stereo3d=$(word 4, $(subst -, ,$(@))):$(word 5, $(subst -, ,$(@))) +FATE_STEREO3D-$(call FILTERDEMDEC, SCALE STEREO3D, IMAGE2, PGMYUV) += $(FATE_STEREO3D_ANAGLYPH) + +fate-filter-stereo3d: $(FATE_STEREO3D-yes) +FATE_FILTER_VSYNTH-yes += $(FATE_STEREO3D-yes) FATE_FILTER_VSYNTH-$(CONFIG_THUMBNAIL_FILTER) += fate-filter-thumbnail fate-filter-thumbnail: CMD = video_filter "scale,thumbnail=10" 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 From patchwork Wed May 18 12:26: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: 35816 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp305958pzb; Wed, 18 May 2022 05:27:03 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy/oUNzTPHLZxGyiYMOxgwWPTrn5xCrMwUM0vEXlmjEG3llgpPUeSvf5x9l9se9wQLkbsQa X-Received: by 2002:a05:6402:40c5:b0:427:af77:c10c with SMTP id z5-20020a05640240c500b00427af77c10cmr24878338edb.387.1652876823665; Wed, 18 May 2022 05:27:03 -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 qk11-20020a1709077f8b00b006e858ba51f7si2188912ejc.558.2022.05.18.05.27.03; Wed, 18 May 2022 05:27:03 -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=lHaV14HJ; 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 CA4EC68B4B9; Wed, 18 May 2022 15:26:45 +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 5125D68B49F for ; Wed, 18 May 2022 15:26:39 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=eMzBYR2O/cF8LQVAOa4ZBmcqv5FXy4WUnev0+92IWqgkt8clLHhEAXlAoPwITXciBRk/Ap4gVQ39fOSrMmISXcScGfey99ma/GIT4vKlmCQMKm6sOa5zQgP7cAZTvPBHdQMCsyCSqKYV09iyq0ANcAQo14uknUPRFk9DgFJ6PE6mCnkThzy4K/nLlyseAOMYvKPo4Rxbzr1DOIDo3OPKLQOkL/Jk364yb/OjBviBVyqU1kgFsIiO5drgKLOYeEqdhY1Lq746HRdsUnm8jcb9QJidzVo69UgcKETsy2YLleEEdJleuU+FwIi6wPoFqTJHh+fin79rf+YSLB8r4CVsJA== 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=7o7hi4cnQuHfrChp+NbYjrjakZD/8Ki8WnPojnKIpnw=; b=Y+KBtdfdnR3XJxtfGQvXhqwMOwa8jjv/xeDTnB+cS66QXwP7DJ6v0Gm+l6lB7mMeJGbyaFJN1JtAuxF4Rvf6yiUyAApF5qGEWmYZl567AdHJ4VtZVzUlwWhj/5Dai9jhUJZOqsCi4ognpKG/SURuWLYaAB+UxLk7wyC9/T/Kr59DQxK8cZXNSDXz70S4iktrtQmPeYpLdUcnlqRRXuHmwSG1Ly1MRX8MXm1JSt2OJofbSnBAhjYCRzK/e6Hwei7pWjtVsrRXWp+G8SRWfmmdHZ7EN4KXkIjuUduAxuQbf3m+dFiSZtnbqpHrnVovDhOJR989F+WzxGlsneBBnTKsnA== 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=7o7hi4cnQuHfrChp+NbYjrjakZD/8Ki8WnPojnKIpnw=; b=lHaV14HJG+wON5Aq6/LU5IUkHr8VbnwztMws88544um7/NDpKGHKVtIiZsuq2dsq//AZp20xisjvvqTyMyCagG28aChzjbI0UgJeRbQiG6+JazK/NMNLsw8UgiUVKcUpb/ikxuKdLPurBes4BoCykFJtWUxo1JA5FpRMd3W8/JIHUC/P8GMKmFZjFIgC6gG9R7wERGVCnV0LOk8WQ06ctD9dHpUIiBVyoYDEJwb/qzE0hue3KnimEjTM9RCItApi5dbPr459Wh76sjdYt4eeI1A2AoWd8FDcCL7ApVyAvS7hm6vYVkbX9ij80+GuvUkb3RbyoDJiEFDtxTtWUjVPgA== 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:26 +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:26 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 18 May 2022 14:26:13 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [X5SlpqXa66uck1CfqlwaBQK8C1xqBA7w] 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-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 61af1cab-52d6-4db0-608b-08da38c9a09d X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiTPyXc9TS18sCnS93pjpiOSsoLXwlQVm8FJxHRP7RM9cCYOwIalhbE9awkyaGfL+20GVFNlC2hDR5nVHZ0DMho9+LMV8Grs0uLHUV4HK8G51hgIDIXIf/UeS1nb2s9iG1T9+GHGELgd/0Pauj2HB+zgdKn4ZLSK90MoAKhzAR3uldSAO9MXjj5rkv9bTijT0FBQDVSgIOOzH5/0WnQeaXpeiOmhrK1Y73Z/4b0BCb1nH4zTs0jV6gB9dBkZHjCkDP9H06qgTfF13i3+yS/ybHk3lEOmtJG9qW2Ni6H2VBRQ9z+ofWB2pX104FqnnpYHItehBp3SL+PDOnsjftr/EQ8dn6S7oMuGAR8EzBwLwFdwEoo2xV4rmy45dMJrISwRIzb/+ttCy/vHYaRZ+yW6GAH8TGOGjp8Fp0Jpot5DqWQdxH1j4Cf4N6EWZTENfYgEMNRwhp2T5GR3g5jfQC4f6Rg7YzQJGacmae3BKC19lN1jJ0tInmN0ui4SYyjazsPtUOof7PSNBK0NVes7OkcYbRVj2CDRT4JswzK470mXus//tmS4h93L6dhoCvUp62t5kkqVjPywdoeREkFjlSP+I7NeP58T6Txdxr2Zv0TRwpQCJ73ymxBhneS8VI9o2XFXz90zHsrDfZv2mABONdSceADk5o5t6g/pJoC+IER1s3Q1cBR0FXEJ9PqLVuLVtWUShWGDdpz1dNSU5u0DU4shFzXmfohGvpK0nuMKJCNg2wqhHaEjAqPBSofgFGX9/2GPWo8= X-MS-TrafficTypeDiagnostic: AM6PR01MB5911:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: hkQfz45mP1OKYgIxT6NaxyhX3+WiMLdpkkx9B53EgOEFA/0r+37oa6KUMdg/zLm8LhfjnAo46Jwi5roFijR+OzhIYiYhx7MWrfmnX4MZKah4YFsZvNkWPMU86wH8hx4VCtYJOkVbCTo86Szy6p0EIsrrNnMKbwH6wSWlAa/15/7K/6GAK0/ZjJgu8MNk72JQrdqfPYB+JyRpHOJtHLgnX6jdaCwmGuDGQvXYFd/oZlPiRoeaPyj3uZcf+Ehx0aTRzk05Ktq5srInLfV80LMEOszgVDQQyRS3dLzBIimA4o15MGHfTkZ0O83kanNzHGcdRmCnyqvHcqjrZ+G1kyEufnihlyP+Uur+ZK/GyYG4hBm0l8hM4FPHNVSdLMBj9XKlZrg9I5r9bkygxyv9jtdmTgDdoqRC0QYLfKHyMrjuN8og00KMkPHJEy22AOZo9JBvo/ve7MMLEu46jxefILOhKlo93BG+bGU6qK+JlrCDOOCwuGz7S3i4sHi97z5S8OII0iBJ7PrW2rvTv25nD5t3N8fAw57yjsY7GHDcwgM7Pi/cUxyGWoDvNiiQ9OCz9OkeqIijpfcyxNzqozMfHq9xEA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: dIzf4zVHUzUNSugNXmnfG3Q87iATE/Kiu6HoJhsejkz4mfaBZeCduPteDnt4yYIpxKR90Fg3eYJQaIjxfXRD8biJRlbfT3UiM5IClqM/fiuzjRar+aIZSYtuytlvwvdv8jsKNfbHo1z9gCU2vLcPAT3yG0XPEyTTQnV9pBaZsKeogxv8Gj53PDyEluR9qm6BxmgWu5BOEbSmDvmSPlK+bJOn4kS0445p88pCKEQQRTIkOk7uMrGPaz1Meq2Wf8kNSwJ17ZFWnGqSv9HNBXdNVl8qhyw/HRF3t+sYYm9hx3wOhIRIiqP5ZXqnwF2t0efINNAWWVqIF8ynXPBlkNfHJJwn0eINO3zyFKFiXoiCG0Z8jaubtDjHeLMYlSJMAvQWBc5CgvUoeeTs2uImRPSFlL3OXF2iObvCa6pdqEm0FDGlpRivHCo0VUt0Cu7vbei3h3rvXp/4ZMHe/WgM4mU6ZdP26SIaOhSrf1si4q7D9Sn97RHnb/SyfGTv0bBQbs+Agyt7sTzQ5w6/FKnZet1+o4AAwWXfgi2HxUkYPTVIzGWfII9ww9ZTjmfhSx+K1Eesl1wfjhzWCVBuL06akEr+nOVNzYZuu0xUspZGsh6CG/2O3Q/Xs6FKP8wrdyZdUrITY8DF7JUzegmKcD6HvXDb4gVkt6FWxd88US0DF9GweQ2i7d0Bon4qQo1WcwqiNPeLsFijXgRI6BQIYMR99fSklZrknKERc/lFxlSEyD8y96WzxLnEwulD9oBcz5WXgfprRYKkYJdnNA8WV/Vxq2XAnFDevq5stEheFMK0M/nUM7FguFD5ftsTa0V3x9n2OQExfrjq6h122k1EnpiSIBNRGt6s9a4KOXeboZROySPO7RyylgYD6twYaOmE28NCcNBTbLguCbi4sRIcV3+/mINJnI2TWvIRUiBEiRpJmcNHQqgAxUFHHMxn4Fj/fhwozaHM9Xe8tdC00cX00IPvMqUZ67NDqNbpklLhLAmCR65jZu6hUmgqF5ICXNNGQndQQc+20NCk4R8hmL4h66suoBA0jzZsZXSJ7Nfhx4R26gY3YJICXQXmsuYOFGpmZr85txzk+MWSuG913WlaWvMTedufATM9sp7dsgNTD6xN9rLLUKWgMkOEguSlX6UPjiW9SMdTK+kkZ5tbO+0qLgHCxVBSj8wbhHIcasOhKNlY9dxNQz3nW8yJLN21Lzdq3/VuOiC2RYqiSq8HdveblRZOVCPUtlHeMrI+K0qpdyNw9hqZKEHXiMsMAbpMV+SIOAUhjRX5PO6DjJy3RJ7KhXp7gGg7iB1kjGnL6ZDHDC6XQ0jMjO64cNL4Hz9JIz4YfSm7fEq4OMKdy3E1docC2y0n/fkbAWxq5EgS51bYhvY+uM84i+0rxuand3UVW3ivCX8HgjJ5RlwZoVSFxOgwmIFj9K4JCKrZm2c7HnWaUWPOus1RTiaNkHlp0uhqUU/7T4ZkVWf6nNbvmCWmzCPog3xOMH5Lnw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 61af1cab-52d6-4db0-608b-08da38c9a09d 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:26.3565 (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 5/6] fate/filter-video: Avoid duplication for fate-filter-overlay 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: 2mbWBIuyIhmO Also add a fate-filter-overlays target containing all these tests and fix the requirements of the tests; furthermore, remove unnecessary scale filters from filter-overlay-rgba?_rgba. Signed-off-by: Andreas Rheinhardt --- tests/fate/filter-video.mak | 72 +++++++++++++------------------------ 1 file changed, 25 insertions(+), 47 deletions(-) diff --git a/tests/fate/filter-video.mak b/tests/fate/filter-video.mak index a169d408a1..80c6a34e6a 100644 --- a/tests/fate/filter-video.mak +++ b/tests/fate/filter-video.mak @@ -214,62 +214,44 @@ FATE_FILTER_VSYNTH-$(CONFIG_VSTACK_FILTER) += fate-filter-vstack fate-filter-vstack: tests/data/filtergraphs/vstack fate-filter-vstack: CMD = framecrc -c:v pgmyuv -i $(SRC) -c:v pgmyuv -i $(SRC) -filter_complex_script $(TARGET_PATH)/tests/data/filtergraphs/vstack -FATE_FILTER_VSYNTH-$(CONFIG_OVERLAY_FILTER) += fate-filter-overlay -fate-filter-overlay: tests/data/filtergraphs/overlay -fate-filter-overlay: CMD = framecrc -c:v pgmyuv -i $(SRC) -c:v pgmyuv -i $(SRC) -filter_complex_script $(TARGET_PATH)/tests/data/filtergraphs/overlay - -FATE_FILTER_VSYNTH-$(call ALLYES, SPLIT_FILTER SCALE_FILTER PAD_FILTER OVERLAY_FILTER) += fate-filter-overlay_rgb -fate-filter-overlay_rgb: tests/data/filtergraphs/overlay_rgb -fate-filter-overlay_rgb: CMD = framecrc -auto_conversion_filters -c:v pgmyuv -i $(SRC) -filter_complex_script $(TARGET_PATH)/tests/data/filtergraphs/overlay_rgb - -FATE_FILTER_VSYNTH-$(call ALLYES, SPLIT_FILTER SCALE_FILTER PAD_FILTER OVERLAY_FILTER) += fate-filter-overlay_yuv420 -fate-filter-overlay_yuv420: tests/data/filtergraphs/overlay_yuv420 -fate-filter-overlay_yuv420: CMD = framecrc -c:v pgmyuv -i $(SRC) -filter_complex_script $(TARGET_PATH)/tests/data/filtergraphs/overlay_yuv420 - -FATE_FILTER_VSYNTH-$(call ALLYES, SPLIT_FILTER SCALE_FILTER PAD_FILTER OVERLAY_FILTER) += fate-filter-overlay_yuv420p10 -fate-filter-overlay_yuv420p10: tests/data/filtergraphs/overlay_yuv420p10 -fate-filter-overlay_yuv420p10: CMD = framecrc -auto_conversion_filters -c:v pgmyuv -i $(SRC) -filter_complex_script $(TARGET_PATH)/tests/data/filtergraphs/overlay_yuv420p10 -pix_fmt yuv420p10le -frames:v 3 - -FATE_FILTER_VSYNTH-$(call ALLYES, SPLIT_FILTER SCALE_FILTER PAD_FILTER OVERLAY_FILTER) += fate-filter-overlay_nv12 -fate-filter-overlay_nv12: tests/data/filtergraphs/overlay_nv12 -fate-filter-overlay_nv12: CMD = framecrc -auto_conversion_filters -c:v pgmyuv -i $(SRC) -filter_complex_script $(TARGET_PATH)/tests/data/filtergraphs/overlay_nv12 -fate-filter-overlay_nv12: REF = $(SRC_PATH)/tests/ref/fate/filter-overlay_yuv420 - -FATE_FILTER_VSYNTH-$(call ALLYES, SPLIT_FILTER SCALE_FILTER PAD_FILTER OVERLAY_FILTER) += fate-filter-overlay_nv21 -fate-filter-overlay_nv21: tests/data/filtergraphs/overlay_nv21 -fate-filter-overlay_nv21: CMD = framecrc -auto_conversion_filters -c:v pgmyuv -i $(SRC) -filter_complex_script $(TARGET_PATH)/tests/data/filtergraphs/overlay_nv21 -fate-filter-overlay_nv21: REF = $(SRC_PATH)/tests/ref/fate/filter-overlay_yuv420 - -FATE_FILTER_VSYNTH-$(call ALLYES, SPLIT_FILTER SCALE_FILTER PAD_FILTER OVERLAY_FILTER) += fate-filter-overlay_yuv422 -fate-filter-overlay_yuv422: tests/data/filtergraphs/overlay_yuv422 -fate-filter-overlay_yuv422: CMD = framecrc -auto_conversion_filters -c:v pgmyuv -i $(SRC) -filter_complex_script $(TARGET_PATH)/tests/data/filtergraphs/overlay_yuv422 - -FATE_FILTER_VSYNTH-$(call ALLYES, SPLIT_FILTER SCALE_FILTER PAD_FILTER OVERLAY_FILTER) += fate-filter-overlay_yuv422p10 -fate-filter-overlay_yuv422p10: tests/data/filtergraphs/overlay_yuv422p10 -fate-filter-overlay_yuv422p10: CMD = framecrc -auto_conversion_filters -c:v pgmyuv -i $(SRC) -filter_complex_script $(TARGET_PATH)/tests/data/filtergraphs/overlay_yuv422p10 -pix_fmt yuv422p10le -frames:v 3 - -FATE_FILTER_VSYNTH-$(call ALLYES, SPLIT_FILTER SCALE_FILTER PAD_FILTER OVERLAY_FILTER) += fate-filter-overlay_yuv444 -fate-filter-overlay_yuv444: tests/data/filtergraphs/overlay_yuv444 -fate-filter-overlay_yuv444: CMD = framecrc -auto_conversion_filters -c:v pgmyuv -i $(SRC) -filter_complex_script $(TARGET_PATH)/tests/data/filtergraphs/overlay_yuv444 - -FATE_FILTER_OVERLAY_ALPHA += fate-filter-overlay_yuv420_yuva420 fate-filter-overlay_yuv422_yuva422 fate-filter-overlay_yuv444_yuva444 fate-filter-overlay_rgb_rgba fate-filter-overlay_gbrp_gbrap -FATE_FILTER_OVERLAY_ALPHA += fate-filter-overlay_yuva420_yuva420 fate-filter-overlay_yuva422_yuva422 fate-filter-overlay_yuva444_yuva444 fate-filter-overlay_rgba_rgba fate-filter-overlay_gbrap_gbrap +FATE_FILTER_OVERLAY-$(call FILTERDEMDEC, SCALE OVERLAY, IMAGE2, PGMYUV) += fate-filter-overlay +fate-filter-overlay: CMD = framecrc -c:v pgmyuv -i $(SRC) -c:v pgmyuv -i $(SRC) -filter_complex_script $(FILTERGRAPH) + +FATE_FILTER_OVERLAY-$(call FILTERDEMDEC, SPLIT SCALE PAD OVERLAY, IMAGE2, PGMYUV) += $(addprefix fate-filter-overlay_, rgb yuv420 yuv420p10 nv12 nv21 yuv422 yuv422p10 yuv444) +fate-filter-overlay_%: CMD = framecrc -auto_conversion_filters -c:v pgmyuv -i $(SRC) -filter_complex_script $(FILTERGRAPH) +fate-filter-overlay_yuv420: CMD = framecrc -c:v pgmyuv -i $(SRC) -filter_complex_script $(FILTERGRAPH) +fate-filter-overlay_%p10: CMD = framecrc -auto_conversion_filters -c:v pgmyuv -i $(SRC) -filter_complex_script $(FILTERGRAPH) -pix_fmt $(@:fate-filter-overlay_%=%)le -frames:v 3 + +$(addprefix fate-filter-overlay_, nv12 nv21): REF = $(SRC_PATH)/tests/ref/fate/filter-overlay_yuv420 + +FATE_FILTER_OVERLAY_SAMPLES-$(call FILTERDEMDEC, SCALE OVERLAY, MATROSKA, H264 DVDSUB) += fate-filter-overlay-dvdsub-2397 +fate-filter-overlay-dvdsub-2397: CMD = framecrc -auto_conversion_filters -flags bitexact -i $(TARGET_SAMPLES)/filter/242_4.mkv -filter_complex_script $(FILTERGRAPH) -c:a copy + +FATE_FILTER_OVERLAY := $(FATE_FILTER_OVERLAY-yes) $(FATE_FILTER_OVERLAY_SAMPLES-yes) +$(FATE_FILTER_OVERLAY): FILTERGRAPH = $(TARGET_PATH)/tests/data/filtergraphs/$(@:fate-filter-%=%) +$(FATE_FILTER_OVERLAY): fate-filter-%: tests/data/filtergraphs/% +FATE_FILTER_VSYNTH-yes += $(FATE_FILTER_OVERLAY-yes) + +FATE_FILTER_OVERLAY_ALPHA-$(call FILTERDEMDEC, COLOR FORMAT OVERLAY SCALE, IMAGE_PNG_PIPE, PNG) := yuv420_yuva420 yuv422_yuva422 yuv444_yuva444 gbrp_gbrap yuva420_yuva420 yuva422_yuva422 yuva444_yuva444 gbrap_gbrap +FATE_FILTER_OVERLAY_ALPHA-$(call FILTERDEMDEC, COLOR FORMAT OVERLAY, IMAGE_PNG_PIPE, PNG) += rgb_rgba rgba_rgba +FATE_FILTER_OVERLAY_ALPHA := $(addprefix fate-filter-overlay_, $(FATE_FILTER_OVERLAY_ALPHA-yes)) $(FATE_FILTER_OVERLAY_ALPHA): SRC = $(TARGET_SAMPLES)/png1/lena-rgba.png $(FATE_FILTER_OVERLAY_ALPHA): CMD = framecrc -i $(SRC) -sws_flags +accurate_rnd+bitexact -vf $(FILTER) -frames:v 1 fate-filter-overlay_yuv420_yuva420: FILTER = "scale,format=yuva420p[over];color=black:128x128,format=yuv420p[main];[main][over]overlay=format=yuv420" fate-filter-overlay_yuv422_yuva422: FILTER = "scale,format=yuva422p[over];color=black:128x128,format=yuv422p[main];[main][over]overlay=format=yuv422" fate-filter-overlay_yuv444_yuva444: FILTER = "scale,format=yuva444p[over];color=black:128x128,format=yuv444p[main];[main][over]overlay=format=yuv444" -fate-filter-overlay_rgb_rgba: FILTER = "scale,format=rgba[over];color=black:128x128,format=rgb24[main];[main][over]overlay=format=rgb" +fate-filter-overlay_rgb_rgba: FILTER = "format=rgba[over];color=black:128x128,format=rgb24[main];[main][over]overlay=format=rgb" fate-filter-overlay_gbrp_gbrap: FILTER = "scale,format=gbrap[over];color=black:128x128,format=gbrp[main];[main][over]overlay=format=gbrp" fate-filter-overlay_yuva420_yuva420: FILTER = "scale,format=yuva420p[over];color=black:128x128,format=yuva420p[main];[main][over]overlay=format=yuv420" fate-filter-overlay_yuva422_yuva422: FILTER = "scale,format=yuva422p[over];color=black:128x128,format=yuva422p[main];[main][over]overlay=format=yuv422" fate-filter-overlay_yuva444_yuva444: FILTER = "scale,format=yuva444p[over];color=black:128x128,format=yuva444p[main];[main][over]overlay=format=yuv444" -fate-filter-overlay_rgba_rgba: FILTER = "scale,format=rgba[over];color=black:128x128,format=rgba[main];[main][over]overlay=format=rgb" +fate-filter-overlay_rgba_rgba: FILTER = "format=rgba[over];color=black:128x128,format=rgba[main];[main][over]overlay=format=rgb" fate-filter-overlay_gbrap_gbrap: FILTER = "scale,format=gbrap[over];color=black:128x128,format=gbrap[main];[main][over]overlay=format=gbrp" -FATE_FILTER_SAMPLES-$(call ALLYES, PNG_DECODER APNG_DEMUXER FORMAT_FILTER COLOR_FILTER OVERLAY_FILTER) += $(FATE_FILTER_OVERLAY_ALPHA) +FATE_FILTER_SAMPLES-yes += $(FATE_FILTER_OVERLAY_SAMPLES-yes) $(FATE_FILTER_OVERLAY_ALPHA) +fate-filter-overlays: $(FATE_FILTER_OVERLAY) $(FATE_FILTER_OVERLAY_ALPHA) FATE_FILTER_VSYNTH-$(CONFIG_PHASE_FILTER) += fate-filter-phase fate-filter-phase: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf phase @@ -355,10 +337,6 @@ FATE_FILTER_SAMPLES-$(call ALLYES, SMJPEG_DEMUXER MJPEG_DECODER PERMS_FILTER HQD fate-filter-hqdn3d-sample: tests/data/filtergraphs/hqdn3d fate-filter-hqdn3d-sample: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/smjpeg/scenwin.mjpg -filter_complex_script $(TARGET_PATH)/tests/data/filtergraphs/hqdn3d -an -FATE_FILTER_SAMPLES-$(call ALLYES, MATROSKA_DEMUXER OVERLAY_FILTER H264_DECODER DVDSUB_DECODER) += fate-filter-overlay-dvdsub-2397 -fate-filter-overlay-dvdsub-2397: tests/data/filtergraphs/overlay-dvdsub-2397 -fate-filter-overlay-dvdsub-2397: CMD = framecrc -auto_conversion_filters -flags bitexact -i $(TARGET_SAMPLES)/filter/242_4.mkv -filter_complex_script $(TARGET_PATH)/tests/data/filtergraphs/overlay-dvdsub-2397 -c:a copy - FATE_FILTER_EPX-$(call ALLYES, IMAGE2_DEMUXER PNG_DECODER EPX_FILTER) = fate-filter-ep2x fate-filter-ep3x FATE_FILTER_SAMPLES-yes += $(FATE_FILTER_EPX-yes) fate-filter-ep2x: CMD = framecrc -i $(TARGET_SAMPLES)/filter/pixelart%d.png -vf scale,format=rgb32,epx=2,scale,format=bgra From patchwork Wed May 18 12:26:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35817 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp306042pzb; Wed, 18 May 2022 05:27:14 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw0RpBpofAG5Jq0MMFe0QZsUt9IwmJr2QmA8PpdTbZpwbvp7r6RaJU4YZknHUjflUApT+LB X-Received: by 2002:a05:6402:400f:b0:428:325a:b6bb with SMTP id d15-20020a056402400f00b00428325ab6bbmr24733903eda.145.1652876834449; Wed, 18 May 2022 05:27:14 -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 dt8-20020a170906b78800b006e886d5db42si2271327ejb.420.2022.05.18.05.27.14; Wed, 18 May 2022 05:27:14 -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=D6CQLPxF; 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 ED0FA68B4CC; Wed, 18 May 2022 15:26:46 +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 921EE68B49F for ; Wed, 18 May 2022 15:26:44 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LhZ2hQYYBQMfuJjftCx+AZeGUZvvlFaZ9bGY2nOfK8ncuY9RPP0rJwSOq7N2P8azO4Smcs4IycCyEgyfW1ktZ8a8A1y/ZWia1rTTcTiY/y3zPeaDfFrDq0HPK0l+Gf/lvM8WEEacns7rEx3bl+dCqrOXkw3LxfTI7Chh6QBbOAaRgQED79PdccBViBrid6nxQhkwaTqE7ikU3j0ATpBjgHySo1nPvrMXN36v9Z/gGhV7GerQ01wsyvg8K02QU9fBFwAAnyx9gqH83sey36Dcync1ESH5Z8WNXqoy2x73bLM+dDujWK6gMT55zPMyMgz9xZeu87U2WPp/MwW8rCJVrQ== 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=h7bC6yYTucpSC2Qfa5SDT8Hc8CIClLvHBnQmd7WJuLQ=; b=Q4MaCxp6juoieekRyXIs+TsbL63rg4XiqU3LYZGT6+Av2FCN3jovKQfe42VZk6MiZzB+2mI9PosrJ9MLtPb8ugKvxG7dnbrsd/DblvMM+/3YCGPTW63y1qb6IeNiKj3ToUDNsboiq1j82JNlOPdqKQkNWGi9j/RKSY6FY2C83B629XIJE0iKwEAXb40vcBM1vSwmb5zrIlivph/H9UFemSbp3n3vcmz0dGTn0Ppo+5cCBta6AAw5k4WcNQsKhrTFuecu7CbG57m2e/m7tBDy+4esOu765tRtv0A2DPzUTHIx8aN0glGXcr1mPSLvMlgw6zPeatPOzDghRr6VHMa2Iw== 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=h7bC6yYTucpSC2Qfa5SDT8Hc8CIClLvHBnQmd7WJuLQ=; b=D6CQLPxFre1/mBxkXW9idJNaM0m0jZwg0ndg/9ZfOuWvfEVUuT+b4wuua1JxvlVTd0VNcnLCn2ov5X1pYNbaUQ6tO3ylHoVc4PKanCI7zg0NGbplD2Y6eDpNz8MXcSnzcIIfKfbubS19lo0EBasWlXWJS2ELgeK1aaezf3gWAr9J9moCvy8VLSj9t828mq9ntuX38pTqu1m9UwumET1iBo5/xWId3jmsTgRfWkNKWkc07gHY/iL+csXNJXiAO8vghRmS80+OwtwLX9G0JapjB/3Xoz/ThZFfeX2+DoaPMC3Eh2MM+qA+a0jboUNtX0eTkIFSEqYwoa1/vfV1OjOPNQ== 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:28 +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:28 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 18 May 2022 14:26:14 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [Ep9UfnDdtauL5bOapKodnTxcFa52gKi/] 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-5-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0acbe3c6-d9a8-4f9e-dbe5-08da38c9a17f X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/ULHdV476K/quBXoO1fU8X38o5yF8ucDIeubzuCk/sjW38Z+sgxVYU3z9oyP1RdksstH3J693IwKtiCFwQ4u+mvjNS4zvWnvq8/QUpYtEQGs1BhnxrcpalMO7yMmfG8Ca6ksdlYbU/VwCmC/N/BEsdbiiDGHvlM2mM6R2K665QzgPcVWFE/CNXu2Ua9ICh/0CrzAqhZl41KH0vfM+1upgm9FSo90hdUYSeWuDCVvUBm8NEZQriQUcflgquTKKraEePoLdXeOg4D+F8Jj5NpkstiKceZ3pMNJaF+OqVFsLSkb6IFq7N22CkDmB7WWR2ijUkqt7eJwhZPWR5l2eqXCaTm+J4bGZWga/2DS/DUqxraBkWmfi5VdzTh4Lk/obn+6HE05/K+ohL+f3Qcq9lI/LZSagsK6iqcln1FzYLjILeRb8kh+RfQ5/yrZkO6LhG3P8rqWSC633hJ89+x0Livwefy1KB6mpKptfJ7MrfEIjkOvnIMOD2XTiYKzhuj2tgUGRpBH0yoQbxxevVYeIE5duBXGZ+emHW2Dpn0fBj1g4WGA6aDu0G763mDN8L4GkNvKk4dYEiQ6zCFfMyzOAE1r0tqwH7WaEFQiwzf2bYP91WCrKuo+al2g5hSvma2aJuuXbk29Gpks+U1Z4zqAHWhrnprgvRi8L3VdcwtdLByX6vRC4sOaOTomJz3G9zWEXXTv/U3aIy9t2S5zKQ== X-MS-TrafficTypeDiagnostic: AM6PR01MB5911:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: BKlGoHLbs/rp+ZdwZ2VyrWwJi5BqnSlVGGqhY7Ou1k8592qYAcgLrhgml3XnA1gb04MYIeAkviLnZjfUXBkuqdAVlnY0fxHHFwRHmZ5cj4h8DhkGGs4ZNGXWlb6bXcOg44rbB0aEKNYzb3pinWuUABg970iU+8UxO6OA33uoI/xoTbdGeZ33GjumNf7F9jB39fEuZvHxiiElZP6PT+aeDNHHCdvAu0m/QjBxnii5AbNjwEP685Jbcq79q6Cp6LD7EiMgxW7xCMcu45ZULGvMjgXLNA3LAmSefpivECuBEXoXfom4XF5OlvhGZ6Z8UcKtku4jvq0suPYCPNNSDOPOygu+bVc48ezNvzJPD4G35PCtuj3vVzJEEerxoWgJi5XOzA7qBuGMbcU7kEO3IwXT+8cTm6lWxApUFRwtJPZz6ZlIpqw77qfjMdrtWYfFEuZIZAwqRq8arxQUhZBoSPVrS75c01G2PzTUl5TQXiE+qtdigF8PiUgV1d4njAwyFAlXVbDuOcTWLdvuU+ZTftrFa05g0Qx02sW97A6aRKwup+NGm1zlVKzCocGO1LdlpKgYqly5e9ClP6UBqH4tswvQDw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: EEkFa58PO1bansLtXbdjWvDuYY/haMAz3N2xqxvHDGYebqpgqRLMh+q43WbMS53ScRifTbSfmf9bMm9CcLokynOP8AXghmIrHDM6T3rFJxflEME+PHRgm4vU+mxfstwyVmkvDkdIbRhIHj4Cgb+E9i//XO3fyTUCaTV4DpV5XdqklWUdekDH+mgtd4a2aF+cCqGTQisYl9R8k7vZX/MJg7oCEMKJhaR+/wbygd2EEOjMGJd5RAMAr8X0HtIQbJ071dotvgXBImvXIXHUtHOyCx5m/1wFuGb0sF7UL2rPWKNbulF2p7lmYgIdJiMuoL8dzimWmuBD04CeuKObPXs65a79Y2C1hPgt+4hJ51yYfLvC5uiFMIfz/QQsV36QSRVr223I0Fw69d6Au/a00dZlF/h68PRulXTAOba7fnU1ejmDiSW7/eAGrwYGqawWAZoOfjJ/zoH6sg/ck7h6u14aDrZuqYkI0w+f5x31FYfUTqvMVVgXQQ4WMkkYsFh1JEoKqMFSvZgqKyR7vCrn9t9lIeu2+W0CYspjrr+ni9kLjzOruja6yoyW6iKFNYRarblA9o6al/HY5kntEbbMuQ6bThYtZF5gyVnjIcx/jh+KxYq84iUrHto29/mr6AzCeZhzRELKPPcClOvZvFekdfthmg+b/4AFEn/juxPD2qDfHGom4j7rSRWkg6hcgXWT3PBT87BrPFHTn304jXBro2qu0lJRys829ywalpbRciiUyCsXVsrl8JX4OIRWC5ya4CWMjXAS8XbP9zknF4FMFP5pakAKkX/fqgWmdtFlbZr6gryxF1l4LE8Tyqk0nf3kHZCkbJnagw66NSWbXWkIfnbAZZqEgMLz1pY6JcXGpY21Fg5Bvl7QjMAH4ki/eqbQ5+mebQrssgk5ox6DXdmfd+ExiA5wqvGtWSEH6GVQ/fMfsBT9X6Xv1raY+St1ZLU9CVZou7mZjSwWY/FUquknPC3g5JWNI7AnpOCcIjecBeQMtnTDDwcDO+30RK2szj6CjoKVht+amchWK5LQ1v9Rm/8vOotqbO26yV4bX4nEGb5YkCpi9Rm/cKACeexfUhMSeoHiv6khaS1MPM0rZR9yEZmu+V3QH9Keajo8ypho6Mv9C2bQTSGIsQzdsMdh/V+p8GXB4GHl2/ZhdFwmhXeLaVPGWGajnFPKfAqxbl7vNzb+I7axGxShOf/ug7eN+UG6lAGa18SvI6QWrQCHTMJ7GFAYMN1hBy22c2e22R0GSNcqGf/qmzKQ7J5Q5nHGnGU7Iq7ledyL6kxFiFA4AqSvAXnJR8YCsupS4U6qrrozFxdXM84X8/AZB6E3eH8l4JQ/PuVsvzlD1I9uvjAHs3P/cOfkUtdju/a6E0VT+LHWF+7kE2IiTKT32TN1x/RAz5tP3D4bVNXuO5ELO89/b4umpQLgTdImhT+dAU4svDubwoY1tD33TwCiqyv4AZA/76CIZ/Cn+j4Kz7Af3dBstRr9checWg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0acbe3c6-d9a8-4f9e-dbe5-08da38c9a17f 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:28.2782 (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 6/6] fate/filter-video: Fix requirements of 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: iDIIX9k7915x Signed-off-by: Andreas Rheinhardt --- tests/Makefile | 1 + tests/fate/filter-video.mak | 376 +++++++++++++++++------------------- 2 files changed, 179 insertions(+), 198 deletions(-) diff --git a/tests/Makefile b/tests/Makefile index 7622e5c984..5677364471 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -179,6 +179,7 @@ include $(SRC_PATH)/tests/fate/ffprobe.mak include $(SRC_PATH)/tests/fate/fft.mak include $(SRC_PATH)/tests/fate/fifo-muxer.mak include $(SRC_PATH)/tests/fate/filter-audio.mak +# Must be included after vcodec.mak include $(SRC_PATH)/tests/fate/filter-video.mak include $(SRC_PATH)/tests/fate/fits.mak include $(SRC_PATH)/tests/fate/flac.mak diff --git a/tests/fate/filter-video.mak b/tests/fate/filter-video.mak index 80c6a34e6a..97831bdf39 100644 --- a/tests/fate/filter-video.mak +++ b/tests/fate/filter-video.mak @@ -1,26 +1,25 @@ -FATE_FILTER_SAMPLES-$(call ALLYES, SMJPEG_DEMUXER MJPEG_DECODER PERMS_FILTER OWDENOISE_FILTER) += fate-filter-owdenoise-sample +# Contains the requirements added implicitly if CMD is video_filter. +VIDEO_FILTER = $(call ALLYES, $(1:%=%_FILTER) $(2) FILE_PROTOCOL IMAGE2_DEMUXER PGMYUV_DECODER RAWVIDEO_ENCODER NUT_MUXER MD5_PROTOCOL) + +FATE_FILTER_SAMPLES-$(call FILTERDEMDECENCMUX, PERMS OWDENOISE TRIM SCALE, SMJPEG, MJPEG, RAWVIDEO, RAWVIDEO, PIPE_PROTOCOL) += fate-filter-owdenoise-sample fate-filter-owdenoise-sample: CMD = ffmpeg -auto_conversion_filters -idct simple -i $(TARGET_SAMPLES)/smjpeg/scenwin.mjpg -vf "trim=duration=0.5,perms=random,owdenoise=10:20:20:enable=not(between(t\,0.2\,1.2))" -an -f rawvideo - fate-filter-owdenoise-sample: REF = $(SAMPLES)/filter-reference/owdenoise-scenwin.raw fate-filter-owdenoise-sample: CMP_TARGET = 1 fate-filter-owdenoise-sample: FUZZ = 3539 fate-filter-owdenoise-sample: CMP = oneoff -FATE_FILTER_SAMPLES-$(call ALLYES, PERMS_FILTER DELOGO_FILTER RM_DEMUXER RV30_DECODER) += fate-filter-delogo +FATE_FILTER_SAMPLES-$(call FILTERDEMDEC, PERMS DELOGO, RM, RV30) += fate-filter-delogo fate-filter-delogo: CMD = framecrc -i $(TARGET_SAMPLES)/real/rv30.rm -vf perms=random,delogo=show=0:x=290:y=25:w=26:h=16 -an -FATE_YADIF += fate-filter-yadif-mode0 +FATE_YADIF-$(call FILTERDEMDEC, YADIF, MPEGTS, MPEG2VIDEO) += fate-filter-yadif-mode0 fate-filter-yadif-mode1 fate-filter-yadif-mode0: CMD = framecrc -flags bitexact -idct simple -i $(TARGET_SAMPLES)/mpeg2/mpeg2_field_encoding.ts -frames:v 30 -vf yadif=0 - -FATE_YADIF += fate-filter-yadif-mode1 fate-filter-yadif-mode1: CMD = framecrc -flags bitexact -idct simple -i $(TARGET_SAMPLES)/mpeg2/mpeg2_field_encoding.ts -frames:v 59 -vf yadif=1 -FATE_YADIF += fate-filter-yadif10 +FATE_YADIF-$(call FILTERDEMDEC, YADIF SCALE, MPEGTS, MPEG2VIDEO) += fate-filter-yadif10 fate-filter-yadif16 fate-filter-yadif10: CMD = framecrc -flags bitexact -idct simple -i $(TARGET_SAMPLES)/mpeg2/mpeg2_field_encoding.ts -flags bitexact -pix_fmt yuv420p10le -frames:v 30 -vf yadif=0,scale - -FATE_YADIF += fate-filter-yadif16 fate-filter-yadif16: CMD = framecrc -flags bitexact -idct simple -i $(TARGET_SAMPLES)/mpeg2/mpeg2_field_encoding.ts -flags bitexact -pix_fmt yuv420p16le -frames:v 30 -vf yadif=0,scale -FATE_FILTER_SAMPLES-$(call FILTERDEMDEC, YADIF, MPEGTS, MPEG2VIDEO) += $(FATE_YADIF) +FATE_FILTER_SAMPLES-yes += $(FATE_YADIF-yes) FATE_W3FDIF += fate-filter-w3fdif-simple fate-filter-w3fdif-simple: CMD = framecrc -flags bitexact -idct simple -i $(TARGET_SAMPLES)/mpeg2/mpeg2_field_encoding.ts -frames:v 30 -vf w3fdif=0 @@ -36,22 +35,20 @@ fate-filter-mcdeint-fast: CMD = framecrc -flags bitexact -idct simple -i $(TARGE FATE_MCDEINT += fate-filter-mcdeint-medium fate-filter-mcdeint-medium: CMD = framecrc -flags bitexact -idct simple -i $(TARGET_SAMPLES)/mpeg2/mpeg2_field_encoding.ts -frames:v 30 -vf mcdeint=mode=medium -FATE_FILTER_SAMPLES-$(call ALLYES, MCDEINT_FILTER, MPEGTS_DEMUXER, MPEG2VIDEO_DECODER SNOW_ENCODER) += $(FATE_MCDEINT) +FATE_FILTER_SAMPLES-$(call FILTERDEMDEC, MCDEINT, MPEGTS, MPEG2VIDEO, SNOW_ENCODER) += $(FATE_MCDEINT) -FATE_FILTER_SAMPLES-$(call ALLYES, CODECVIEW_FILTER RM_DEMUXER RV40_DECODER) += fate-filter-codecview-mvs +FATE_FILTER_SAMPLES-$(call FILTERDEMDEC, CODECVIEW, RM, RV40) += fate-filter-codecview-mvs fate-filter-codecview-mvs: CMD = framecrc -flags2 +export_mvs -i $(TARGET_SAMPLES)/real/spygames-2MB.rmvb -vf codecview=mv=pf+bf+bb -frames:v 60 -an -FATE_FILTER_SAMPLES-$(call ALLYES, SHOWPALETTE_FILTER FLIC_DEMUXER FLIC_DECODER) += fate-filter-showpalette +FATE_FILTER_SAMPLES-$(call FILTERDEMDEC, SHOWPALETTE SCALE, FLIC, FLIC) += fate-filter-showpalette fate-filter-showpalette: CMD = framecrc -i $(TARGET_SAMPLES)/fli/fli-engines.fli -vf showpalette=3,scale -pix_fmt bgra -FATE_FILTER_PALETTEGEN += fate-filter-palettegen-1 +FATE_FILTER_PALETTEGEN-$(call FILTERDEMDEC, SCALE PALETTEGEN, MATROSKA, H264) += fate-filter-palettegen-1 fate-filter-palettegen-2 fate-filter-palettegen-1: CMD = framecrc -i $(TARGET_SAMPLES)/filter/anim.mkv -vf scale,palettegen,scale -pix_fmt bgra - -FATE_FILTER_PALETTEGEN += fate-filter-palettegen-2 fate-filter-palettegen-2: CMD = framecrc -i $(TARGET_SAMPLES)/filter/anim.mkv -vf scale,palettegen=max_colors=128:reserve_transparent=0:stats_mode=diff,scale -pix_fmt bgra -fate-filter-palettegen: $(FATE_FILTER_PALETTEGEN) -FATE_FILTER_SAMPLES-$(call ALLYES, PALETTEGEN_FILTER MATROSKA_DEMUXER H264_DECODER) += $(FATE_FILTER_PALETTEGEN) +fate-filter-palettegen: $(FATE_FILTER_PALETTEGEN-yes) +FATE_FILTER_SAMPLES-yes += $(FATE_FILTER_PALETTEGEN-yes) FATE_FILTER_PALETTEUSE += fate-filter-paletteuse-nodither fate-filter-paletteuse-nodither: CMD = framecrc -auto_conversion_filters -i $(TARGET_SAMPLES)/filter/anim.mkv -i $(TARGET_SAMPLES)/filter/anim-palette.png -lavfi paletteuse=none -pix_fmt bgra @@ -65,152 +62,142 @@ fate-filter-paletteuse-bayer0: CMD = framecrc -auto_conversion_filters -i $(TARG FATE_FILTER_PALETTEUSE += fate-filter-paletteuse-sierra2_4a fate-filter-paletteuse-sierra2_4a: CMD = framecrc -auto_conversion_filters -i $(TARGET_SAMPLES)/filter/anim.mkv -i $(TARGET_SAMPLES)/filter/anim-palette.png -lavfi paletteuse=sierra2_4a:diff_mode=rectangle -pix_fmt bgra -fate-filter-paletteuse: $(FATE_FILTER_PALETTEUSE) -FATE_FILTER_SAMPLES-$(call ALLYES, PALETTEUSE_FILTER MATROSKA_DEMUXER H264_DECODER IMAGE2_DEMUXER PNG_DECODER) += $(FATE_FILTER_PALETTEUSE) +FATE_FILTER_PALETTEUSE-$(call FILTERDEMDEC, PALETTEUSE SCALE, MATROSKA IMAGE2, H264 PNG) += $(FATE_FILTER_PALETTEUSE) + +fate-filter-paletteuse: $(FATE_FILTER_PALETTEUSE-yes) +FATE_FILTER_SAMPLES-yes += $(FATE_FILTER_PALETTEUSE-yes) -FATE_FILTER-$(call ALLYES, AVDEVICE LIFE_FILTER) += fate-filter-lavd-life +FATE_FILTER-$(call FILTERFRAMECRC, LIFE, LAVFI_INDEV) += fate-filter-lavd-life fate-filter-lavd-life: CMD = framecrc -f lavfi -i life=s=40x40:r=5:seed=42:mold=64:ratio=0.1:death_color=red:life_color=green -t 2 -FATE_FILTER-$(call ALLYES, AVDEVICE TESTSRC_FILTER) += fate-filter-lavd-testsrc +FATE_FILTER-$(call FILTERFRAMECRC, TESTSRC, LAVFI_INDEV) += fate-filter-lavd-testsrc fate-filter-lavd-testsrc: CMD = framecrc -f lavfi -i testsrc=r=7:n=2:d=10 -FATE_FILTER-$(call ALLYES, TESTSRC2_FILTER) += fate-filter-testsrc2-yuv420p -fate-filter-testsrc2-yuv420p: CMD = framecrc -lavfi testsrc2=r=7:d=10 -pix_fmt yuv420p +FATE_FILTER-$(call FILTERFRAMECRC, TESTSRC2) += $(addprefix fate-filter-testsrc2-, yuv420p yuv444p rgb24 rgba) +fate-filter-testsrc2-%: CMD = framecrc -lavfi testsrc2=r=7:d=10 -pix_fmt $(word 4, $(subst -, ,$(@))) -FATE_FILTER-$(call ALLYES, TESTSRC2_FILTER) += fate-filter-testsrc2-yuv444p -fate-filter-testsrc2-yuv444p: CMD = framecrc -lavfi testsrc2=r=7:d=10 -pix_fmt yuv444p - -FATE_FILTER-$(call ALLYES, TESTSRC2_FILTER) += fate-filter-testsrc2-rgb24 -fate-filter-testsrc2-rgb24: CMD = framecrc -lavfi testsrc2=r=7:d=10 -pix_fmt rgb24 - -FATE_FILTER-$(call ALLYES, LAVFI_INDEV TESTSRC2_FILTER) += fate-filter-testsrc2-rgba -fate-filter-testsrc2-rgba: CMD = framecrc -lavfi testsrc2=r=7:d=10 -pix_fmt rgba - -FATE_FILTER-$(call ALLYES, LAVFI_INDEV ALLRGB_FILTER) += fate-filter-allrgb +FATE_FILTER-$(call FILTERFRAMECRC, ALLRGB) += fate-filter-allrgb fate-filter-allrgb: CMD = framecrc -lavfi allrgb=rate=5:duration=1 -pix_fmt rgb24 -FATE_FILTER-$(call ALLYES, LAVFI_INDEV ALLYUV_FILTER) += fate-filter-allyuv +FATE_FILTER-$(call FILTERFRAMECRC, ALLYUV) += fate-filter-allyuv fate-filter-allyuv: CMD = framecrc -lavfi allyuv=rate=5:duration=1 -pix_fmt yuv444p -FATE_FILTER-$(call ALLYES, LAVFI_INDEV PAL75BARS_FILTER) += fate-filter-pal75bars +FATE_FILTER-$(call FILTERFRAMECRC, PAL75BARS) += fate-filter-pal75bars fate-filter-pal75bars: CMD = framecrc -lavfi pal75bars=rate=5:duration=1 -pix_fmt yuv420p -FATE_FILTER-$(call ALLYES, LAVFI_INDEV PAL100BARS_FILTER) += fate-filter-pal100bars +FATE_FILTER-$(call FILTERFRAMECRC, PAL100BARS) += fate-filter-pal100bars fate-filter-pal100bars: CMD = framecrc -lavfi pal100bars=rate=5:duration=1 -pix_fmt yuv420p -FATE_FILTER-$(call ALLYES, LAVFI_INDEV RGBTESTSRC_FILTER) += fate-filter-rgbtestsrc +FATE_FILTER-$(call FILTERFRAMECRC, RGBTESTSRC) += fate-filter-rgbtestsrc fate-filter-rgbtestsrc: CMD = framecrc -lavfi rgbtestsrc=rate=5:duration=1 -pix_fmt rgb24 -FATE_FILTER-$(call ALLYES, LAVFI_INDEV SMPTEBARS_FILTER) += fate-filter-smptebars +FATE_FILTER-$(call FILTERFRAMECRC, SMPTEBARS) += fate-filter-smptebars fate-filter-smptebars: CMD = framecrc -lavfi smptebars=rate=5:duration=1 -pix_fmt yuv420p -FATE_FILTER-$(call ALLYES, LAVFI_INDEV SMPTEHDBARS_FILTER) += fate-filter-smptehdbars +FATE_FILTER-$(call FILTERFRAMECRC, SMPTEHDBARS) += fate-filter-smptehdbars fate-filter-smptehdbars: CMD = framecrc -lavfi smptehdbars=rate=5:duration=1 -pix_fmt yuv444p -FATE_FILTER-$(call ALLYES, LAVFI_INDEV YUVTESTSRC_FILTER) += fate-filter-yuvtestsrc-yuv444p +FATE_FILTER-$(call FILTERFRAMECRC, YUVTESTSRC) += fate-filter-yuvtestsrc-yuv444p fate-filter-yuvtestsrc-yuv444p: CMD = framecrc -lavfi yuvtestsrc=rate=5:duration=1 -pix_fmt yuv444p -FATE_FILTER-$(call ALLYES, LAVFI_INDEV YUVTESTSRC_FILTER) += fate-filter-yuvtestsrc-yuv444p12 +FATE_FILTER-$(call FILTERFRAMECRC, YUVTESTSRC SCALE) += fate-filter-yuvtestsrc-yuv444p12 fate-filter-yuvtestsrc-yuv444p12: CMD = framecrc -lavfi yuvtestsrc=rate=5:duration=1,format=yuv444p12,scale -pix_fmt yuv444p12le -FATE_FILTER-$(call ALLYES, AVDEVICE TESTSRC_FILTER FORMAT_FILTER CONCAT_FILTER SCALE_FILTER) += fate-filter-lavd-scalenorm +FATE_FILTER-$(call FILTERFRAMECRC, TESTSRC FORMAT CONCAT SCALE, LAVFI_INDEV FILE_PROTOCOL) += fate-filter-lavd-scalenorm fate-filter-lavd-scalenorm: tests/data/filtergraphs/scalenorm fate-filter-lavd-scalenorm: CMD = framecrc -f lavfi -graph_file $(TARGET_PATH)/tests/data/filtergraphs/scalenorm -i dummy -FATE_FILTER-$(call ALLYES, FRAMERATE_FILTER TESTSRC2_FILTER) += fate-filter-framerate-up fate-filter-framerate-down +FATE_FILTER-$(call FILTERFRAMECRC, FRAMERATE TESTSRC2) += fate-filter-framerate-up fate-filter-framerate-down fate-filter-framerate-up: CMD = framecrc -lavfi testsrc2=r=2:d=10,framerate=fps=10 -t 1 fate-filter-framerate-down: CMD = framecrc -lavfi testsrc2=r=2:d=10,framerate=fps=1 -t 1 -FATE_FILTER-$(call ALLYES, FRAMERATE_FILTER TESTSRC2_FILTER FORMAT_FILTER) += fate-filter-framerate-12bit-up fate-filter-framerate-12bit-down +FATE_FILTER-$(call FILTERFRAMECRC, FRAMERATE TESTSRC2 FORMAT SCALE) += fate-filter-framerate-12bit-up fate-filter-framerate-12bit-down fate-filter-framerate-12bit-up: CMD = framecrc -lavfi testsrc2=r=50:d=1,format=pix_fmts=yuv422p12le,scale,framerate=fps=60,scale -t 1 -pix_fmt yuv422p12le fate-filter-framerate-12bit-down: CMD = framecrc -lavfi testsrc2=r=60:d=1,format=pix_fmts=yuv422p12le,scale,framerate=fps=50,scale -t 1 -pix_fmt yuv422p12le -FATE_FILTER-$(call ALLYES, MINTERPOLATE_FILTER TESTSRC2_FILTER) += fate-filter-minterpolate-up fate-filter-minterpolate-down +FATE_FILTER-$(call FILTERFRAMECRC, MINTERPOLATE TESTSRC2) += fate-filter-minterpolate-up fate-filter-minterpolate-down fate-filter-minterpolate-up: CMD = framecrc -lavfi testsrc2=r=2:d=10,minterpolate=fps=10 -t 1 fate-filter-minterpolate-down: CMD = framecrc -lavfi testsrc2=r=2:d=10,minterpolate=fps=1 -t 1 -FATE_FILTER_VSYNTH-$(CONFIG_BOXBLUR_FILTER) += fate-filter-boxblur +FATE_FILTER_VSYNTH_PGMYUV-$(CONFIG_BOXBLUR_FILTER) += fate-filter-boxblur fate-filter-boxblur: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf boxblur=2:1 -FATE_FILTER_VSYNTH-$(call ALLYES, COLORCHANNELMIXER_FILTER FORMAT_FILTER PERMS_FILTER) += fate-filter-colorchannelmixer +FATE_FILTER_VSYNTH_PGMYUV-$(call ALLYES, COLORCHANNELMIXER_FILTER SCALE_FILTER FORMAT_FILTER PERMS_FILTER) += fate-filter-colorchannelmixer fate-filter-colorchannelmixer: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf scale,format=rgb24,perms=random,colorchannelmixer=.31415927:.4:.31415927:0:.27182818:.8:.27182818:0:.2:.6:.2:0 -flags +bitexact -sws_flags +accurate_rnd+bitexact -FATE_FILTER_VSYNTH-$(CONFIG_DRAWBOX_FILTER) += fate-filter-drawbox +FATE_FILTER_VSYNTH_PGMYUV-$(CONFIG_DRAWBOX_FILTER) += fate-filter-drawbox fate-filter-drawbox: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf drawbox=224:24:88:72:red@0.5 -FATE_FILTER_VSYNTH-$(CONFIG_FADE_FILTER) += fate-filter-fade +FATE_FILTER_VSYNTH_PGMYUV-$(CONFIG_FADE_FILTER) += fate-filter-fade fate-filter-fade: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf fade=in:5:15,fade=out:30:15 -FATE_FILTER_VSYNTH-$(call ALLYES, INTERLACE_FILTER FIELDORDER_FILTER) += fate-filter-fieldorder +FATE_FILTER_VSYNTH_PGMYUV-$(call ALLYES, INTERLACE_FILTER SCALE_FILTER FIELDORDER_FILTER) += fate-filter-fieldorder fate-filter-fieldorder: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf interlace=tff,scale,fieldorder=bff -sws_flags +accurate_rnd+bitexact -define FATE_FPFILTER_SUITE -FATE_FILTER_FRAMEPACK += fate-filter-framepack-$(1) -fate-filter-framepack-$(1): CMD = framecrc -c:v pgmyuv -i $(TARGET_PATH)/tests/vsynth1/%02d.pgm -c:v pgmyuv -i $(TARGET_PATH)/tests/vsynth1/%02d.pgm -filter_complex framepack=$(1) -frames 15 -endef - FPMODES = columns frameseq lines sbs tab -$(foreach MODE,$(FPMODES),$(eval $(call FATE_FPFILTER_SUITE,$(MODE)))) -FATE_FILTER_VSYNTH-$(CONFIG_FRAMEPACK_FILTER) += $(FATE_FILTER_FRAMEPACK) +FATE_FILTER_FRAMEPACK := $(addprefix fate-filter-framepack-, $(FPMODES)) +$(FATE_FILTER_FRAMEPACK): CMD = framecrc -c:v pgmyuv -i $(TARGET_PATH)/tests/vsynth1/%02d.pgm -c:v pgmyuv -i $(TARGET_PATH)/tests/vsynth1/%02d.pgm -filter_complex framepack=$(@:fate-filter-framepack-%=%) -frames 15 + +FATE_FILTER_VSYNTH_PGMYUV-$(CONFIG_FRAMEPACK_FILTER) += $(FATE_FILTER_FRAMEPACK) fate-filter-framepack: $(FATE_FILTER_FRAMEPACK) -FATE_FILTER_VSYNTH-$(CONFIG_GRADFUN_FILTER) += fate-filter-gradfun +FATE_FILTER_VSYNTH_PGMYUV-$(CONFIG_GRADFUN_FILTER) += fate-filter-gradfun fate-filter-gradfun: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf gradfun -FATE_FILTER_VSYNTH-$(CONFIG_HQDN3D_FILTER) += fate-filter-hqdn3d +FATE_FILTER_VSYNTH_PGMYUV-$(CONFIG_HQDN3D_FILTER) += fate-filter-hqdn3d fate-filter-hqdn3d: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf hqdn3d -FATE_FILTER_VSYNTH-$(CONFIG_INTERLACE_FILTER) += fate-filter-interlace +FATE_FILTER_VSYNTH_PGMYUV-$(CONFIG_INTERLACE_FILTER) += fate-filter-interlace fate-filter-interlace: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf interlace -FATE_FILTER_VSYNTH-$(CONFIG_INTERLACE_FILTER) += fate-filter-interlace-complex +FATE_FILTER_VSYNTH_PGMYUV-$(CONFIG_INTERLACE_FILTER) += fate-filter-interlace-complex fate-filter-interlace-complex: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf interlace=lowpass=complex -FATE_FILTER_VSYNTH-$(call ALLYES, NEGATE_FILTER PERMS_FILTER) += fate-filter-negate +FATE_FILTER_VSYNTH_PGMYUV-$(call ALLYES, NEGATE_FILTER PERMS_FILTER) += fate-filter-negate fate-filter-negate: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf perms=random,negate -FATE_FILTER_VSYNTH-$(CONFIG_HISTOGRAM_FILTER) += fate-filter-histogram-levels +FATE_FILTER_VSYNTH_PGMYUV-$(CONFIG_HISTOGRAM_FILTER) += fate-filter-histogram-levels fate-filter-histogram-levels: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf histogram -flags +bitexact -sws_flags +accurate_rnd+bitexact -FATE_FILTER_VSYNTH-$(CONFIG_WAVEFORM_FILTER) += fate-filter-waveform_column +FATE_FILTER_VSYNTH_PGMYUV-$(CONFIG_WAVEFORM_FILTER) += fate-filter-waveform_column fate-filter-waveform_column: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf waveform -flags +bitexact -sws_flags +accurate_rnd+bitexact -FATE_FILTER_VSYNTH-$(CONFIG_WAVEFORM_FILTER) += fate-filter-waveform_row +FATE_FILTER_VSYNTH_PGMYUV-$(CONFIG_WAVEFORM_FILTER) += fate-filter-waveform_row fate-filter-waveform_row: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf waveform=m=row -flags +bitexact -sws_flags +accurate_rnd+bitexact -FATE_FILTER_VSYNTH-$(CONFIG_WAVEFORM_FILTER) += fate-filter-waveform_envelope +FATE_FILTER_VSYNTH_PGMYUV-$(CONFIG_WAVEFORM_FILTER) += fate-filter-waveform_envelope fate-filter-waveform_envelope: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf waveform=e=3 -flags +bitexact -sws_flags +accurate_rnd+bitexact -FATE_FILTER_VSYNTH-$(CONFIG_WAVEFORM_FILTER) += fate-filter-waveform_uv +FATE_FILTER_VSYNTH_PGMYUV-$(CONFIG_WAVEFORM_FILTER) += fate-filter-waveform_uv fate-filter-waveform_uv: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf waveform=c=6 -flags +bitexact -sws_flags +accurate_rnd+bitexact -FATE_FILTER_VSYNTH-$(CONFIG_VECTORSCOPE_FILTER) += fate-filter-vectorscope_gray +FATE_FILTER_VSYNTH_PGMYUV-$(CONFIG_VECTORSCOPE_FILTER) += fate-filter-vectorscope_gray fate-filter-vectorscope_gray: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf vectorscope=gray -sws_flags +accurate_rnd+bitexact -frames:v 3 -FATE_FILTER_VSYNTH-$(CONFIG_VECTORSCOPE_FILTER) += fate-filter-vectorscope_color +FATE_FILTER_VSYNTH_PGMYUV-$(CONFIG_VECTORSCOPE_FILTER) += fate-filter-vectorscope_color fate-filter-vectorscope_color: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf vectorscope=color -sws_flags +accurate_rnd+bitexact -frames:v 3 -FATE_FILTER_VSYNTH-$(CONFIG_VECTORSCOPE_FILTER) += fate-filter-vectorscope_color2 +FATE_FILTER_VSYNTH_PGMYUV-$(CONFIG_VECTORSCOPE_FILTER) += fate-filter-vectorscope_color2 fate-filter-vectorscope_color2: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf vectorscope=color2 -sws_flags +accurate_rnd+bitexact -frames:v 3 -FATE_FILTER_VSYNTH-$(CONFIG_VECTORSCOPE_FILTER) += fate-filter-vectorscope_color3 +FATE_FILTER_VSYNTH_PGMYUV-$(CONFIG_VECTORSCOPE_FILTER) += fate-filter-vectorscope_color3 fate-filter-vectorscope_color3: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf vectorscope=color3 -sws_flags +accurate_rnd+bitexact -frames:v 3 -FATE_FILTER_VSYNTH-$(CONFIG_VECTORSCOPE_FILTER) += fate-filter-vectorscope_color4 +FATE_FILTER_VSYNTH_PGMYUV-$(CONFIG_VECTORSCOPE_FILTER) += fate-filter-vectorscope_color4 fate-filter-vectorscope_color4: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf vectorscope=color4 -sws_flags +accurate_rnd+bitexact -frames:v 3 -FATE_FILTER_VSYNTH-$(CONFIG_VECTORSCOPE_FILTER) += fate-filter-vectorscope_xy +FATE_FILTER_VSYNTH_PGMYUV-$(call ALLYES, VECTORSCOPE_FILTER SCALE_FILTER) += fate-filter-vectorscope_xy fate-filter-vectorscope_xy: CMD = framecrc -auto_conversion_filters -c:v pgmyuv -i $(SRC) -vf vectorscope=x=0:y=1 -sws_flags +accurate_rnd+bitexact -frames:v 3 -FATE_FILTER_VSYNTH-$(CONFIG_MERGEPLANES_FILTER) += fate-filter-mergeplanes +FATE_FILTER_VSYNTH_PGMYUV-$(CONFIG_MERGEPLANES_FILTER) += fate-filter-mergeplanes fate-filter-mergeplanes: tests/data/filtergraphs/mergeplanes fate-filter-mergeplanes: CMD = framecrc -c:v pgmyuv -i $(SRC) -c:v pgmyuv -i $(SRC) -filter_complex_script $(TARGET_PATH)/tests/data/filtergraphs/mergeplanes -FATE_FILTER_VSYNTH-$(CONFIG_HSTACK_FILTER) += fate-filter-hstack +FATE_FILTER_VSYNTH_PGMYUV-$(CONFIG_HSTACK_FILTER) += fate-filter-hstack fate-filter-hstack: tests/data/filtergraphs/hstack fate-filter-hstack: CMD = framecrc -c:v pgmyuv -i $(SRC) -c:v pgmyuv -i $(SRC) -filter_complex_script $(TARGET_PATH)/tests/data/filtergraphs/hstack -FATE_FILTER_VSYNTH-$(CONFIG_VSTACK_FILTER) += fate-filter-vstack +FATE_FILTER_VSYNTH_PGMYUV-$(CONFIG_VSTACK_FILTER) += fate-filter-vstack fate-filter-vstack: tests/data/filtergraphs/vstack fate-filter-vstack: CMD = framecrc -c:v pgmyuv -i $(SRC) -c:v pgmyuv -i $(SRC) -filter_complex_script $(TARGET_PATH)/tests/data/filtergraphs/vstack @@ -253,7 +240,7 @@ fate-filter-overlay_gbrap_gbrap: FILTER = "scale,format=gbrap[over];color=bl FATE_FILTER_SAMPLES-yes += $(FATE_FILTER_OVERLAY_SAMPLES-yes) $(FATE_FILTER_OVERLAY_ALPHA) fate-filter-overlays: $(FATE_FILTER_OVERLAY) $(FATE_FILTER_OVERLAY_ALPHA) -FATE_FILTER_VSYNTH-$(CONFIG_PHASE_FILTER) += fate-filter-phase +FATE_FILTER_VSYNTH_PGMYUV-$(CONFIG_PHASE_FILTER) += fate-filter-phase fate-filter-phase: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf phase FATE_REMOVEGRAIN := 00 01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 \ @@ -265,49 +252,49 @@ FATE_REMOVEGRAIN-$(call FILTERDEMDEC, REMOVEGRAIN, IMAGE2, PGMYUV) += $(FATE_REM fate-filter-removegrain: $(FATE_REMOVEGRAIN-yes) FATE_FILTER_VSYNTH-yes += $(FATE_REMOVEGRAIN-yes) -FATE_FILTER_VSYNTH-$(CONFIG_SEPARATEFIELDS_FILTER) += fate-filter-separatefields +FATE_FILTER_VSYNTH_PGMYUV-$(CONFIG_SEPARATEFIELDS_FILTER) += fate-filter-separatefields fate-filter-separatefields: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf separatefields -FATE_FILTER_VSYNTH-$(CONFIG_WEAVE_FILTER) += fate-filter-weave +FATE_FILTER_VSYNTH_PGMYUV-$(CONFIG_WEAVE_FILTER) += fate-filter-weave fate-filter-weave: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf weave=bottom -FATE_FILTER_VSYNTH-$(CONFIG_SELECT_FILTER) += fate-filter-select-alternate +FATE_FILTER_VSYNTH_PGMYUV-$(CONFIG_SELECT_FILTER) += fate-filter-select-alternate fate-filter-select-alternate: tests/data/filtergraphs/select-alternate fate-filter-select-alternate: CMD = framecrc -c:v pgmyuv -i $(SRC) -filter_script $(TARGET_PATH)/tests/data/filtergraphs/select-alternate -FATE_FILTER_VSYNTH-$(call ALLYES, SETPTS_FILTER SETTB_FILTER) += fate-filter-setpts +FATE_FILTER_VSYNTH_PGMYUV-$(call ALLYES, SETPTS_FILTER SETTB_FILTER) += fate-filter-setpts fate-filter-setpts: tests/data/filtergraphs/setpts fate-filter-setpts: CMD = framecrc -c:v pgmyuv -i $(SRC) -filter_script $(TARGET_PATH)/tests/data/filtergraphs/setpts FATE_SHUFFLEFRAMES += fate-filter-shuffleframes fate-filter-shuffleframes: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf shuffleframes="2|1|0" -FATE_FILTER_VSYNTH-$(CONFIG_SHUFFLEFRAMES_FILTER) += $(FATE_SHUFFLEFRAMES) +FATE_FILTER_VSYNTH_PGMYUV-$(CONFIG_SHUFFLEFRAMES_FILTER) += $(FATE_SHUFFLEFRAMES) -FATE_SHUFFLEPLANES += fate-filter-shuffleplanes-dup-luma +FATE_SHUFFLEPLANES-$(call ALLYES, SCALE_FILTER SHUFFLEPLANES_FILTER) += fate-filter-shuffleplanes-dup-luma fate-filter-shuffleplanes-dup-luma: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf scale,format=yuva444p,shuffleplanes=0:0:0:0 -FATE_SHUFFLEPLANES += fate-filter-shuffleplanes-swapuv +FATE_SHUFFLEPLANES-$(CONFIG_SHUFFLEPLANES_FILTER) += fate-filter-shuffleplanes-swapuv fate-filter-shuffleplanes-swapuv: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf shuffleplanes=0:2:1:0 -FATE_FILTER_VSYNTH-$(CONFIG_SHUFFLEPLANES_FILTER) += $(FATE_SHUFFLEPLANES) +FATE_FILTER_VSYNTH_PGMYUV-yes += $(FATE_SHUFFLEPLANES-yes) FATE_SWAPRECT += fate-filter-swaprect fate-filter-swaprect: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf swaprect -FATE_FILTER_VSYNTH-$(CONFIG_SWAPRECT_FILTER) += $(FATE_SWAPRECT) +FATE_FILTER_VSYNTH_PGMYUV-$(CONFIG_SWAPRECT_FILTER) += $(FATE_SWAPRECT) -FATE_FILTER_VSYNTH-$(CONFIG_TBLEND_FILTER) += fate-filter-tblend +FATE_FILTER_VSYNTH_PGMYUV-$(CONFIG_TBLEND_FILTER) += fate-filter-tblend fate-filter-tblend: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf tblend=all_mode=difference128 -FATE_FILTER_VSYNTH-$(CONFIG_TELECINE_FILTER) += fate-filter-telecine +FATE_FILTER_VSYNTH_PGMYUV-$(CONFIG_TELECINE_FILTER) += fate-filter-telecine fate-filter-telecine: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf telecine -FATE_FILTER-$(call ALLYES, TESTSRC2_FILTER TPAD_FILTER) += fate-filter-tpad-add fate-filter-tpad-clone +FATE_FILTER-$(call FILTERFRAMECRC, TESTSRC2 TPAD) += fate-filter-tpad-add fate-filter-tpad-clone fate-filter-tpad-add: CMD = framecrc -lavfi testsrc2=d=1:r=2,tpad=start=1:stop=3:color=gray fate-filter-tpad-clone: CMD = framecrc -lavfi testsrc2=d=1:r=2,tpad=start=1:stop=2:stop_mode=clone:color=black -FATE_FILTER_VSYNTH-$(CONFIG_TRANSPOSE_FILTER) += fate-filter-transpose +FATE_FILTER_VSYNTH_PGMYUV-$(CONFIG_TRANSPOSE_FILTER) += fate-filter-transpose fate-filter-transpose: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf transpose FATE_TRIM += fate-filter-trim-duration @@ -322,65 +309,65 @@ fate-filter-trim-mixed: CMD = framecrc -i $(SRC) -vf trim=start=0.2:end=0.4:star FATE_TRIM += fate-filter-trim-time fate-filter-trim-time: CMD = framecrc -i $(SRC) -vf trim=0:0.09 -FATE_FILTER_VSYNTH-$(CONFIG_TRIM_FILTER) += $(FATE_TRIM) +FATE_FILTER_VSYNTH-$(call FILTERDEMDEC, TRIM, IMAGE2, PGM) += $(FATE_TRIM) -FATE_FILTER-$(call ALLYES, TESTSRC2_FILTER UNTILE_FILTER) += fate-filter-untile +FATE_FILTER-$(call FILTERFRAMECRC, TESTSRC2 UNTILE) += fate-filter-untile fate-filter-untile: CMD = framecrc -lavfi testsrc2=d=1:r=2,untile=2x2 -FATE_FILTER_VSYNTH-$(CONFIG_UNSHARP_FILTER) += fate-filter-unsharp +FATE_FILTER_VSYNTH_PGMYUV-$(CONFIG_UNSHARP_FILTER) += fate-filter-unsharp fate-filter-unsharp: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf unsharp=11:11:-1.5:11:11:-1.5 -FATE_FILTER_VSYNTH-$(CONFIG_UNSHARP_FILTER) += fate-filter-unsharp-yuv420p10 +FATE_FILTER_VSYNTH-$(call FILTERFRAMECRC, TESTSRC2 SCALE UNSHARP) += fate-filter-unsharp-yuv420p10 fate-filter-unsharp-yuv420p10: CMD = framecrc -lavfi testsrc2=r=2:d=10,scale,format=yuv420p10,unsharp=11:11:-1.5:11:11:-1.5,scale -pix_fmt yuv420p10le -flags +bitexact -sws_flags +accurate_rnd+bitexact -FATE_FILTER_SAMPLES-$(call ALLYES, SMJPEG_DEMUXER MJPEG_DECODER PERMS_FILTER HQDN3D_FILTER) += fate-filter-hqdn3d-sample +FATE_FILTER_SAMPLES-$(call FILTERDEMDEC, PERMS HQDN3D, SMJPEG, MJPEG) += fate-filter-hqdn3d-sample fate-filter-hqdn3d-sample: tests/data/filtergraphs/hqdn3d fate-filter-hqdn3d-sample: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/smjpeg/scenwin.mjpg -filter_complex_script $(TARGET_PATH)/tests/data/filtergraphs/hqdn3d -an -FATE_FILTER_EPX-$(call ALLYES, IMAGE2_DEMUXER PNG_DECODER EPX_FILTER) = fate-filter-ep2x fate-filter-ep3x +FATE_FILTER_EPX-$(call FILTERDEMDEC, SCALE EPX, IMAGE2, PNG) = fate-filter-ep2x fate-filter-ep3x FATE_FILTER_SAMPLES-yes += $(FATE_FILTER_EPX-yes) fate-filter-ep2x: CMD = framecrc -i $(TARGET_SAMPLES)/filter/pixelart%d.png -vf scale,format=rgb32,epx=2,scale,format=bgra fate-filter-ep3x: CMD = framecrc -i $(TARGET_SAMPLES)/filter/pixelart%d.png -vf scale,format=rgb32,epx=3,scale,format=bgra fate-filter-epx: $(FATE_FILTER_EPX-yes) -FATE_FILTER_HQX-$(call ALLYES, IMAGE2_DEMUXER PNG_DECODER HQX_FILTER) = fate-filter-hq2x fate-filter-hq3x fate-filter-hq4x +FATE_FILTER_HQX-$(call FILTERDEMDEC, SCALE HQX, IMAGE2, PNG) = fate-filter-hq2x fate-filter-hq3x fate-filter-hq4x FATE_FILTER_SAMPLES-yes += $(FATE_FILTER_HQX-yes) fate-filter-hq2x: CMD = framecrc -i $(TARGET_SAMPLES)/filter/pixelart%d.png -vf scale,format=rgb32,hqx=2,scale,format=bgra fate-filter-hq3x: CMD = framecrc -i $(TARGET_SAMPLES)/filter/pixelart%d.png -vf scale,format=rgb32,hqx=3,scale,format=bgra fate-filter-hq4x: CMD = framecrc -i $(TARGET_SAMPLES)/filter/pixelart%d.png -vf scale,format=rgb32,hqx=4,scale,format=bgra fate-filter-hqx: $(FATE_FILTER_HQX-yes) -FATE_FILTER_XBR-$(call ALLYES, IMAGE2_DEMUXER PNG_DECODER XBR_FILTER) = fate-filter-2xbr fate-filter-3xbr fate-filter-4xbr +FATE_FILTER_XBR-$(call FILTERDEMDEC, SCALE XBR, IMAGE2, PNG) = fate-filter-2xbr fate-filter-3xbr fate-filter-4xbr FATE_FILTER_SAMPLES-yes += $(FATE_FILTER_XBR-yes) fate-filter-2xbr: CMD = framecrc -i $(TARGET_SAMPLES)/filter/pixelart%d.png -vf scale,xbr=2,scale -pix_fmt bgra fate-filter-3xbr: CMD = framecrc -i $(TARGET_SAMPLES)/filter/pixelart%d.png -vf scale,xbr=3,scale -pix_fmt bgra fate-filter-4xbr: CMD = framecrc -i $(TARGET_SAMPLES)/filter/pixelart%d.png -vf scale,xbr=4,scale -pix_fmt bgra fate-filter-xbr: $(FATE_FILTER_XBR-yes) -FATE_FILTER_SAMPLES-$(call ALLYES, UTVIDEO_DECODER AVI_DEMUXER PERMS_FILTER CURVES_FILTER) += fate-filter-curves +FATE_FILTER_SAMPLES-$(call FILTERDEMDEC, PERMS CURVES, AVI, UTVIDEO) += fate-filter-curves fate-filter-curves: CMD = framecrc -i $(TARGET_SAMPLES)/utvideo/utvideo_rgb_median.avi -vf perms=random,curves=vintage -FATE_FILTER_SAMPLES-$(call ALLYES, VMD_DEMUXER VMDVIDEO_DECODER FORMAT_FILTER PERMS_FILTER GRADFUN_FILTER) += fate-filter-gradfun-sample +FATE_FILTER_SAMPLES-$(call FILTERDEMDEC, FORMAT PERMS GRADFUN SCALE, VMD, VMDVIDEO) += fate-filter-gradfun-sample fate-filter-gradfun-sample: tests/data/filtergraphs/gradfun fate-filter-gradfun-sample: CMD = framecrc -auto_conversion_filters -i $(TARGET_SAMPLES)/vmd/12.vmd -filter_script $(TARGET_PATH)/tests/data/filtergraphs/gradfun -an -frames:v 20 -FATE_FILTER-$(call ALLYES, TESTSRC_FILTER SINE_FILTER CONCAT_FILTER) += fate-filter-concat fate-filter-concat-vfr +FATE_FILTER-$(call FILTERFRAMECRC, TESTSRC SINE CONCAT, FILE_PROTOCOL) += fate-filter-concat fate-filter-concat-vfr fate-filter-concat: tests/data/filtergraphs/concat fate-filter-concat: CMD = framecrc -filter_complex_script $(TARGET_PATH)/tests/data/filtergraphs/concat fate-filter-concat-vfr: tests/data/filtergraphs/concat-vfr fate-filter-concat-vfr: CMD = framecrc -filter_complex_script $(TARGET_PATH)/tests/data/filtergraphs/concat-vfr -FATE_FILTER-$(call ALLYES, TESTSRC2_FILTER CHROMASHIFT_FILTER) += fate-filter-chromashift-smear fate-filter-chromashift-wrap +FATE_FILTER-$(call FILTERFRAMECRC, TESTSRC2 CHROMASHIFT) += fate-filter-chromashift-smear fate-filter-chromashift-wrap fate-filter-chromashift-smear: CMD = framecrc -lavfi testsrc2=r=5:d=1,chromashift=cbh=-1:cbv=1:crh=2:crv=-2:edge=smear -pix_fmt yuv420p fate-filter-chromashift-wrap: CMD = framecrc -lavfi testsrc2=r=5:d=1,chromashift=cbh=-1:cbv=1:crh=2:crv=-2:edge=wrap -pix_fmt yuv420p -FATE_FILTER-$(call ALLYES, TESTSRC2_FILTER FPS_FILTER DECIMATE_FILTER) += fate-filter-decimate +FATE_FILTER-$(call FILTERFRAMECRC, TESTSRC2 FPS DECIMATE) += fate-filter-decimate fate-filter-decimate: CMD = framecrc -lavfi testsrc2=r=24:d=10,fps=60,decimate=5,decimate=4,decimate=3 -pix_fmt yuv420p -FATE_FILTER-$(call ALLYES, TESTSRC2_FILTER FPS_FILTER MPDECIMATE_FILTER) += fate-filter-mpdecimate +FATE_FILTER-$(call FILTERFRAMECRC, TESTSRC2 FPS MPDECIMATE) += fate-filter-mpdecimate fate-filter-mpdecimate: CMD = framecrc -lavfi testsrc2=r=2:d=10,fps=3,mpdecimate -r 3 -pix_fmt yuv420p -FATE_FILTER-$(call ALLYES, FPS_FILTER TESTSRC2_FILTER) += fate-filter-fps-up fate-filter-fps-up-round-down fate-filter-fps-up-round-up fate-filter-fps-down fate-filter-fps-down-round-down fate-filter-fps-down-round-up fate-filter-fps-down-eof-pass fate-filter-fps-start-drop fate-filter-fps-start-fill +FATE_FILTER-$(call FILTERFRAMECRC, FPS TESTSRC2) += $(addprefix fate-filter-fps-, up up-round-down up-round-up down down-round-down down-round-up down-eof-pass start-drop start-fill) fate-filter-fps-up: CMD = framecrc -lavfi testsrc2=r=3:d=2,fps=7 fate-filter-fps-up-round-down: CMD = framecrc -lavfi testsrc2=r=3:d=2,fps=7:round=down fate-filter-fps-up-round-up: CMD = framecrc -lavfi testsrc2=r=3:d=2,fps=7:round=up @@ -391,113 +378,86 @@ fate-filter-fps-down-eof-pass: CMD = framecrc -lavfi testsrc2=r=7:d=3.5,fps=3:eo fate-filter-fps-start-drop: CMD = framecrc -lavfi testsrc2=r=7:d=3.5,fps=3:start_time=1.5 fate-filter-fps-start-fill: CMD = framecrc -lavfi testsrc2=r=7:d=1.5,setpts=PTS+14,fps=3:start_time=1.5 -FATE_FILTER_SAMPLES-$(call ALLYES, MOV_DEMUXER FPS_FILTER QTRLE_DECODER) += fate-filter-fps-cfr fate-filter-fps fate-filter-fps-r +FATE_FILTER_SAMPLES-$(call FILTERDEMDEC, FPS SCALE, MOV, QTRLE) += fate-filter-fps-cfr fate-filter-fps fate-filter-fps-r fate-filter-fps-cfr: CMD = framecrc -auto_conversion_filters -i $(TARGET_SAMPLES)/qtrle/apple-animation-variable-fps-bug.mov -r 30 -vsync cfr -pix_fmt yuv420p fate-filter-fps-r: CMD = framecrc -auto_conversion_filters -i $(TARGET_SAMPLES)/qtrle/apple-animation-variable-fps-bug.mov -r 30 -vf fps -pix_fmt yuv420p fate-filter-fps: CMD = framecrc -auto_conversion_filters -i $(TARGET_SAMPLES)/qtrle/apple-animation-variable-fps-bug.mov -vf fps=30 -pix_fmt yuv420p -FATE_FILTER_VSYNTH-$(call ALLYES, FORMAT_FILTER SPLIT_FILTER ALPHAEXTRACT_FILTER ALPHAMERGE_FILTER) += fate-filter-alphaextract_alphamerge_rgb -fate-filter-alphaextract_alphamerge_rgb: tests/data/filtergraphs/alphamerge_alphaextract_rgb -fate-filter-alphaextract_alphamerge_rgb: CMD = framecrc -auto_conversion_filters -c:v pgmyuv -i $(SRC) -filter_complex_script $(TARGET_PATH)/tests/data/filtergraphs/alphamerge_alphaextract_rgb +FATE_FILTER_ALPHAEXTRACT_ALPHAMERGE := $(addprefix fate-filter-alphaextract_alphamerge_, rgb yuv) +FATE_FILTER_VSYNTH_PGMYUV-$(call ALLYES, SCALE_FILTER FORMAT_FILTER SPLIT_FILTER ALPHAEXTRACT_FILTER ALPHAMERGE_FILTER) += $(FATE_FILTER_ALPHAEXTRACT_ALPHAMERGE) +$(FATE_FILTER_ALPHAEXTRACT_ALPHAMERGE): fate-filter-alphaextract_alphamerge_%: tests/data/filtergraphs/alphamerge_alphaextract_% +$(FATE_FILTER_ALPHAEXTRACT_ALPHAMERGE): CMD = framecrc -auto_conversion_filters -c:v pgmyuv -i $(SRC) -filter_complex_script $(TARGET_PATH)/tests/data/filtergraphs/alphamerge_alphaextract$(@:fate-filter-alphaextract_alphamerge%=%) -FATE_FILTER_VSYNTH-$(call ALLYES, FORMAT_FILTER SPLIT_FILTER ALPHAEXTRACT_FILTER ALPHAMERGE_FILTER) += fate-filter-alphaextract_alphamerge_yuv -fate-filter-alphaextract_alphamerge_yuv: tests/data/filtergraphs/alphamerge_alphaextract_yuv -fate-filter-alphaextract_alphamerge_yuv: CMD = framecrc -auto_conversion_filters -c:v pgmyuv -i $(SRC) -filter_complex_script $(TARGET_PATH)/tests/data/filtergraphs/alphamerge_alphaextract_yuv - -FATE_FILTER_VSYNTH-$(CONFIG_CROP_FILTER) += fate-filter-crop +FATE_FILTER_VSYNTH_VIDEO_FILTER-$(CONFIG_CROP_FILTER) += fate-filter-crop fate-filter-crop: CMD = video_filter "crop=iw-100:ih-100:100:100" -FATE_FILTER_VSYNTH-$(call ALLYES, CROP_FILTER SCALE_FILTER) += fate-filter-crop_scale +FATE_FILTER_VSYNTH_VIDEO_FILTER-$(call ALLYES, CROP_FILTER SCALE_FILTER) += fate-filter-crop_scale fate-filter-crop_scale: CMD = video_filter "crop=iw-100:ih-100:100:100,scale=w=400:h=-1" -FATE_FILTER_VSYNTH-$(call ALLYES, CROP_FILTER SCALE_FILTER VFLIP_FILTER) += fate-filter-crop_scale_vflip +FATE_FILTER_VSYNTH_VIDEO_FILTER-$(call ALLYES, CROP_FILTER SCALE_FILTER VFLIP_FILTER) += fate-filter-crop_scale_vflip fate-filter-crop_scale_vflip: CMD = video_filter "null,null,crop=iw-200:ih-200:200:200,crop=iw-20:ih-20:20:20,scale=w=200:h=200,scale=w=250:h=250,vflip,vflip,null,scale=w=200:h=200,crop=iw-100:ih-100:100:100,vflip,scale=w=200:h=200,null,vflip,crop=iw-100:ih-100:100:100,null" -FATE_FILTER_VSYNTH-$(call ALLYES, CROP_FILTER VFLIP_FILTER) += fate-filter-crop_vflip +FATE_FILTER_VSYNTH_VIDEO_FILTER-$(call ALLYES, CROP_FILTER VFLIP_FILTER) += fate-filter-crop_vflip fate-filter-crop_vflip: CMD = video_filter "crop=iw-100:ih-100:100:100,vflip" -FATE_FILTER_VSYNTH-$(CONFIG_NULL_FILTER) += fate-filter-null +FATE_FILTER_VSYNTH_VIDEO_FILTER-$(CONFIG_NULL_FILTER) += fate-filter-null fate-filter-null: CMD = video_filter "null" -FATE_FILTER_VSYNTH-$(CONFIG_SCALE_FILTER) += fate-filter-scale200 +FATE_FILTER_VSYNTH_VIDEO_FILTER-$(CONFIG_SCALE_FILTER) += fate-filter-scale200 fate-filter-scale200: CMD = video_filter "scale=w=200:h=200" -FATE_FILTER_VSYNTH-$(CONFIG_SCALE_FILTER) += fate-filter-scale500 +FATE_FILTER_VSYNTH_VIDEO_FILTER-$(CONFIG_SCALE_FILTER) += fate-filter-scale500 fate-filter-scale500: CMD = video_filter "scale=w=500:h=500" -FATE_FILTER_VSYNTH-$(CONFIG_SCALE2REF_FILTER) += fate-filter-scale2ref_keep_aspect +FATE_FILTER_VSYNTH-$(call ALLYES, TESTSRC_FILTER SCALE2REF_FILTER NULLSINK_FILTER FRAMEMD5_MUXER FILE_PROTOCOL PIPE_PROTOCOL) += fate-filter-scale2ref_keep_aspect fate-filter-scale2ref_keep_aspect: tests/data/filtergraphs/scale2ref_keep_aspect fate-filter-scale2ref_keep_aspect: CMD = framemd5 -frames:v 5 -filter_complex_script $(TARGET_PATH)/tests/data/filtergraphs/scale2ref_keep_aspect -map "[main]" -FATE_FILTER_VSYNTH-$(CONFIG_SCALE_FILTER) += fate-filter-scalechroma +FATE_FILTER_VSYNTH-$(call FILTERDEMDEC, SCALE, RAWVIDEO, RAWVIDEO) += fate-filter-scalechroma fate-filter-scalechroma: tests/data/vsynth1.yuv fate-filter-scalechroma: CMD = framecrc -flags bitexact -s 352x288 -pix_fmt yuv444p -i $(TARGET_PATH)/tests/data/vsynth1.yuv -pix_fmt yuv420p -sws_flags +bitexact -vf scale=out_v_chr_pos=33:out_h_chr_pos=151 -FATE_FILTER_VSYNTH-$(CONFIG_VFLIP_FILTER) += fate-filter-vflip +FATE_FILTER_VSYNTH_VIDEO_FILTER-$(CONFIG_VFLIP_FILTER) += fate-filter-vflip fate-filter-vflip: CMD = video_filter "vflip" -FATE_FILTER_VSYNTH-$(CONFIG_COLORLEVELS_FILTER) += fate-filter-colorlevels +FATE_FILTER_VSYNTH_PGMYUV-$(call ALLYES, SCALE_FILTER FORMAT_FILTER COLORLEVELS_FILTER) += fate-filter-colorlevels fate-filter-colorlevels-16 fate-filter-colorlevels: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf scale,format=rgb24,colorlevels -flags +bitexact -sws_flags +accurate_rnd+bitexact - -FATE_FILTER_VSYNTH-$(CONFIG_COLORLEVELS_FILTER) += fate-filter-colorlevels-16 fate-filter-colorlevels-16: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf scale,format=rgb48,colorlevels,scale -pix_fmt rgb48le -flags +bitexact -sws_flags +accurate_rnd+bitexact -FATE_FILTER_VSYNTH-$(CONFIG_COLORBALANCE_FILTER) += fate-filter-colorbalance +FATE_FILTER_VSYNTH_PGMYUV-$(call ALLYES, SCALE_FILTER FORMAT_FILTER COLORBALANCE_FILTER) += fate-filter-colorbalance fate-filter-colorbalance-gbrap fate-filter-colorbalance-rgba64 fate-filter-colorbalance-gbrap-16 fate-filter-colorbalance: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf scale,format=rgb24,colorbalance=rs=.2 -flags +bitexact -sws_flags +accurate_rnd+bitexact -frames:v 3 - -FATE_FILTER_VSYNTH-$(CONFIG_COLORBALANCE_FILTER) += fate-filter-colorbalance-gbrap fate-filter-colorbalance-gbrap: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf scale,format=gbrap,colorbalance=gh=.2 -flags +bitexact -sws_flags +accurate_rnd+bitexact -frames:v 3 - -FATE_FILTER_VSYNTH-$(CONFIG_COLORBALANCE_FILTER) += fate-filter-colorbalance-rgba64 fate-filter-colorbalance-rgba64: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf scale,format=rgba64,colorbalance=rm=.2,scale -pix_fmt rgba64le -flags +bitexact -sws_flags +accurate_rnd+bitexact -frames:v 3 - -FATE_FILTER_VSYNTH-$(CONFIG_COLORBALANCE_FILTER) += fate-filter-colorbalance-gbrap-16 fate-filter-colorbalance-gbrap-16: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf scale,format=gbrap,colorbalance=bh=.2 -pix_fmt gbrap -flags +bitexact -sws_flags +accurate_rnd+bitexact -frames:v 3 -FATE_FILTER_VSYNTH-$(CONFIG_COLORMATRIX_FILTER) += fate-filter-colormatrix1 +FATE_FILTER_VSYNTH_VIDEO_FILTER-$(CONFIG_COLORMATRIX_FILTER) += fate-filter-colormatrix1 fate-filter-colormatrix2 fate-filter-colormatrix1: CMD = video_filter "colormatrix=bt601:smpte240m,colormatrix=smpte240m:fcc,colormatrix=fcc:bt601,colormatrix=bt601:fcc,colormatrix=fcc:smpte240m,colormatrix=smpte240m:bt709" - -FATE_FILTER_VSYNTH-$(CONFIG_COLORMATRIX_FILTER) += fate-filter-colormatrix2 fate-filter-colormatrix2: CMD = video_filter "colormatrix=bt709:fcc,colormatrix=fcc:bt709,colormatrix=bt709:bt601,colormatrix=bt601:bt709,colormatrix=bt709:smpte240m,colormatrix=smpte240m:bt601" -FATE_FILTER_VSYNTH-$(call ALLYES, CROP_FILTER VFLIP_FILTER) += fate-filter-vflip_crop +FATE_FILTER_VSYNTH_VIDEO_FILTER-$(call ALLYES, CROP_FILTER VFLIP_FILTER) += fate-filter-vflip_crop fate-filter-vflip_crop: CMD = video_filter "vflip,crop=iw-100:ih-100:100:100" -FATE_FILTER_VSYNTH-$(CONFIG_VFLIP_FILTER) += fate-filter-vflip_vflip +FATE_FILTER_VSYNTH_VIDEO_FILTER-$(CONFIG_VFLIP_FILTER) += fate-filter-vflip_vflip fate-filter-vflip_vflip: CMD = video_filter "vflip,vflip" -FATE_FILTER_VSYNTH-$(call ALLYES, FORMAT_FILTER PERMS_FILTER EDGEDETECT_FILTER) += fate-filter-edgedetect +FATE_FILTER_VSYNTH_VIDEO_FILTER-$(call ALLYES, SCALE_FILTER FORMAT_FILTER PERMS_FILTER EDGEDETECT_FILTER) += fate-filter-edgedetect fate-filter-edgedetect-colormix fate-filter-edgedetect: CMD = video_filter "scale,format=gray,perms=random,edgedetect" -frames:v 20 - -FATE_FILTER_VSYNTH-$(call ALLYES, FORMAT_FILTER PERMS_FILTER EDGEDETECT_FILTER) += fate-filter-edgedetect-colormix fate-filter-edgedetect-colormix: CMD = video_filter "scale,format=gbrp,perms=random,edgedetect=mode=colormix" -frames:v 20 -FATE_FILTER_VSYNTH-$(call ALLYES, PERMS_FILTER HUE_FILTER) += fate-filter-hue1 +FATE_FILTER_VSYNTH_VIDEO_FILTER-$(call ALLYES, PERMS_FILTER HUE_FILTER) += fate-filter-hue1 fate-filter-hue2 fate-filter-hue3 fate-filter-hue1: CMD = video_filter "perms=random,hue=s=sin(2*PI*t)+1" -frames:v 20 - -FATE_FILTER_VSYNTH-$(call ALLYES, PERMS_FILTER HUE_FILTER) += fate-filter-hue2 fate-filter-hue2: CMD = video_filter "perms=random,hue=h=18*n" -frames:v 20 - -FATE_FILTER_VSYNTH-$(call ALLYES, PERMS_FILTER HUE_FILTER) += fate-filter-hue3 fate-filter-hue3: CMD = video_filter "perms=random,hue=b=n-10" -frames:v 20 -FATE_FILTER_VSYNTH-$(call ALLYES, FORMAT_FILTER PERMS_FILTER HUE_FILTER) += fate-filter-hue4 +FATE_FILTER_VSYNTH_VIDEO_FILTER-$(call ALLYES, SCALE_FILTER FORMAT_FILTER PERMS_FILTER HUE_FILTER) += fate-filter-hue4 fate-filter-hue4: CMD = video_filter "scale,format=yuv422p10,perms=random,hue=h=18*n:s=n/10,scale" -frames:v 20 -pix_fmt yuv422p10le -FATE_FILTER_VSYNTH-$(CONFIG_IDET_FILTER) += fate-filter-idet +FATE_FILTER_VSYNTH-$(call FILTERDEMDEC, IDET, IMAGE2, PGM) += fate-filter-idet fate-filter-idet: CMD = framecrc -flags bitexact -idct simple -i $(SRC) -vf idet -frames:v 25 -flags +bitexact -FATE_FILTER_VSYNTH-$(CONFIG_PAD_FILTER) += fate-filter-pad +FATE_FILTER_VSYNTH_VIDEO_FILTER-$(CONFIG_PAD_FILTER) += fate-filter-pad fate-filter-pad: CMD = video_filter "pad=iw*1.5:ih*1.5:iw*0.3:ih*0.2" -FATE_FILTER_PP = fate-filter-pp fate-filter-pp1 fate-filter-pp2 fate-filter-pp3 fate-filter-pp4 fate-filter-pp5 fate-filter-pp6 -FATE_FILTER_VSYNTH-$(CONFIG_PP_FILTER) += $(FATE_FILTER_PP) - -FATE_FILTER_VSYNTH1_MPEG4_QPRD := $(addprefix fate-filter-, pp pp7 spp codecview) -$(FATE_FILTER_VSYNTH1_MPEG4_QPRD): fate-vsynth1-mpeg4-qprd -fate-vsynth1-mpeg4-qprd: KEEP_FILES ?= 1 - -fate-filter-pp: CMD = framecrc -flags bitexact -export_side_data venc_params -idct simple -i $(TARGET_PATH)/tests/data/fate/vsynth1-mpeg4-qprd.avi -frames:v 5 -flags +bitexact -vf "pp=be/hb/vb/tn/l5/al" fate-filter-pp1: CMD = video_filter "pp=fq|4/be/hb/vb/tn/l5/al" fate-filter-pp2: CMD = video_filter "qp=2*(x+y),pp=be/h1/v1/lb" fate-filter-pp3: CMD = video_filter "qp=2*(x+y),pp=be/ha|128|7/va/li" @@ -505,25 +465,39 @@ fate-filter-pp4: CMD = video_filter "pp=be/ci" fate-filter-pp5: CMD = video_filter "pp=md" fate-filter-pp6: CMD = video_filter "pp=be/fd" -FATE_FILTER_VSYNTH-$(CONFIG_PP7_FILTER) += fate-filter-pp7 +FATE_FILTER_VSYNTH_VIDEO_FILTER-$(CONFIG_PP_FILTER) += $(addprefix fate-filter-, pp1 pp4 pp5 pp6) +FATE_FILTER_VSYNTH_VIDEO_FILTER-$(call ALLYES, PP_FILTER QP_FILTER) += fate-filter-pp2 fate-filter-pp3 + +FATE_FILTER_VSYNTH1_MPEG4_QPRD-$(call FILTERDEMDEC, PP, AVI, MPEG4) += pp +fate-filter-pp: CMD = framecrc -flags bitexact -export_side_data venc_params -idct simple -i $(TARGET_PATH)/tests/data/fate/vsynth1-mpeg4-qprd.avi -frames:v 5 -flags +bitexact -vf "pp=be/hb/vb/tn/l5/al" + +FATE_FILTER_VSYNTH1_MPEG4_QPRD-$(call FILTERDEMDEC, PP7, AVI, MPEG4) += pp7 fate-filter-pp7: CMD = framecrc -flags bitexact -export_side_data venc_params -idct simple -i $(TARGET_PATH)/tests/data/fate/vsynth1-mpeg4-qprd.avi -frames:v 5 -flags +bitexact -vf "pp7" -FATE_FILTER_VSYNTH-$(CONFIG_SPP_FILTER) += fate-filter-spp +FATE_FILTER_VSYNTH1_MPEG4_QPRD-$(call FILTERDEMDEC, SPP, AVI, MPEG4) += spp fate-filter-spp: CMD = framecrc -flags bitexact -export_side_data venc_params -idct simple -i $(TARGET_PATH)/tests/data/fate/vsynth1-mpeg4-qprd.avi -frames:v 5 -flags +bitexact -vf "spp=idct=simple:dct=int" -FATE_FILTER_VSYNTH-$(CONFIG_CODECVIEW_FILTER) += fate-filter-codecview +FATE_FILTER_VSYNTH1_MPEG4_QPRD-$(call FILTERDEMDEC, PP, AVI, MPEG4) += codecview fate-filter-codecview: CMD = framecrc -flags bitexact -idct simple -flags2 +export_mvs -i $(TARGET_PATH)/tests/data/fate/vsynth1-mpeg4-qprd.avi -frames:v 5 -flags +bitexact -vf codecview=mv=pf+bf+bb -FATE_FILTER_VSYNTH-$(call ALLYES, QP_FILTER PP_FILTER) += fate-filter-qp +# The above tests use vsynth1-mpeg4-qprd.avi created by fate-vsynth1-mpeg4-qprd +# as input. So only add them if all the requirements of fate-vsynth1-mpeg4-qprd +# are met, add a dependency to the test and ensure that the file is kept. +FATE_FILTER_VSYNTH1_MPEG4_QPRD := $(if $(filter fate-vsynth1-mpeg4-qprd, $(FATE_VSYNTH1)),$(addprefix fate-filter-, $(FATE_FILTER_VSYNTH1_MPEG4_QPRD-yes))) +FATE_FILTER_VSYNTH-yes += $(FATE_FILTER_VSYNTH1_MPEG4_QPRD) +$(FATE_FILTER_VSYNTH1_MPEG4_QPRD): fate-vsynth1-mpeg4-qprd +fate-vsynth1-mpeg4-qprd: KEEP_FILES ?= 1 + +FATE_FILTER_VSYNTH_VIDEO_FILTER-$(call ALLYES, QP_FILTER PP_FILTER) += fate-filter-qp fate-filter-qp: CMD = video_filter "qp=34,pp=be/hb/vb/tn/l5/al" -FATE_FILTER_VSYNTH-$(CONFIG_SELECT_FILTER) += fate-filter-select +FATE_FILTER_VSYNTH-$(call FILTERDEMDEC, SELECT, IMAGE2, PGM) += fate-filter-select fate-filter-select: CMD = framecrc -flags bitexact -idct simple -i $(SRC) -vf "select=not(eq(mod(n\,2)\,0)+eq(mod(n\,3)\,0))" -frames:v 25 -flags +bitexact -FATE_FILTER_VSYNTH-$(CONFIG_SETDAR_FILTER) += fate-filter-setdar +FATE_FILTER_VSYNTH_VIDEO_FILTER-$(CONFIG_SETDAR_FILTER) += fate-filter-setdar fate-filter-setdar: CMD = video_filter "setdar=dar=16/9" -FATE_FILTER_VSYNTH-$(CONFIG_SETSAR_FILTER) += fate-filter-setsar +FATE_FILTER_VSYNTH_VIDEO_FILTER-$(CONFIG_SETSAR_FILTER) += fate-filter-setsar fate-filter-setsar: CMD = video_filter "setsar=sar=16/11" FATE_STEREO3D := al-sbsl ar-abl abr-mr abr-ml sbsl-abl sbsl-abr sbsl-al sbsl-sbsr @@ -540,10 +514,10 @@ FATE_STEREO3D-$(call FILTERDEMDEC, SCALE STEREO3D, IMAGE2, PGMYUV) += $(FATE_STE fate-filter-stereo3d: $(FATE_STEREO3D-yes) FATE_FILTER_VSYNTH-yes += $(FATE_STEREO3D-yes) -FATE_FILTER_VSYNTH-$(CONFIG_THUMBNAIL_FILTER) += fate-filter-thumbnail +FATE_FILTER_VSYNTH_VIDEO_FILTER-$(call ALLYES, SCALE_FILTER THUMBNAIL_FILTER) += fate-filter-thumbnail fate-filter-thumbnail: CMD = video_filter "scale,thumbnail=10" -FATE_FILTER_VSYNTH-$(CONFIG_TILE_FILTER) += fate-filter-tile +FATE_FILTER_VSYNTH_VIDEO_FILTER-$(CONFIG_TILE_FILTER) += fate-filter-tile fate-filter-tile: CMD = video_filter "tile=3x3:nb_frames=5:padding=7:margin=2" @@ -559,12 +533,8 @@ ifneq (,$(RUNNING_PIXFMTS_TESTS)) -include tests/pixfmts.mak endif -define PIXDESC_TEST -FATE_FILTER_PIXDESC-$(CONFIG_FORMAT_FILTER) += fate-filter-pixdesc-$(1) -fate-filter-pixdesc-$(1): CMD = video_filter "scale,format=$(1),pixdesctest" -pix_fmt $(1) -endef - -$(foreach fmt, $(PIXFMTS), $(eval $(call PIXDESC_TEST,$(fmt)))) +FATE_FILTER_PIXDESC-$(call VIDEO_FILTER, SCALE FORMAT PIXDESCTEST) += $(addprefix fate-filter-pixdesc-, $(PIXFMTS)) +fate-filter-pixdesc-%: CMD = video_filter "scale,format=$(@:fate-filter-pixdesc-%=%),pixdesctest" -pix_fmt $(@:fate-filter-pixdesc-%=%) fate-filter-pixdesc: $(FATE_FILTER_PIXDESC-yes) FATE_FILTER_VSYNTH-yes += $(FATE_FILTER_PIXDESC-yes) @@ -639,59 +609,64 @@ fate-filter-pixfmts-transpose: CMD = pixfmts "dir=cclock_flip" FATE_FILTER_PIXFMTS-$(CONFIG_VFLIP_FILTER) += fate-filter-pixfmts-vflip fate-filter-pixfmts-vflip: CMD = pixfmts -$(FATE_FILTER_PIXFMTS-yes): libavfilter/tests/filtfmts$(EXESUF) -FATE_FILTER_VSYNTH-$(CONFIG_FORMAT_FILTER) += $(FATE_FILTER_PIXFMTS-yes) +# pixfmts uses video_filter internally and also adds format and scale filters. +FATE_FILTER_PIXFMTS := $(if $(call VIDEO_FILTER, FORMAT SCALE),$(FATE_FILTER_PIXFMTS-yes)) -fate-filter-pixfmts: $(FATE_FILTER_PIXFMTS-yes) +$(FATE_FILTER_PIXFMTS): libavfilter/tests/filtfmts$(EXESUF) +FATE_FILTER_VSYNTH-yes += $(FATE_FILTER_PIXFMTS) +fate-filter-pixfmts: $(FATE_FILTER_PIXFMTS) + +FATE_FILTER_VSYNTH-$(call VIDEO_FILTER) += $(FATE_FILTER_VSYNTH_VIDEO_FILTER-yes) +FATE_FILTER_VSYNTH-$(call FRAMECRC, IMAGE2, PGMYUV) += $(FATE_FILTER_VSYNTH_PGMYUV-yes) $(FATE_FILTER_VSYNTH-yes): $(VREF) $(FATE_FILTER_VSYNTH-yes): SRC = $(TARGET_PATH)/tests/vsynth1/%02d.pgm -FATE_AVCONV-$(call DEMDEC, IMAGE2, PGMYUV) += $(FATE_FILTER_VSYNTH-yes) +FATE_FFMPEG += $(FATE_FILTER_VSYNTH-yes) # # Metadata tests # FILTER_METADATA_COMMAND = ffprobe$(PROGSSUF)$(EXESUF) -of compact=p=0 -show_entries frame=pts:frame_tags -bitexact -f lavfi -SCENEDETECT_DEPS = FFPROBE LAVFI_INDEV MOVIE_FILTER SELECT_FILTER SCALE_FILTER \ - AVCODEC AVDEVICE MOV_DEMUXER SVQ3_DECODER ZLIB +SCENEDETECT_DEPS = LAVFI_INDEV FILE_PROTOCOL MOVIE_FILTER SELECT_FILTER \ + SCALE_FILTER MOV_DEMUXER SVQ3_DECODER ZLIB FATE_METADATA_FILTER-$(call ALLYES, $(SCENEDETECT_DEPS)) += fate-filter-metadata-scenedetect fate-filter-metadata-scenedetect: SRC = $(TARGET_SAMPLES)/svq3/Vertical400kbit.sorenson3.mov fate-filter-metadata-scenedetect: CMD = run $(FILTER_METADATA_COMMAND) "sws_flags=+accurate_rnd+bitexact;movie='$(SRC)',select=gt(scene\,.25)" -SCDET_DEPS = FFPROBE LAVFI_INDEV MOVIE_FILTER SCDET_FILTER SCALE_FILTER \ - AVCODEC AVDEVICE MOV_DEMUXER SVQ3_DECODER ZLIB +SCDET_DEPS = LAVFI_INDEV FILE_PROTOCOL MOVIE_FILTER SCDET_FILTER SCALE_FILTER \ + MOV_DEMUXER SVQ3_DECODER ZLIB FATE_METADATA_FILTER-$(call ALLYES, $(SCDET_DEPS)) += fate-filter-metadata-scdet fate-filter-metadata-scdet: SRC = $(TARGET_SAMPLES)/svq3/Vertical400kbit.sorenson3.mov fate-filter-metadata-scdet: CMD = run $(FILTER_METADATA_COMMAND) "sws_flags=+accurate_rnd+bitexact;movie='$(SRC)',scdet=s=1" -CROPDETECT_DEPS = FFPROBE LAVFI_INDEV MOVIE_FILTER CROPDETECT_FILTER SCALE_FILTER \ - AVCODEC AVDEVICE MOV_DEMUXER H264_DECODER +CROPDETECT_DEPS = LAVFI_INDEV FILE_PROTOCOL MOVIE_FILTER CROPDETECT_FILTER \ + SCALE_FILTER MOV_DEMUXER H264_DECODER FATE_METADATA_FILTER-$(call ALLYES, $(CROPDETECT_DEPS)) += fate-filter-metadata-cropdetect fate-filter-metadata-cropdetect: SRC = $(TARGET_SAMPLES)/filter/cropdetect.mp4 fate-filter-metadata-cropdetect: CMD = run $(FILTER_METADATA_COMMAND) "sws_flags=+accurate_rnd+bitexact;movie='$(SRC)',cropdetect=max_outliers=3" -FREEZEDETECT_DEPS = FFPROBE AVDEVICE LAVFI_INDEV MPTESTSRC_FILTER SCALE_FILTER FREEZEDETECT_FILTER +FREEZEDETECT_DEPS = LAVFI_INDEV MPTESTSRC_FILTER SCALE_FILTER FREEZEDETECT_FILTER FATE_METADATA_FILTER-$(call ALLYES, $(FREEZEDETECT_DEPS)) += fate-filter-metadata-freezedetect fate-filter-metadata-freezedetect: CMD = run $(FILTER_METADATA_COMMAND) "sws_flags=+accurate_rnd+bitexact;mptestsrc=r=25:d=10:m=51,freezedetect" -SIGNALSTATS_DEPS = FFPROBE AVDEVICE LAVFI_INDEV COLOR_FILTER SCALE_FILTER SIGNALSTATS_FILTER +SIGNALSTATS_DEPS = LAVFI_INDEV COLOR_FILTER SCALE_FILTER SIGNALSTATS_FILTER FATE_METADATA_FILTER-$(call ALLYES, $(SIGNALSTATS_DEPS)) += fate-filter-metadata-signalstats-yuv420p fate-filter-metadata-signalstats-yuv420p10 fate-filter-metadata-signalstats-yuv420p: CMD = run $(FILTER_METADATA_COMMAND) "sws_flags=+accurate_rnd+bitexact;color=white:duration=1:r=1,signalstats" fate-filter-metadata-signalstats-yuv420p10: CMD = run $(FILTER_METADATA_COMMAND) "sws_flags=+accurate_rnd+bitexact;color=white:duration=1:r=1,format=yuv420p10,signalstats" -SILENCEDETECT_DEPS = FFPROBE AVDEVICE LAVFI_INDEV AMOVIE_FILTER TTA_DEMUXER TTA_DECODER SILENCEDETECT_FILTER +SILENCEDETECT_DEPS = LAVFI_INDEV FILE_PROTOCOL AMOVIE_FILTER TTA_DEMUXER TTA_DECODER SILENCEDETECT_FILTER FATE_METADATA_FILTER-$(call ALLYES, $(SILENCEDETECT_DEPS)) += fate-filter-metadata-silencedetect fate-filter-metadata-silencedetect: SRC = $(TARGET_SAMPLES)/lossless-audio/inside.tta fate-filter-metadata-silencedetect: CMD = run $(FILTER_METADATA_COMMAND) "amovie='$(SRC)',silencedetect=n=-33.5dB:d=0.2" -EBUR128_METADATA_DEPS = FFPROBE AVDEVICE LAVFI_INDEV AMOVIE_FILTER FLAC_DEMUXER FLAC_DECODER EBUR128_FILTER +EBUR128_METADATA_DEPS = LAVFI_INDEV FILE_PROTOCOL AMOVIE_FILTER FLAC_DEMUXER FLAC_DECODER ARESAMPLE_FILTER EBUR128_FILTER FATE_METADATA_FILTER-$(call ALLYES, $(EBUR128_METADATA_DEPS)) += fate-filter-metadata-ebur128 fate-filter-metadata-ebur128: SRC = $(TARGET_SAMPLES)/filter/seq-3341-7_seq-3342-5-24bit.flac fate-filter-metadata-ebur128: CMD = run $(FILTER_METADATA_COMMAND) "amovie='$(SRC)',ebur128=metadata=1" -READVITC_METADATA_DEPS = FFPROBE LAVFI_INDEV MOVIE_FILTER AVCODEC AVDEVICE \ +READVITC_METADATA_DEPS = FILE_PROTOCOL LAVFI_INDEV MOVIE_FILTER \ AVI_DEMUXER FFVHUFF_DECODER READVITC_FILTER FATE_METADATA_FILTER-$(call ALLYES, $(READVITC_METADATA_DEPS)) += fate-filter-metadata-readvitc-def fate-filter-metadata-readvitc-def: SRC = $(TARGET_SAMPLES)/filter/sample-vitc.avi @@ -701,36 +676,41 @@ FATE_METADATA_FILTER-$(call ALLYES, $(READVITC_METADATA_DEPS)) += fate-filter-me fate-filter-metadata-readvitc-thr: SRC = $(TARGET_SAMPLES)/filter/sample-vitc.avi fate-filter-metadata-readvitc-thr: CMD = run $(FILTER_METADATA_COMMAND) "movie='$(SRC)',readvitc=thr_b=0.3:thr_w=0.5" -AVF_PHASE_METER_DEPS = FFPROBE AVDEVICE LAVFI_INDEV AMOVIE_FILTER FLAC_DEMUXER FLAC_DECODER SINE_FILTER APHASEMETER_FILTER +AVF_PHASE_METER_DEPS = FFPROBE LAVFI_INDEV AMOVIE_FILTER FLAC_DEMUXER FLAC_DECODER SINE_FILTER APHASEMETER_FILTER ARESAMPLE_FILTER FATE_METADATA_FILTER-$(call ALLYES, $(AVF_PHASE_METER_DEPS)) += fate-filter-metadata-avf-aphase-meter-mono fate-filter-metadata-avf-aphase-meter-mono: CMD = run $(FILTER_METADATA_COMMAND) sine="frequency=1000:sample_rate=48000:duration=1,aphasemeter=video=0" -FATE_METADATA_FILTER-$(call ALLYES, $(AVF_PHASE_METER_DEPS)) += fate-filter-metadata-avf-aphase-meter-out-of-phase +FATE_METADATA_FILTER-$(call ALLYES, $(AVF_PHASE_METER_DEPS) FILE_PROTOCOL) += fate-filter-metadata-avf-aphase-meter-out-of-phase fate-filter-metadata-avf-aphase-meter-out-of-phase: SRC = $(TARGET_SAMPLES)/filter/out-of-phase-1000hz.flac fate-filter-metadata-avf-aphase-meter-out-of-phase: CMD = run $(FILTER_METADATA_COMMAND) "amovie='$(SRC)',aphasemeter=video=0" FATE_FILTER_SAMPLES-$(call TRANSCODE, RAWVIDEO H264, MOV, ARESAMPLE_FILTER AAC_FIXED_DECODER) += fate-filter-meta-4560-rotate0 fate-filter-meta-4560-rotate0: CMD = transcode mov $(TARGET_SAMPLES)/filter/sample-in-issue-505.mov mov "-c copy -metadata:s:v:0 rotate=0" "-af aresample" "" "" "-flags +bitexact -c:a aac_fixed" -REFCMP_DEPS = FFMPEG LAVFI_INDEV TESTSRC2_FILTER AVGBLUR_FILTER METADATA_FILTER - -FATE_FILTER-$(call ALLYES, $(REFCMP_DEPS) BLURDETECT_FILTER) += fate-filter-refcmp-blurdetect-yuv +FATE_FILTER_CMP_METADATA-$(CONFIG_BLURDETECT_FILTER) += fate-filter-refcmp-blurdetect-yuv fate-filter-refcmp-blurdetect-yuv: CMD = cmp_metadata blurdetect yuv420p 0.015 -FATE_FILTER-$(call ALLYES, $(REFCMP_DEPS) PSNR_FILTER) += fate-filter-refcmp-psnr-rgb +FATE_FILTER_CMP_METADATA-$(CONFIG_SITI_FILTER) += fate-filter-refcmp-siti-yuv +fate-filter-refcmp-siti-yuv: CMD = cmp_metadata siti yuv420p 0.015 + +FATE_FILTER-$(call ALLYES, TESTSRC2_FILTER METADATA_FILTER WRAPPED_AVFRAME_ENCODER \ + NULL_MUXER PIPE_PROTOCOL) += $(FATE_FILTER_CMP_METADATA-yes) + +FATE_FILTER_REFCMP_METADATA-$(call ALLYES, PSNR_FILTER SCALE_FILTER) += fate-filter-refcmp-psnr-rgb fate-filter-refcmp-psnr-rgb: CMD = refcmp_metadata psnr rgb24 0.002 -FATE_FILTER-$(call ALLYES, $(REFCMP_DEPS) PSNR_FILTER) += fate-filter-refcmp-psnr-yuv +FATE_FILTER_REFCMP_METADATA-$(CONFIG_PSNR_FILTER) += fate-filter-refcmp-psnr-yuv fate-filter-refcmp-psnr-yuv: CMD = refcmp_metadata psnr yuv422p 0.0015 -FATE_FILTER-$(call ALLYES, $(REFCMP_DEPS) SSIM_FILTER) += fate-filter-refcmp-ssim-rgb +FATE_FILTER_REFCMP_METADATA-$(call ALLYES, SSIM_FILTER SCALE_FILTER) += fate-filter-refcmp-ssim-rgb fate-filter-refcmp-ssim-rgb: CMD = refcmp_metadata ssim rgb24 0.015 -FATE_FILTER-$(call ALLYES, $(REFCMP_DEPS) SSIM_FILTER) += fate-filter-refcmp-ssim-yuv +FATE_FILTER_REFCMP_METADATA-$(CONFIG_SSIM_FILTER) += fate-filter-refcmp-ssim-yuv fate-filter-refcmp-ssim-yuv: CMD = refcmp_metadata ssim yuv422p 0.015 -FATE_FILTER-$(call ALLYES, $(REFCMP_DEPS) SITI_FILTER) += fate-filter-refcmp-siti-yuv -fate-filter-refcmp-siti-yuv: CMD = cmp_metadata siti yuv420p 0.015 +FATE_FILTER-$(call ALLYES, TESTSRC2_FILTER SPLIT_FILTER AVGBLUR_FILTER \ + METADATA_FILTER WRAPPED_AVFRAME_ENCODER NULL_MUXER \ + PIPE_PROTOCOL) += $(FATE_FILTER_REFCMP_METADATA-yes) FATE_SAMPLES_FFPROBE += $(FATE_METADATA_FILTER-yes) FATE_SAMPLES_FFMPEG += $(FATE_FILTER_SAMPLES-yes) From patchwork Wed May 18 15:34:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35819 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp391854pzb; Wed, 18 May 2022 08:35:19 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwMR9DhZYyR+Nirf2VsxwrLNRiuRDBdk58XSDcKZLWPzMVQVFoXgoo+TeiwzmHpbPuH/5Jn X-Received: by 2002:a05:6402:c90:b0:42a:98c7:3fe with SMTP id cm16-20020a0564020c9000b0042a98c703femr361018edb.270.1652888119260; Wed, 18 May 2022 08:35:19 -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 mp26-20020a1709071b1a00b006f42491e0a0si1154857ejc.655.2022.05.18.08.35.18; Wed, 18 May 2022 08:35:19 -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=fjLuFIaD; 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 4F0A968B3AF; Wed, 18 May 2022 18:35:15 +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-oln040092074068.outbound.protection.outlook.com [40.92.74.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 961DF68B1CD for ; Wed, 18 May 2022 18:35:08 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nH77BNP5DGgbJC6Orn9km9ridHwCEeTUPmOT7odGYpaGsZIAwziBtTQXi7PahaJ9OPk/nGL0viCKMHwctWAJ+hr1cvKZ6yQSTb2ysXV1Z/feZZ93l92VbE08ZOkYVJWGx2bRJSl5H5Ogm5R0FlamJs5bbRZkgC/Irssf+zqltOy26pzOI1LC2zur+IuElEO6GDM+5IELFtgm4pyJQ9lgUhC7w23occPKVlqn3Hbd8dH4XKJ+//ditwOMEWYvqEG4TSVCc7mxAwSCbzQxgZ+v/Fp/mn/iu/qgwwJcby6nsrATwKieEEkgvAKRY/kqb8CCPvCglp/Hfg9KoYq2mFva8g== 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=NUTVnjXOrQITMfacBez+VGU6pwe/cJ5GqqJ4+riN3YE=; b=HIH5nYfX4VuW89Qa7WIfOYFaPvKSgpNHymjXCR06dpy++ub6NHjKMFVDEeTbomxPY2ZtVLO0QJz/wWhUFEfw+2jROHDWYmF4y7bdb0z+CsTnTYoNTcFtZSqSZHJR+8JqPULkuhpp16QCySAu/6JN1oHc/DyDpz1zFnFmYowgT8gSSTMwxl5ADkW8pD4EjCacPtcqgJA5o8X3t1MSLKVVReJVo3+JHt8m2Lv7gwIA6Oh+ZIkwlow+y19PqZqzjc5o8xAS2GJJ/nPQcReriEMZ+zrztvJWKe4d7XPEokxex8sz/DtqcnmGKDSW0xazjR3ZTXT2dmWckxfMyQnyE6Skmw== 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=NUTVnjXOrQITMfacBez+VGU6pwe/cJ5GqqJ4+riN3YE=; b=fjLuFIaD0/yij0yDtvgBM9yPei4sYqplCOQrvj+CoUYVI2wfM37oXDfL6H+HQOS38HXPmsVpAumYqEFHMn0U2LL/HPrfE2xDIp24Hby25cwDlUPzWnntPqx9Au1IiIOi/OLfzlPmZdD7LzEYqG6rG0sXyBYHwzmUwodxUK+tv6fjFAJtUQPco2FzfINnAvzKIZMcrN17P8u5xXG84a2v/qOtmMcuH/Mu+CFf20fBE/et4atvkVhVrcbhdzFb7Mvm4KbDljgUtVELYamZNI2t1Ifuejb0aBhn0FJCSRu3igeyh0yzY8Kfc9pyH1VK5C9abtqSXYeTg1cM4G7u/1ANvw== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by PAXPR01MB8352.eurprd01.prod.exchangelabs.com (2603:10a6:102:21b::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.14; Wed, 18 May 2022 15:35:07 +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 15:35:07 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 18 May 2022 17:34:58 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [r/RhDSMCJNmyIGTGWVLNcmlXAS0ELKHa] X-ClientProxiedBy: ZR0P278CA0099.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:23::14) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220518153458.1388575-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4ebb8a85-7128-43b0-c22a-08da38e3fc1c X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiTPyXc9TS18sMDu33WFsXWebnCsQb0RZ4Dgz11zNQ7GZJ+ijb6ALeOruEi3e+JEsmOiT5hmqgEjd3qsG1nkGN1SCSbUwE9+FcYdPflxLfckzfJsydTeXLFfm1o3QEdR2qHxpZUG7qszRPCQWB8MVfDMJYEpC8fNa3qXhO8bt5i+bekeAE4t/7Df70sMHyskSnQYjiqOYxBiQK13D2B+jSsOqKeDm+0MikP9t2PJbdeKAW9dsPlKclIgEDmiSJM7CILi/rN2MI4yH86GfJJGNmn+Vsl8MMQJoWSg+HzAh8zXqtLgHMBXRytprU70BN0X0G28LzdAgWeTfhyl+ilStqZLVGJ0YfArt8FwrDHa5az1JGxtCAdhUiBme6CgiP9OHhz4lFvgrHJj4UvXe71IIhBbylsXPc4yUQf7VdjG2egROHskHJcOR9VVwVvOt3yXhMqee4l2H0p4jTJAUGw3FQzcykq2XD3ay9GDecJeQeRZDiOmYmBfCebmUXeHrNEidCrqGSuGhIvRkvGezv5Zv6duDt3hLGFJ/cfo3v3nNj2IvUWMEEiWELOc0Lw572kbJ2wfZBLv/ECPP34t/MOD5vJc1L6gW4k8r8oRqUb0pIcSuxKqKYEZ0bS6OmasoT7+7gO3YrEvTYR5Is4GXEiE59LwbvVA/+JXDOo7LgoF/BD9eFjFgujq92fMGetXOOMN4ZNOM4yFby2qdcFaGNal/fIQ54/8JTOJfOG7iqsYS8HjvOZ2DLc/ld4qdh4AAoIB8gg= X-MS-TrafficTypeDiagnostic: PAXPR01MB8352:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: n6bNyhfGuRLZQkPNvEyC/2JAMQzcU+EXgGSdd4S+0E1x+P6LEe6zEmuM9wGen1LKkfOHoha26BLle86YR8VIs5nC2U2WQKgB3OHGbv/qb3ZWz7SFJ3HvGvWpKkncrZTvL6ASzi95t9JusIvZ7XYpDqECnandrxyHOMpzB357MENrl+fIjofDmf+WJta0ex16eirrmwQi8kbh6xEc+abN91EOCNG4xlVO+SxpjvV/xIvy0T89U1tOkKjkDpTMd1h2FfLRPI0ZiREp3mym4692oRaLFuJzZ/hZ3OKnAdWX4H5UW7QQsxj3ADttaHuqITNXtezWJJen/E/WqDHZMv0u2sbh9X15Hpj2gj6/4xpKxtVDfyvXat4kAYzzE4uEiXMxjqghuvuznDXigsu9B3CnaoWpYXJDIKDF8AcUng/4lEhKr4lj++Z1IzM79P8ZT6PPiP6Bt8heSVbpxbNcYhewDlbgDq0uVPO/9KjueEx/NsMHomlfqRdXjdyH+Uu4PuXJvqP8WphHJDwcO+VjV543js0dr0wmaI4GBL5T+XOP1ZChKrv8SaOewIVS4FLjftnnh5uN7ww1NMKZXgz9fpRbxg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: egJrdlnggmCvEiMlfSEOmjfVZhKQ6woz7Py6g/vupIdq0QHiR0+Y82i8Bxipm0pEJzLiPzMCGLCNYyQc2C6eICXIEvBfGwrYgNOCbhqLyOyvXQu1Ct0v9Dn8Uy3BXeIe5fGbfqFP6YxnWXvk7eMNu/Fezd/Kp5XcR4eqxILlHs2X8xzGF+3Np+2a9IELyGlxTtf7BLq8moKpHRRfXIFeC1uQIqQahKCauJw7oQL4XORTZiioCjL2G3rojtqVUE08fmFULNTkPHgJv7BCd09IMvck1fV+l+QMgRSlxLPexuVbeamBhiF16Roe8s8a9Y5nMprPETrp46OmO/Wh4OqaalM+H1ntD+qzUCac5Qak+fEVVK0DcgS6Gpxqbjtp/hv44jF+apEU0+O9EabDSyF4kib2GYDdvxqxZ5abXrHoYz0+8SLEjjJRhq/9hYLcTjnrNSZyYgZ8FW/J04wgg2LPhlOR97HuBzE+nJ/hZbquXNlD5GnJ/ZPk54tgDOLrPpT1qyhFVuSIvPY03pmGEHoviyB8FPH6sYtv8g3q9aUNvsFZrWKCha8MUdUjzMHg4+C8AnnaazxYfn9BG+sFw68+vY7GtxqjJJwW8MYnFkZrlBvzRg+sGCsJOJdAVAiXR9vfomoe/XQfKt/czQFpitXXdZZDk6XW/8EguowGroG9VQE+ZfYGHorx4yZ1yAvW2XCm8PV6k14gLMiW06186UmgmNL1/fu3Q6EWdNKr58MvNRa1qIwIpE8nMZFWIVw3yHzBXEmAY1VUN4/qZuxAP2RB5//G5H2Fpwicy19RvwyLumPBUAOuLhcsnXwwy8MuCINaWLNj8MukVmlOwZaWGsFx7dUGCenSkQfAn4PlweWQjRQTnmulblsZBA8+rMxn5TaRHzWrjUfdzdYbpqnLVl5JF02r10fIfuq7uzchTQOZpSVZlaPJ+x6jFuxxQlxDCl+BuoUskshhU0mELOEZed0EoQE+G2E5Y0DFfFv1m+R9LRc1GBHENXyncdX6VnTuHe9jji86dE0gY0qAxdcN4jexIBlkSEQa1ZmFtehfwovjYQQGImqbwmBmGhI5ex1vEAihcYD1cVpUru3dfPag19FtY4Dd+NnnP21ttBbZy1ObMoy5bU5jorwwVSNOEdmIKlA7AodlRm2tbK7OsEEFc16ymS5KK2I2sdT9zdP9MljbnSSYw1dAusZnZurTqIqYwdyglmDpqnYPUzSCBWQuozVlQDNrGDdoZp3n9klJmfIyufM4H2nZatvudYPiCi5Xz4aba0Dp4SYH6h41mlMuIo2LjuqjfEVFKL8OfPzrgcSN0SGtxlMCmRhaJ8gpKh1i4hZkjq73gi/aC4UYPlaDxGX45prIBkV4Af7DQqsgf8vcaV3nf5gsWjNtyRSWSg2ly164WCUM3t5MnC9xBVAK73y9jmnHTXRgZT6Mg5HSWMyU+wEnP32Ayh1kMgHs4aQ3SDdEukMeDIfpSSfJczMgJnyrpg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4ebb8a85-7128-43b0-c22a-08da38e3fc1c X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 May 2022 15:35:07.1852 (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: PAXPR01MB8352 Subject: [FFmpeg-devel] [PATCH 7/7] tests/fate: Remove intermediate file of flv-add_keyframe_index test 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: Nm4Jng2UECgn Do this by making this test a transcode test. Also fix the test requirements and don't add this test to FATE_AFILTER; instead use a new variable and a new target for flvenc-tests. Signed-off-by: Andreas Rheinhardt --- tests/fate/flvenc.mak | 14 ++++-------- tests/ref/fate/flv-add_keyframe_index | 33 +++++++++++++++++---------- 2 files changed, 25 insertions(+), 22 deletions(-) diff --git a/tests/fate/flvenc.mak b/tests/fate/flvenc.mak index 9682f4a2ba..5032fface3 100644 --- a/tests/fate/flvenc.mak +++ b/tests/fate/flvenc.mak @@ -1,11 +1,5 @@ -tests/data/add_keyframe_index.flv: TAG = GEN -tests/data/add_keyframe_index.flv: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data - $(M)$(TARGET_EXEC) $(TARGET_PATH)/$< -nostdin \ - -f lavfi -i "sws_flags=+accurate_rnd+bitexact;testsrc=r=7:n=2:d=20" -sws_flags '+accurate_rnd+bitexact' -metadata "encoder=Lavf" -pix_fmt yuv420p -c:v flv1 -g 7 -f flv -flags +bitexact -fflags +bitexact \ - -flvflags add_keyframe_index -idct simple -dct int -y $(TARGET_PATH)/tests/data/add_keyframe_index.flv 2> /dev/null; - -FATE_AFILTER-$(call ALLYES, FLV_MUXER FLV_DEMUXER AVDEVICE TESTSRC_FILTER LAVFI_INDEV FLV_ENCODER) += fate-flv-add_keyframe_index -fate-flv-add_keyframe_index: tests/data/add_keyframe_index.flv -fate-flv-add_keyframe_index: CMD = ffmetadata -flags +bitexact -i $(TARGET_PATH)/tests/data/add_keyframe_index.flv - +FATE_FLVENC_FFMPEG_FFPROBE-$(call TRANSCODE, FLV, FLV, RAWVIDEO_DECODER SCALE_FILTER TESTSRC_FILTER LAVFI_INDEV) += fate-flv-add_keyframe_index +fate-flv-add_keyframe_index: CMD = transcode "lavfi -graph testsrc=r=7:n=2:d=20" "foo" flv "-vf scale -c:v flv1 -dct int -g 7 -flvflags add_keyframe_index" "-c copy -t 0.1" "-show_entries format_tags" +FATE_FFMPEG_FFPROBE += $(FATE_FLVENC_FFMPEG_FFPROBE-yes) +fate-flvenc: $(FATE_FLVENC_FFMPEG_FFPROBE-yes) diff --git a/tests/ref/fate/flv-add_keyframe_index b/tests/ref/fate/flv-add_keyframe_index index 1c4da65d90..39c4bed85a 100644 --- a/tests/ref/fate/flv-add_keyframe_index +++ b/tests/ref/fate/flv-add_keyframe_index @@ -1,12 +1,21 @@ -;FFMETADATA1 -hasVideo=true -hasKeyframes=true -hasAudio=false -hasMetadata=true -canSeekToEnd=true -datasize=629776 -videosize=629381 -audiosize=0 -lasttimestamp=20 -lastkeyframetimestamp=19 -lastkeyframelocation=597963 +5f38d76da3ed4a5be06ca604c53666f2 *tests/data/fate/flv-add_keyframe_index.flv +630192 tests/data/fate/flv-add_keyframe_index.flv +#tb 0: 1/1000 +#media_type 0: video +#codec_id 0: flv1 +#dimensions 0: 320x240 +#sar 0: 0/1 +0, 0, 0, 143, 9597, 0xd91d5859 +[FORMAT] +TAG:hasVideo=true +TAG:hasKeyframes=true +TAG:hasAudio=false +TAG:hasMetadata=true +TAG:canSeekToEnd=true +TAG:datasize=629776 +TAG:videosize=629381 +TAG:audiosize=0 +TAG:lasttimestamp=20 +TAG:lastkeyframetimestamp=19 +TAG:lastkeyframelocation=597963 +[/FORMAT]