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