From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id AA85140365 for ; Sun, 24 Apr 2022 03:35:25 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A584368B2D8; Sun, 24 Apr 2022 06:34:57 +0300 (EEST) Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-oln040092075060.outbound.protection.outlook.com [40.92.75.60]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3658E68B2D8 for ; Sun, 24 Apr 2022 06:34:55 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mfymJiJTb5SJfnBdkKDQfYrZIORRqoOM6YyCctfXmT93rhs3IQ1MdOY/O+jQmQCck5LwKul8BQbTIvQ0P8q2GA8kERQXsYG5LfR4lbA8BnMnxRAFVBzcsMmG+8IdVlrQ2LRTPCrXFXZc52nPt8E1jF2SW3HbVLF1uK/12152TGeooivklYuJnfjhC+rZ8bOBk6OSBy5eodiH9QY4AZWrFvUYbbHJ8/EpyrWQOhwLoruTxFTEI6JBDOnyyKEbzdnYyLiABBexO939MP84zxljwmwL8x/sWvKKeZ01/CIuKYc1MvUGXVnbR9Jg84uf9RyzZsWAnsseG/v87LvphFDt+w== 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=ws9oTJhXDGC3Attd3E8hTOSv4Ls39otGt7xNqIbBepM=; b=k+dn6Vz5MezOISyYD7c5c+gvzaJ1SYnIJv7FcZCbqL1v0Z+0gt5U4jt/K9G0USOeG183XVF2JmP4k2/u4D2Rd64KB8z00ZWvgvWzxOllN+UZS6cSyULNa6DFOOdnYkWii6b7XhL/EFxwrXKG2EXx4TpYZG05ZJnZZDlb9nUGKUkpFcyLgsAEgP8nUd67Hs3Qs6bKXu9v/EwW5EglA8792PWzx+f4yqUvDkVjhNyVcp8rOyVumBkl5Y7ecLXdw8SFOpnhtvYyIM51eqxSTcKpndZixugRmX+1iPqSXxqqCmUQ4ThHXfnobY6ILDpJuHOSy0hCEVhEsT+eCN3SmHqI9Q== 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=ws9oTJhXDGC3Attd3E8hTOSv4Ls39otGt7xNqIbBepM=; b=DDlE2dhu+xmVS3yoM8FpS/wSNr7YZXFjkW7CdDlRwvrkL19mzHNvP6Dju5rUX7M8k4r/JiBDmEzkP+svQI0c7VeAAoySnXmBCMARrtLeg40IUmlGxHtYkYBBLJPBkamUH3KbI0sF77VHQtEcVW5+f58OTO3gbtLn5BR4Ao9DjggfT2N0wpaKTRJvwY+idEwiWg+ospMsncIdZPCiEUxt9TwTCxVPM56Tuj90u1f0TlfjCjn6OgWpIK99cYAoAghGcRwqNJafmw/FzJWZvZlSXiahVyv16M5+Ca2t86tl7XX27SohNgxHgtzqtXoY5eGYO1lVX7cksHMCQ+JPEX3EfA== Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) by AM6PR0102MB3062.eurprd01.prod.exchangelabs.com (2603:10a6:209:b::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5186.15; Sun, 24 Apr 2022 03:34:44 +0000 Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com ([fe80::1854:2c30:7ba1:c431]) by AS8PR01MB7944.eurprd01.prod.exchangelabs.com ([fe80::1854:2c30:7ba1:c431%6]) with mapi id 15.20.5186.020; Sun, 24 Apr 2022 03:34:44 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 24 Apr 2022 05:33:53 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [MjdyYN4TlzBhqNAIdco9WzYA+7Gx2LB3] X-ClientProxiedBy: ZR0P278CA0118.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:20::15) To AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) X-Microsoft-Original-Message-ID: <20220424033417.797645-7-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c000c443-3748-4e40-5a0a-08da25a35fc8 X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/UL9mvhPTGbvwy9cgLHAFHXfeWFBiRjEkCSMOMXxj1MnL4g7xBYUmTLIT+tIn5x1pCmXCUswyEHByzVWVbM9FxHLoHuW6XIhgZMTKe4jJPhrVzVMACoaWJ7AEXEIXSf6mq0MiM6LJTZv1o/z/m5C62Cd3uYWeRmxq+bMMelBueAiFmiVOvLTQyWI2MgJtXn3CUMuQma0gjTaa3zn/r3ligLEDPT2MKHL3zn1iLo3Td3VkBhW7lax00qnZtSs2vz8cFU8usTN2eqYju79VsLQGlrPFBt7KDuNjl3Fek8Rte/go7CWJsAihGZA1dvX09ULdOQ//MS+NhU59VTYLxhCFRftlGwPTh29uAE1Nprxx9MFeK70h3V2lrO5OMl+E4a531f0c/5vRriRy33f2Sg2f4a3MdqGQOVqpn+i4Zrxf/esxvE3iaxhMXmLx3MFtLhr9ZJLP8isOOMSebh6/ifyuxOi2bwh+ti7Zgaf8OsoDeQlkMulPw+hENuvvAx8i4bMlQgqddX8TYxMtfSiyC9oQr8OS+AAdMy+cBL9hdeSIuLl+lUc+TmkYOndO4uG87JFkGGe1HMZt5P3htH0imJBd7VI9FweLy9HrezF+1glCUbd0jThkfFLrh4uVX7IzpDXdkeBvptVFI4thBnczx0R6TLvm4p0Qmp53vAgrzV+OaJtoHRlUxCTtE1ctJymb2gzbubdLcycjTjdWg== X-MS-TrafficTypeDiagnostic: AM6PR0102MB3062:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Wnl2iTRG0Zh+otEnBzQRWMtbwKdvrhiGokw84Z4b4AV6hz0PrMFJVHBedTkBNC480ZpUwhilQPjHDBs3k++Ufk1grl637fgueVgpTqlqoD5+ugetyyJvjCCzHWGkSm7MxxQSda75Oi28RDXtJEYxUnl8bDJEITsm4EZMVHeUTJ6EgNjSr1onwhl14dga5oNaVo9hju/MptbNC2Bqhtsk5SYfRHCdoqlq5kQjq8ibt0/P+TcquRb/HmkTPNH1AIWdKTiEetNeXkOD8zm5NHQzirTB1YQ0OGr90Hd+iZB8/tQoTpU5f0qx6p3jziYgVlvOs+c0+Y1L+dYB70n0oa5feJKGJw7EYY2bUAWgwua623OuAUO765ncka9lTRrVIloxeT3dAABXkwtoWRJ6fzh7ydNwYkHQF344zd3tFtq0Pxb3QWp7zGDfizmUkwyPwseynmsm6ek/kghanxDNE9ZFqx6voo/5nQvUcUB8pt6xlA7vpCRI0ve8g6pB91DfQAMQRp8AMYej4rpMmqsozJXMrUR6PcC0230j5hw6O4puinraPaOXlmUnBGfCxi92eKy6Uuo16A8Stt+pEjEEt5sI+A== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?sPkpQFuedQJwMhAd9YWCzSlBkvJ3D3pg9sjhmpWh5mrD0Mk5xTOAjbbcZvng?= =?us-ascii?Q?ns6gtOQzFRw1MEcV0HZB7iIcAgI1dgd5dL0bPmwWdnrg2xijiPgj/Bch3WaR?= =?us-ascii?Q?KK6SV5dZGiS5wuYRuTMLXll5dpgyX0P9dJqbvPnnNFYHVP/9hk/LAvl9u6mS?= =?us-ascii?Q?1dp6V+HE6KyseN2xllcnbJHD+GR16OGSQUkGAtFT0Dfd+OwSblmeTLu1oQAR?= =?us-ascii?Q?jC6DukafiiR3jI2rS+TqaPi7/g6wr18cHNevjMBfnJGMLCtXVpXCC0RLha12?= =?us-ascii?Q?nmBxmk16HNtUT9nlttZ/HwmFdVa5ziWAVq/P+7wznBzjsBHIIin/G/d6SsZ+?= =?us-ascii?Q?mefI3UT7ZYnd97SAowRHiJVY7RqakySouRx/N1QjqoJbuzz2F04TP0l8jOGM?= =?us-ascii?Q?fNbIsxmo7Y/3LqLn5Xxqz+ZGt1IfNIUbZ4S+xW0CKsuVB4GMue7ncR/YPKZo?= =?us-ascii?Q?eA6N9iLMlrdyEXOe+AEbV8Q/iU1ctB8N8gnnRh4KOEOHPgCsc2p41eSYxI4U?= =?us-ascii?Q?KV+8j7aOtuOmZglkrRmevseJQ8XJj9XjzuyeoM0WXukjKTA5pETdIXZXB8t/?= =?us-ascii?Q?rchUVx3nrnopMcSZt42oM+s1+Q/cukkUuGxKvxXuPdMdW/h0uOHZFrKjdYAx?= =?us-ascii?Q?kjaasq+cLgVer7fkffS/W4tERjOQQcT1cRX47DSBCBp5Z61TtHBQzJKGHDGk?= =?us-ascii?Q?ZCu/HNg49kvx0qogJNMWPY1vBWFFWCe/3NKk9OnYJ8KveKuvPjxh2n2m2JDk?= =?us-ascii?Q?bw8OG2xXHyshA1B2gOpLakQPBYxGYPhnIerCly09iXLj1Gpx4lVieQKE7NQx?= =?us-ascii?Q?ME0KhmvbQjb411XPIgrITzjUjU4zKIfJNXH1icbyePiKXrDRWbHekRoZ79rJ?= =?us-ascii?Q?dVsCB6my0lrHYUybmgfIewnVf2jKls12bMcWBop65yQIC+hllxvjXZbxj/2T?= =?us-ascii?Q?caoGOW2FM6fyE/hme1IVk+qt0g+n2v/O/VG7CcO/wPPPBavDmSCDLh9Vce9L?= =?us-ascii?Q?IXz79QdEfowa0hkgMnuSIHT7Lrq+ARQkA1IULPfH2dJXfrxheVsMw78hdfBI?= =?us-ascii?Q?uRW0EBHJBEL27AG4oihGVfIYGCb90iykJuGiXhZQdUAZYFL5+MctWYSVvPX2?= =?us-ascii?Q?85RIrrsowUfc+tq2hsy9WJcr9IdCQGe0hLa0W17peBtQPqSIV18PwUWVx/TW?= =?us-ascii?Q?qmh//P+CoweoX3cxgwIkBhVJCEbSfK2cFyb5bTW/xo2EOrrLCzBxKryR52F7?= =?us-ascii?Q?2ah0I5IbeoNhal42IRjukAmjkZTd1tvUExI9rjwReymj2+wVJ3J2wdkXcpD4?= =?us-ascii?Q?D1bkQYsmDPPkDJPZ6prRKQd+42muEYQoC/0Gwtfzak5BufP+aNWILUQVgQd8?= =?us-ascii?Q?aXhU1KLj0aD6UAfAL/IA20G38B9asee3L1ML+0fPayXM0j+rzyDwvVfK+tof?= =?us-ascii?Q?B+AWx8QBDU5QJvL2GIh13WxafxETdQsQ?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: c000c443-3748-4e40-5a0a-08da25a35fc8 X-MS-Exchange-CrossTenant-AuthSource: AS8PR01MB7944.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Apr 2022 03:34:44.4927 (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: AM6PR0102MB3062 Subject: [FFmpeg-devel] [PATCH 08/32] fate/image: 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Also reduce the amount of repetitions a bit. Signed-off-by: Andreas Rheinhardt --- tests/fate/image.mak | 129 +++++++++++++++++++------------------------ 1 file changed, 57 insertions(+), 72 deletions(-) diff --git a/tests/fate/image.mak b/tests/fate/image.mak index 63076f8ded..c8e0d321ef 100644 --- a/tests/fate/image.mak +++ b/tests/fate/image.mak @@ -1,13 +1,12 @@ +ADD_SCALE_IF = $(if $(findstring -vf scale,$(1)), SCALE_FILTER) + FATE_ALIASPIX += fate-aliaspix-bgr fate-aliaspix-bgr: CMD = transcode alias_pix $(TARGET_SAMPLES)/aliaspix/first.pix image2 "-c alias_pix" "-map 0 -map 0 -pix_fmt:0 bgr24 -c:v:1 copy" FATE_ALIASPIX += fate-aliaspix-gray fate-aliaspix-gray: CMD = transcode alias_pix $(TARGET_SAMPLES)/aliaspix/firstgray.pix image2 "-c alias_pix" "-map 0 -map 0 -pix_fmt:0 gray -c:v:1 copy" -FATE_ALIASPIX-$(call ALLYES, FILE_PROTOCOL IMAGE2_ALIAS_PIX_DEMUXER \ - ALIAS_PIX_DECODER ALIAS_PIX_ENCODER \ - IMAGE2_MUXER RAWVIDEO_ENCODER \ - FRAMECRC_MUXER PIPE_PROTOCOL) += $(FATE_ALIASPIX) +FATE_ALIASPIX-$(call TRANSCODE, ALIAS_PIX, IMAGE2 IMAGE2_ALIAS_PIX) += $(FATE_ALIASPIX) FATE_IMAGE += $(FATE_ALIASPIX-yes) fate-aliaspix: $(FATE_ALIASPIX-yes) @@ -17,29 +16,29 @@ fate-brenderpix-24: CMD = framecrc -c:v brender_pix -i $(TARGET_SAMPLES)/brender FATE_BRENDERPIX += fate-brenderpix-565 fate-brenderpix-565: CMD = framecrc -c:v brender_pix -i $(TARGET_SAMPLES)/brenderpix/maximafront.pix -FATE_BRENDERPIX += fate-brenderpix-defpal +FATE_BRENDERPIX-$(call DEMDEC, IMAGE2, BRENDER_PIX, SCALE_FILTER) += fate-brenderpix-defpal fate-brenderpix-defpal: CMD = framecrc -c:v brender_pix -i $(TARGET_SAMPLES)/brenderpix/rivrock1.pix -pix_fmt rgb24 -vf scale -FATE_BRENDERPIX += fate-brenderpix-intpal +FATE_BRENDERPIX-$(call DEMDEC, IMAGE2, BRENDER_PIX, SCALE_FILTER) += fate-brenderpix-intpal fate-brenderpix-intpal: CMD = framecrc -c:v brender_pix -i $(TARGET_SAMPLES)/brenderpix/testtex.pix -pix_fmt rgb24 -vf scale FATE_BRENDERPIX += fate-brenderpix-y400a fate-brenderpix-y400a: CMD = framecrc -c:v brender_pix -i $(TARGET_SAMPLES)/brenderpix/gears.pix FATE_BRENDERPIX-$(call DEMDEC, IMAGE2, BRENDER_PIX) += $(FATE_BRENDERPIX) -FATE_IMAGE += $(FATE_BRENDERPIX-yes) +FATE_IMAGE_FRAMECRC += $(FATE_BRENDERPIX-yes) fate-brenderpix: $(FATE_BRENDERPIX-yes) -FATE_IMAGE-$(call PARSERDEMDEC, BMP, IMAGE2PIPE, BMP) += fate-bmpparser +FATE_IMAGE_FRAMECRC-$(call PARSERDEMDEC, BMP, IMAGE2PIPE, BMP, SCALE_FILTER) += fate-bmpparser fate-bmpparser: CMD = framecrc -f image2pipe -i $(TARGET_SAMPLES)/bmp/numbers.bmp -pix_fmt rgb24 -vf scale define FATE_IMGSUITE_DDS -FATE_DDS += fate-dds-$(1) -fate-dds-$(1): CMD = framecrc -i $(TARGET_SAMPLES)/dds/fate_$(1).dds $(DDS_OPTS_$(1)) -vf scale +FATE_DDS-$(call DEMDEC, IMAGE2, DDS, $(call ADD_SCALE_IF, $(DDS_OPTS_$(1)))) += fate-dds-$(1) +fate-dds-$(1): CMD = framecrc -i $(TARGET_SAMPLES)/dds/fate_$(1).dds $(DDS_OPTS_$(1)) endef -DDS_OPTS_pal = -sws_flags +accurate_rnd+bitexact -pix_fmt rgba -DDS_OPTS_pal-ati = -sws_flags +accurate_rnd+bitexact -pix_fmt rgba +DDS_OPTS_pal := -sws_flags +accurate_rnd+bitexact -pix_fmt rgba -vf scale +DDS_OPTS_pal-ati:= -sws_flags +accurate_rnd+bitexact -pix_fmt rgba -vf scale DDS_FMT = alpha8 \ argb \ argb-aexp \ @@ -90,14 +89,15 @@ DDS_FMT = alpha8 \ yuyv $(foreach FMT,$(DDS_FMT),$(eval $(call FATE_IMGSUITE_DDS,$(FMT)))) -FATE_DDS-$(call DEMDEC, IMAGE2, DDS) += $(FATE_DDS) -FATE_IMAGE += $(FATE_DDS-yes) +FATE_IMAGE_FRAMECRC += $(FATE_DDS-yes) fate-dds: $(FATE_DDS-yes) -FATE_IMAGE-$(call DEMDEC, IMAGE2, DPX) += fate-dpx +FATE_IMAGE_FRAMECRC-$(call DEMDEC, IMAGE2, DPX) += fate-dpx fate-dpx: CMD = framecrc -i $(TARGET_SAMPLES)/dpx/lighthouse_rgb48.dpx -FATE_SAMPLES_AVCONV-$(call PARSERDEMDEC, DPX, IMAGE2PIPE, DPX) += fate-dpxparser +# The following sample has frames whose dimensions differ on a per-frame basis +# and therefore needs the scale filter. +FATE_IMAGE_FRAMECRC-$(call PARSERDEMDEC, DPX, IMAGE2PIPE, DPX, SCALE_FILTER) += fate-dpxparser fate-dpxparser: CMD = framecrc -f image2pipe -i $(TARGET_SAMPLES)/dpx/lena_4x_concat.dpx -sws_flags +accurate_rnd+bitexact FATE_IMAGE_PROBE-$(call DEMDEC, IMAGE2, DPX) += fate-dpx-probe @@ -226,7 +226,7 @@ fate-exr-rgb-scanline-pxr24-float-half-l1: CMD = framecrc -i $(TARGET_SAMPLES)/e FATE_EXR += fate-exr-rgb-scanline-pxr24-float-half-l2 fate-exr-rgb-scanline-pxr24-float-half-l2: CMD = framecrc -layer "VRaySamplerInfo" -i $(TARGET_SAMPLES)/exr/rgb_scanline_pxr24_float_half.exr -pix_fmt gbrapf32le -FATE_EXR += fate-exr-rgb-scanline-pxr24-half-uint32-13x9 +FATE_EXR-$(call DEMDEC, IMAGE2, EXR, SCALE_FILTER) += fate-exr-rgb-scanline-pxr24-half-uint32-13x9 fate-exr-rgb-scanline-pxr24-half-uint32-13x9: CMD = framecrc -layer "VRaySamplerInfo" -i $(TARGET_SAMPLES)/exr/rgb_scanline_pxr24_half_uint32_13x9.exr -pix_fmt rgb48le -vf scale FATE_EXR += fate-exr-rgb-scanline-zip-half-float-l1 @@ -328,10 +328,10 @@ fate-exr-rgb-scanline-zip-half-0x0-0xFFFF: CMD = framecrc -i $(TARGET_SAMPLES)/e FATE_EXR-$(call DEMDEC, IMAGE2, EXR) += $(FATE_EXR) -FATE_IMAGE += $(FATE_EXR-yes) +FATE_IMAGE_FRAMECRC += $(FATE_EXR-yes) fate-exr: $(FATE_EXR-yes) -FATE_JPG += fate-jpg-12bpp +FATE_JPG-$(call DEMDEC, IMAGE2, MJPEG, SCALE_FILTER) += fate-jpg-12bpp fate-jpg-12bpp: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/jpg/12bpp.jpg -f rawvideo -pix_fmt gray16le -vf setsar=sar=sar,scale FATE_JPG += fate-jpg-jfif @@ -341,7 +341,7 @@ FATE_JPG_TRANSCODE-$(call TRANSCODE, MJPEG, MJPEG IMAGE_JPEG_PIPE, IMAGE_PNG_PIP fate-jpg-icc: CMD = transcode png_pipe $(TARGET_SAMPLES)/png1/lena-int_rgb24.png mjpeg "-vf scale" "" "" "-show_frames" FATE_JPG-$(call DEMDEC, IMAGE2, MJPEG) += $(FATE_JPG) -FATE_IMAGE += $(FATE_JPG-yes) +FATE_IMAGE_FRAMECRC += $(FATE_JPG-yes) FATE_IMAGE_TRANSCODE += $(FATE_JPG_TRANSCODE-yes) fate-jpg: $(FATE_JPG-yes) $(FATE_JPG_TRANSCODE-yes) @@ -358,20 +358,20 @@ FATE_JPEGLS += fate-jpegls-7bpc fate-jpegls-7bpc: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/jpegls/128.jls FATE_JPEGLS-$(call DEMDEC, IMAGE2, JPEGLS) += $(FATE_JPEGLS) -FATE_IMAGE += $(FATE_JPEGLS-yes) +FATE_IMAGE_FRAMECRC += $(FATE_JPEGLS-yes) fate-jpegls: $(FATE_JPEGLS-yes) -FATE_IMAGE-$(call DEMDEC, IMAGE2, QDRAW) += fate-pict +FATE_IMAGE_FRAMECRC-$(call DEMDEC, IMAGE2, QDRAW) += fate-pict fate-pict: CMD = framecrc -i $(TARGET_SAMPLES)/quickdraw/TRU256.PCT -pix_fmt rgb24 -FATE_IMAGE-$(call DEMDEC, IMAGE2, PICTOR) += fate-pictor +FATE_IMAGE_FRAMECRC-$(call DEMDEC, IMAGE2, PICTOR, SCALE_FILTER) += fate-pictor fate-pictor: CMD = framecrc -i $(TARGET_SAMPLES)/pictor/MFISH.PIC -pix_fmt rgb24 -vf scale -FATE_IMAGE-$(call PARSERDEMDEC, PNG, IMAGE2PIPE, PNG) += fate-pngparser +FATE_IMAGE_FRAMECRC-$(call PARSERDEMDEC, PNG, IMAGE2PIPE, PNG) += fate-pngparser fate-pngparser: CMD = framecrc -f image2pipe -i $(TARGET_SAMPLES)/png1/feed_4x_concat.png -pix_fmt rgba define FATE_IMGSUITE_PNG -FATE_PNG += fate-png-$(1) +FATE_PNG-$(call DEMDEC, IMAGE2, PNG, SCALE_FILTER) += fate-png-$(1) fate-png-$(1): CMD = framecrc -auto_conversion_filters -i $(TARGET_SAMPLES)/png1/lena-$(1).png -sws_flags +accurate_rnd+bitexact -pix_fmt rgb24 endef @@ -394,16 +394,16 @@ fate-png-icc: CMD = transcode png_pipe $(TARGET_SAMPLES)/png1/lena-int_rgb24.png FATE_PNG-$(call DEMDEC, IMAGE2, PNG) += $(FATE_PNG) FATE_PNG_PROBE-$(call DEMDEC, IMAGE2, PNG) += $(FATE_PNG_PROBE) -FATE_IMAGE += $(FATE_PNG-yes) +FATE_IMAGE_FRAMECRC += $(FATE_PNG-yes) FATE_IMAGE_PROBE += $(FATE_PNG_PROBE-yes) FATE_IMAGE_TRANSCODE += $(FATE_PNG_TRANSCODE-yes) fate-png: $(FATE_PNG-yes) $(FATE_PNG_PROBE-yes) $(FATE_PNG_TRANSCODE-yes) -FATE_IMAGE-$(call DEMDEC, IMAGE2, PTX) += fate-ptx +FATE_IMAGE_FRAMECRC-$(call DEMDEC, IMAGE2, PTX, SCALE_FILTER) += fate-ptx fate-ptx: CMD = framecrc -i $(TARGET_SAMPLES)/ptx/_113kw_pic.ptx -pix_fmt rgb24 -vf scale define FATE_IMGSUITE_PSD -FATE_PSD += fate-psd-$(1) +FATE_PSD-$(call DEMDEC, IMAGE2, PSD, SCALE_FILTER) += fate-psd-$(1) fate-psd-$(1): CMD = framecrc -i $(TARGET_SAMPLES)/psd/lena-$(1).psd -sws_flags +accurate_rnd+bitexact -pix_fmt rgb24 -vf scale endef @@ -433,7 +433,7 @@ fate-psd-duo-tone-color: CMD = framecrc -i $(TARGET_SAMPLES)/psd/duotone-color.p FATE_PSD-$(call DEMDEC, IMAGE2, PSD) += $(FATE_PSD) -FATE_IMAGE += $(FATE_PSD-yes) +FATE_IMAGE_FRAMECRC += $(FATE_PSD-yes) fate-psd: $(FATE_PSD-yes) define FATE_IMGSUITE_SGI @@ -446,36 +446,31 @@ SGI_COLORSPACES = gray8 gray16 rgb24 rgb48 rgba rgba64 $(foreach CLSP,$(SGI_COLORSPACES),$(eval $(call FATE_IMGSUITE_SGI,$(CLSP)))) FATE_SGI-$(call DEMDEC, IMAGE2, SGI) += $(FATE_SGI) -FATE_IMAGE += $(FATE_SGI-yes) +FATE_IMAGE_FRAMECRC += $(FATE_SGI-yes) fate-sgi: $(FATE_SGI-yes) -FATE_SUNRASTER += fate-sunraster-1bit-raw -fate-sunraster-1bit-raw: CMD = framecrc -i $(TARGET_SAMPLES)/sunraster/lena-1bit-raw.sun - -FATE_SUNRASTER += fate-sunraster-1bit-rle -fate-sunraster-1bit-rle: CMD = framecrc -i $(TARGET_SAMPLES)/sunraster/lena-1bit-rle.sun - -FATE_SUNRASTER += fate-sunraster-8bit-raw -fate-sunraster-8bit-raw: CMD = framecrc -i $(TARGET_SAMPLES)/sunraster/lena-8bit-raw.sun -pix_fmt rgb24 -vf scale +define FATE_IMGSUITE_SUNRASTER +FATE_SUNRASTER-$(call DEMDEC, IMAGE2, SUNRAST, $(call ADD_SCALE_IF, $(SUNRASTER_OPTS_$(1)))) += fate-sunraster-$(1) +fate-sunraster-$(1): CMD = framecrc -i $(TARGET_SAMPLES)/sunraster/lena-$(1).sun $(SUNRASTER_OPTS_$(1)) +endef +SUNRASTER_OPTS_8bit-raw := -pix_fmt rgb24 -vf scale +SUNRASTER_OPTS_8bit-rle := -pix_fmt rgb24 -vf scale +SUNRASTER_TESTS := 1bit-raw 1bit-rle 8bit-raw 8bit-rle 24bit-raw 24bit-rle +$(foreach TEST,$(SUNRASTER_TESTS),$(eval $(call FATE_IMGSUITE_SUNRASTER,$(TEST)))) FATE_SUNRASTER += fate-sunraster-8bit_gray-raw fate-sunraster-8bit_gray-raw: CMD = framecrc -i $(TARGET_SAMPLES)/sunraster/gray.ras -FATE_SUNRASTER += fate-sunraster-8bit-rle -fate-sunraster-8bit-rle: CMD = framecrc -i $(TARGET_SAMPLES)/sunraster/lena-8bit-rle.sun -pix_fmt rgb24 -vf scale - -FATE_SUNRASTER += fate-sunraster-24bit-raw -fate-sunraster-24bit-raw: CMD = framecrc -i $(TARGET_SAMPLES)/sunraster/lena-24bit-raw.sun - -FATE_SUNRASTER += fate-sunraster-24bit-rle -fate-sunraster-24bit-rle: CMD = framecrc -i $(TARGET_SAMPLES)/sunraster/lena-24bit-rle.sun - FATE_SUNRASTER-$(call DEMDEC, IMAGE2, SUNRAST) += $(FATE_SUNRASTER) -FATE_IMAGE += $(FATE_SUNRASTER-yes) +FATE_IMAGE_FRAMECRC += $(FATE_SUNRASTER-yes) fate-sunraster: $(FATE_SUNRASTER-yes) -FATE_TARGA = CBW8 \ +define FATE_IMGSUITE_TARGA +FATE_TARGA-$(call DEMDEC, IMAGE2, TARGA, $(call ADD_SCALE_IF, $(TARGA_OPTS_$(1)))) += fate-targa-conformance-$(1) +fate-targa-conformance-$(1): CMD = framecrc -i $(TARGET_SAMPLES)/targa-conformance/$(1).TGA $(TARGA_OPTS_$(1)) +endef +TARGA_FMT := CBW8 \ CCM8 \ CTC16 \ CTC24 \ @@ -485,28 +480,17 @@ FATE_TARGA = CBW8 \ UTC16 \ UTC24 \ UTC32 +TARGA_OPTS_CCM8 := -pix_fmt rgba -vf scale +TARGA_OPTS_UCM8 := -pix_fmt rgba -vf scale +TARGA_OPTS_UTC16 := -pix_fmt rgb555le +$(foreach FMT,$(TARGA_FMT),$(eval $(call FATE_IMGSUITE_TARGA,$(FMT)))) -FATE_TARGA := $(FATE_TARGA:%=fate-targa-conformance-%) \ - fate-targa-top-to-bottom - -FATE_TARGA-$(call DEMDEC, IMAGE2, TARGA) += $(FATE_TARGA) +FATE_TARGA-$(call DEMDEC, IMAGE2, TARGA) += fate-targa-top-to-bottom +fate-targa-top-to-bottom: CMD = framecrc -i $(TARGET_SAMPLES)/targa/lena-top-to-bottom.tga -FATE_IMAGE += $(FATE_TARGA-yes) +FATE_IMAGE_FRAMECRC += $(FATE_TARGA-yes) fate-targa: $(FATE_TARGA-yes) -fate-targa-conformance-CBW8: CMD = framecrc -i $(TARGET_SAMPLES)/targa-conformance/CBW8.TGA -fate-targa-conformance-CCM8: CMD = framecrc -i $(TARGET_SAMPLES)/targa-conformance/CCM8.TGA -pix_fmt rgba -vf scale -fate-targa-conformance-CTC16: CMD = framecrc -i $(TARGET_SAMPLES)/targa-conformance/CTC16.TGA -pix_fmt rgb555le -fate-targa-conformance-CTC24: CMD = framecrc -i $(TARGET_SAMPLES)/targa-conformance/CTC24.TGA -fate-targa-conformance-CTC32: CMD = framecrc -i $(TARGET_SAMPLES)/targa-conformance/CTC32.TGA -pix_fmt bgra -fate-targa-conformance-UBW8: CMD = framecrc -i $(TARGET_SAMPLES)/targa-conformance/UBW8.TGA -fate-targa-conformance-UCM8: CMD = framecrc -i $(TARGET_SAMPLES)/targa-conformance/UCM8.TGA -pix_fmt rgba -vf scale -fate-targa-conformance-UTC16: CMD = framecrc -i $(TARGET_SAMPLES)/targa-conformance/UTC16.TGA -pix_fmt rgb555le -fate-targa-conformance-UTC24: CMD = framecrc -i $(TARGET_SAMPLES)/targa-conformance/UTC24.TGA -fate-targa-conformance-UTC32: CMD = framecrc -i $(TARGET_SAMPLES)/targa-conformance/UTC32.TGA -pix_fmt bgra - -fate-targa-top-to-bottom: CMD = framecrc -i $(TARGET_SAMPLES)/targa/lena-top-to-bottom.tga - FATE_TIFF += fate-tiff-fax-g3 fate-tiff-fax-g3: CMD = framecrc -i $(TARGET_SAMPLES)/CCITT_fax/G31D.TIF @@ -515,7 +499,7 @@ fate-tiff-fax-g3s: CMD = framecrc -i $(TARGET_SAMPLES)/CCITT_fax/G31DS.TIF FATE_TIFF-$(call DEMDEC, IMAGE2, TIFF) += $(FATE_TIFF) -FATE_IMAGE += $(FATE_TIFF-yes) +FATE_IMAGE_FRAMECRC += $(FATE_TIFF-yes) fate-tiff: $(FATE_TIFF-yes) FATE_WEBP += fate-webp-rgb-lossless @@ -524,7 +508,7 @@ fate-webp-rgb-lossless: CMD = framecrc -i $(TARGET_SAMPLES)/webp/rgb_lossless.we FATE_WEBP += fate-webp-rgb-lena-lossless fate-webp-rgb-lena-lossless: CMD = framecrc -i $(TARGET_SAMPLES)/webp/rgb_lena_lossless.webp -FATE_WEBP += fate-webp-rgb-lena-lossless-rgb24 +FATE_WEBP-$(call DEMDEC, IMAGE2, WEBP, SCALE_FILTER) += fate-webp-rgb-lena-lossless-rgb24 fate-webp-rgb-lena-lossless-rgb24: CMD = framecrc -i $(TARGET_SAMPLES)/webp/rgb_lena_lossless.webp -pix_fmt rgb24 -vf scale FATE_WEBP += fate-webp-rgba-lossless @@ -541,10 +525,10 @@ FATE_WEBP += fate-webp-rgba-lossy-q80 fate-webp-rgba-lossy-q80: CMD = framecrc -i $(TARGET_SAMPLES)/webp/rgba_q80.webp FATE_WEBP-$(call DEMDEC, IMAGE2, WEBP) += $(FATE_WEBP) -FATE_IMAGE += $(FATE_WEBP-yes) +FATE_IMAGE_FRAMECRC += $(FATE_WEBP-yes) fate-webp: $(FATE_WEBP-yes) -FATE_IMAGE-$(call DEMDEC, IMAGE2, XFACE) += fate-xface +FATE_IMAGE_FRAMECRC-$(call DEMDEC, IMAGE2, XFACE) += fate-xface fate-xface: CMD = framecrc -i $(TARGET_SAMPLES)/xface/lena.xface FATE_XBM += fate-xbm10 @@ -554,9 +538,10 @@ FATE_XBM += fate-xbm11 fate-xbm11: CMD = framecrc -i $(TARGET_SAMPLES)/xbm/lbw.xbm FATE_XBM-$(call DEMDEC, IMAGE2, XBM) += $(FATE_XBM) -FATE_IMAGE += $(FATE_XBM-yes) +FATE_IMAGE_FRAMECRC += $(FATE_XBM-yes) fate-xbm: $(FATE_XBM-yes) +FATE_IMAGE-$(call ALLYES, FILE_PROTOCOL FRAMECRC_MUXER PIPE_PROTOCOL) += $(FATE_IMAGE_FRAMECRC) $(FATE_IMAGE_FRAMECRC-yes) FATE_IMAGE += $(FATE_IMAGE-yes) FATE_IMAGE_PROBE += $(FATE_IMAGE_PROBE-yes) FATE_IMAGE_TRANSCODE += $(FATE_IMAGE_TRANSCODE-yes) -- 2.32.0 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".