From patchwork Sun Apr 24 03:33:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35403 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b9e:b0:7d:cfb5:dc7c with SMTP id b30csp1219765pzh; Sat, 23 Apr 2022 20:36:08 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwsFJqYzHUmJi5rnZ+eAIZslUUaC/RaXpuZqOkLLmbHuvfda+u7NibR6IbQ2e7Si6hIo6xq X-Received: by 2002:a05:6402:5241:b0:423:d979:30ca with SMTP id t1-20020a056402524100b00423d97930camr12492840edd.291.1650771368701; Sat, 23 Apr 2022 20:36:08 -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 c24-20020a170906529800b006efa8a6d115si11125161ejm.121.2022.04.23.20.36.08; Sat, 23 Apr 2022 20:36:08 -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=FfxZyPAp; 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 DC70D68B302; Sun, 24 Apr 2022 06:35:01 +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-oln040092075060.outbound.protection.outlook.com [40.92.75.60]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BECF368B2D8 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=aDuDlAVgNkCOeG580ufdE2VL+tq2iRErEGgVUTZiEfqlTt2mo5eRy9mIzWjzU7xHN/+ExDwQZly0QY50Dlum+sy7/lPS9H8R9cvPzexrPSSd5yC0eI5P8ZuTJO9/UwBi1krYRW2/NK7iAGnrksCl8GzoRF/gcU/Gkj4A8CSPFW8MQVLOCZKCSnk8r1sWRhGRO3oYZq5m6Dvzurbeh2HEHQrXdoCqVcgkrhKG4hHdLU+mJZohRxPo8KtAd3bYRa/JClSOGOb/XHckv4unxNzdpIAmDf4eeQTWWdsyf9rPDtL05Jdd17fle20FW6JrsbYw1EMLfeT5EysFtaK/4sYr9g== 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=/CA3jFoyxh8UW9io7qwyBXk1pSKjaNM67j0qwuUH8iw=; b=ZctyPFnZcVSjkctsb0f2M5AwvfIWbJj8B5U0y77S4I0uj0aFu655TvSjdN3OGllzPlxE7TPyWSf7Qv+uLk9r6btbGgZJ1iy/6WpC9E/iwUIieO20tvSmrPGgWFgUzLMOH6eop+qe5RM39coOR6ZuJUc0bbepeRRqt/i7J7V12pkrgYrTPRy3V+tIw80fCzR4ZysK0B04VPsubSMBd+LqRMZQq0XjR5WYqpMIOV8TvHzsJ9c+MzlMMkYHUhm6hVB9yMT46/DTihTZ7ux01IptdF6rIg2ZAFo3uBKwLNQHz1rXvDFpnhwrtEuWg5WZNYbrpFuyp+ltuTHXntjdoG7VBw== 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=/CA3jFoyxh8UW9io7qwyBXk1pSKjaNM67j0qwuUH8iw=; b=FfxZyPApB1E58LaA1Aeod/FLhUWGwJV4BWgtdBxvCnUGgTnoD0j76ZCgoSyRTt2AtBubtM/HuP9JQWV+EgUwdTJ9kJpz/dgILqo4TEGlCiYumtrNBhVKZ8M3qS5U3NCnfdkV0iSjV8aPZsyIYRmH8vrXuHuzpKY8UeK8NTLLLVzcWWGAG24CvXLXfBDqPVnVNwYk3CiOg7tRQONNPWkQQJA5lo+QHJsAMwn4xsr7NTxCfL3QvttZbfWXDUshgqAtBk4/Dra/uGHZ2YUaQSXIkLAkcUC0Ra4eCgvTfVk7kFw6jy8WgnknG7NegMWSSo0FN6J+Rbc754xFPwaILwy9VQ== 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:47 +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:47 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 24 Apr 2022 05:33:56 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [F2wWuZbXNaiuXDzR6YhEvrbFC8z+OhpE] 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-10-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 94b2728e-0e1c-4991-bfaf-08da25a36181 X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/UL9mvhPTGbvwy9cgLHAFHXfH4bWiO1gE0snAkgFSfEFKME3kfbG8aTlr0WpxycHD6pD6H4RR8dxTxYitmRom/rhgJhJPSzlIjgkKgFoxPVcup5cf1+KwGWc05ARHU78d9RPnJPuiv1+ByYdkutMEwwGvXo3rAVv9rDZjms56U+SkQBnpqqwJBKGF/w/tNF5DdogRch5u93rQ8++GaXa6Cgc2fLwDWHRQOiLsm2vX0qydjC9jCdxRTC7FUzcBNpu4NA28jbd0wvcrsT7PQaV1xHz5tGvx0KEuxpiftQHxdUrWYtr1VjdAgJZ4Xltkluh+eAAGyHA7bzwlYzmXx6vn03Vo35bn0N21GBv9SxKoLHRGrkqH9bdd/iU3uOpLQ2hdFiw0yRb9PXbsLGn029E6ZZSjF/4Bn84KsTilH6vypQKWCZHGcbZCr1CKr2VPRFVvQT2SzXRqOumUz4kAfS2fuJDJq6i3gKbvODTGSsmr9vfpfekrK+6dajFKrvZunzQh9m/YFRGp8WJOZAQNhg3qCT7ypdBqiwaRXkL1Bj2Zntv38NOIzzUIZi73rLNU7IomO5lfv8lEhkno8O1UWZYryWI9dBkpN5LVXreO+S1UICQLrgghclooS/YAFSidCZweoohEHq/CDAC0tI5RBs+Ic996AcegiFipk//9LwUtg04XzTyP14eDe8iR4Y13Cg7uTFCrRpPfOAzNQ== X-MS-TrafficTypeDiagnostic: AM6PR0102MB3062:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: mlE2o6pKvOqb1sWLmYiW6PU5Z7j3SXFIfQr9iRo6MooEV4ECd79YixRMiShmHerkCwuGChzhScVNH60nN9cU/MFOsybj8SSPvROs1OpjQJCyXdB5Jx2bXy/uEJPw+FqNIecsOZU0KjIPwATq5pLM5AqtGmlb0L0E/kQma8oCV+Ryxxj0as0XyvxKbJIRotxRkIPqczuNnRoSTzRNmQ2oi4PxkCMVGF3vZpzsh7NTQnife8kSRSk3fiSjqCYJcceOGyB3lEOKD6Qb5cyYVoA1f99hTik5BiwZUgia1bx7kXarHXllTlsyQ8ExaWai7FathKuQtcGzWeXPl5rVbL9IMXH/YZPEDjUbtP3qYuO5esH6fOY5q1wBNgGZ6+kbDtanXCHunOMbXm8WPCjYEBIv7a9kvP9zxweZa/06OPDTbF43Vh/hx+17uVG7agsGZjd9FzyLIGcdMoXc9L/D/oLgMeOMYYheYj7+tY/NuVbeGc9NsSC+se0Q+AuaoowELtHYeA8ShzVhYOa0n5mQFSQKOQ4NR+DREN5ehKqXBZ5BdKX1IPUV2eT8k1pm8p4Qgv63F37oBKjKxeHHIsSNOBgpWw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: fJPsij4XQ2uhw15r8YFaLhUzsQnjBjY7ktOxLX7IjKZyPELuNYHZ7SEssiGTWQvAMVQMzxYc61YJF9BwzVBWn3dUgoiwh8ZxQPobtsptC+RWIMukgshWFjAwcM/Ai/aeoKepYq7N7QVrbzayMQDul654PK7SLMgmrlvOzSQ+aLCTXgnLnYW+y7qy0pe5kczcLPC3AFTn18sdJAL0PzqQt1+qRPD/eQ3mVeQvrIF4AKRtOZJwerh2ERm5T+/NFGfhEkm0O1W848ed+vkSo7V4+wwESEOYcr7xNR/NdFScBmJi7Uo5P+zbGFBBNsLQNjMH+lbSxuVnZUNAjo85bVg5QYrMMS3qlT3Shjtg8gTsEdG6nGDzBFsk0/LimiL7yzFNq5locuxC0DOuQdms++jgmVvN5hufLO85C44wmWFCZZzOTNnq1OytU8nNvXuLawIODMyM+4Qt5VFHGfsHx+cx23DDoBIhGFXA2YG8ndXdCVq/xqDptCLv1I6cv7zpW7rObxbU8iMV6tJLFVp+AFOmPgcYJXh/+/VVGM2zbo7Js/dWyGbGiEciXe04F59RJKr4RbJ/G/S9YOT6RCGq8nczQzRGrdAIucS0KogcyxG3vTedZcxHtkbZdsKMszrB/32yXnE9lMA7GlaKZF2zidTz1ehv/6atjwAtyLDD3gYTTWAoEM24QnaLDucjtz4xigy+AJcOcSPWfdTE3Wn7WnYWmPpxaS34oh+wXqtbaWPltfTsTRnHEcv829Tl1qxKWJbCLBzMVoi7HkWuKI0vUwHPk2ozLEkmcE67E22PDkVhQ/R28DGvV0waSH5rohwZWWSJG87tu1DdRRGjCLE/oiLRT40wlE1BC+duecy8ljRwlXGrFtqpALf0juo33coRy9JPgGPUSO96+H9JSIvdE87ip/dzXtGdAyCJQiQKJonUUwar/dOZGdrd0YsnEIJ4ceYklOEIUB8VMT4wcO9jlcw/dzQTHzpA2KyIQaV9SCxc7d52psWCSmXUvY3fGSTIoxn6A5rPFGDaAfo9tqLh9SExpGowUTJeonK5ldQMMsziLGpUCOOSHzjTFk34D73OcrQyqOiFwS+vF4dkYLfIurFNKVvR+OewPmUnS/s0TKiZ1xyMfM2GvyG0FKk4CVoeJMHxkBgDnQZXxzlLOkMyru+AmkKB2/FD345b5q23KPZF2VPXjILfUKBW3IQucFRFsxEYMYd9Mf2SOXpi41EKBOT5B71KW71F7IFkBeJuZpP/uV2sGw77I8uUATBWljAGVdR7K5ds3CbEhv5/gtS2F9LBs1RGBvLXg03JQ1bpjxdFAHIRv5wNs+Z2z7eRvncJl+L7nLh+vTj5jqQcmfsEIXt7z+ncGKhEnyu+6fbZhu+HNqzMFhgTEJFi4eF0ve0b580rig4BS5wGYYnfaSI8XqhvT8uU00rVbi2y6Z4T8n0gMJnrJjzAagCe2G406Ym5iXAl X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 94b2728e-0e1c-4991-bfaf-08da25a36181 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:47.6041 (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 11/32] fate/video: Fix test requirements X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: PTCo08kk7zYC In particular, add the missing dependency on the scale and aresample filters (and therefore on libswscale resp. libswresample). Signed-off-by: Andreas Rheinhardt --- tests/fate/video.mak | 216 ++++++++++++++++++++++--------------------- 1 file changed, 110 insertions(+), 106 deletions(-) diff --git a/tests/fate/video.mak b/tests/fate/video.mak index dff1f13e88..40cdd9e3b6 100644 --- a/tests/fate/video.mak +++ b/tests/fate/video.mak @@ -4,55 +4,56 @@ fate-4xm-1: CMD = framecrc -i $(TARGET_SAMPLES)/4xm/version1.4xm -pix_fmt rgb24 FATE_4XM += fate-4xm-2 fate-4xm-2: CMD = framecrc -i $(TARGET_SAMPLES)/4xm/version2.4xm -pix_fmt rgb24 -an -vf scale -FATE_VIDEO-$(call DEMDEC, FOURXM, FOURXM) += $(FATE_4XM) -fate-4xm: $(FATE_4XM) +FATE_4XM-$(call FRAMECRC, FOURXM, FOURXM, SCALE_FILTER) += $(FATE_4XM) +FATE_VIDEO += $(FATE_4XM-yes) +fate-4xm: $(FATE_4XM-yes) -FATE_VIDEO-$(call DEMDEC, AVI, ZERO12V) += fate-012v +FATE_VIDEO-$(call FRAMECRC, AVI, ZERO12V, SCALE_FILTER) += fate-012v fate-012v: CMD = framecrc -i $(TARGET_SAMPLES)/012v/sample.avi -pix_fmt yuv422p16le -vf scale -FATE_VIDEO-$(call DEMDEC, AVI, AASC) += fate-aasc +FATE_VIDEO-$(call FRAMECRC, AVI, AASC, SCALE_FILTER) += fate-aasc fate-aasc: CMD = framecrc -i $(TARGET_SAMPLES)/aasc/AASC-1.5MB.AVI -pix_fmt rgb24 -vf scale -FATE_VIDEO-$(call DEMDEC, MOV, AIC) += fate-aic +FATE_VIDEO-$(call FRAMECRC, MOV, AIC) += fate-aic fate-aic: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/aic/small_apple_intermediate_codec.mov -an -frames:v 15 -FATE_VIDEO-$(call DEMDEC, MOV, AIC) += fate-aic-oddsize +FATE_VIDEO-$(call FRAMECRC, MOV, AIC) += fate-aic-oddsize fate-aic-oddsize: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/aic/aic_odd_dimensions.mov -FATE_VIDEO-$(call DEMDEC, MM, MMVIDEO) += fate-alg-mm +FATE_VIDEO-$(call FRAMECRC, MM, MMVIDEO, SCALE_FILTER) += fate-alg-mm fate-alg-mm: CMD = framecrc -i $(TARGET_SAMPLES)/alg-mm/ibmlogo.mm -an -pix_fmt rgb24 -vf scale -FATE_VIDEO-$(call DEMDEC, AVI, AMV) += fate-amv +FATE_VIDEO-$(call FRAMECRC, AVI, AMV) += fate-amv fate-amv: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/amv/MTV_high_res_320x240_sample_Penguin_Joke_MTV_from_WMV.amv -t 10 -an -FATE_VIDEO-$(call DEMDEC, TTY, ANSI) += fate-ansi +FATE_VIDEO-$(call FRAMECRC, TTY, ANSI, SCALE_FILTER) += fate-ansi fate-ansi: CMD = framecrc -chars_per_frame 44100 -i $(TARGET_SAMPLES)/ansi/TRE-IOM5.ANS -pix_fmt rgb24 -vf scale -FATE_VIDEO-$(call DEMDEC, TTY, ANSI) += fate-ansi256 +FATE_VIDEO-$(call FRAMECRC, TTY, ANSI, SCALE_FILTER) += fate-ansi256 fate-ansi256: CMD = framecrc -chars_per_frame 44100 -i $(TARGET_SAMPLES)/ansi/ansi256.ans -pix_fmt rgb24 -vf scale -FATE_VIDEO-$(call DEMDEC, RPL, ESCAPE124) += fate-armovie-escape124 +FATE_VIDEO-$(call FRAMECRC, RPL, ESCAPE124, ARESAMPLE_FILTER SCALE_FILTER) += fate-armovie-escape124 fate-armovie-escape124: CMD = framecrc -i $(TARGET_SAMPLES)/rpl/ESCAPE.RPL -pix_fmt rgb24 -vf scale -af aresample -FATE_VIDEO-$(call DEMDEC, RPL, ESCAPE130) += fate-armovie-escape130 +FATE_VIDEO-$(call FRAMECRC, RPL, ESCAPE130) += fate-armovie-escape130 fate-armovie-escape130: CMD = framecrc -i $(TARGET_SAMPLES)/rpl/landing.rpl -an -FATE_VIDEO-$(call DEMDEC, AVI, AURA) += fate-auravision-v1 +FATE_VIDEO-$(call FRAMECRC, AVI, AURA) += fate-auravision-v1 fate-auravision-v1: CMD = framecrc -i $(TARGET_SAMPLES)/auravision/SOUVIDEO.AVI -an -FATE_VIDEO-$(call DEMDEC, AVI, AURA2) += fate-auravision-v2 +FATE_VIDEO-$(call FRAMECRC, AVI, AURA2) += fate-auravision-v2 fate-auravision-v2: CMD = framecrc -i $(TARGET_SAMPLES)/auravision/salma-hayek-in-ugly-betty-partial-avi -an -FATE_VIDEO-$(call DEMDEC, AVI, AVRN) += fate-avid-interlaced +FATE_VIDEO-$(call FRAMECRC, AVI, AVRN) += fate-avid-interlaced fate-avid-interlaced: CMD = framecrc -i $(TARGET_SAMPLES)/avid/avid_ntsc_interlaced.avi -FATE_VIDEO-$(call DEMDEC, MOV, MJPEG) += fate-avid-meridian +FATE_VIDEO-$(call FRAMECRC, MOV, MJPEG) += fate-avid-meridian fate-avid-meridian: CMD = framecrc -i $(TARGET_SAMPLES)/avid/avidmeridianntsc.mov -FATE_VIDEO-$(call DEMDEC, BETHSOFTVID, BETHSOFTVID) += fate-bethsoft-vid +FATE_VIDEO-$(call FRAMECRC, BETHSOFTVID, BETHSOFTVID, ARESAMPLE_FILTER SCALE_FILTER) += fate-bethsoft-vid fate-bethsoft-vid: CMD = framecrc -i $(TARGET_SAMPLES)/bethsoft-vid/ANIM0001.VID -t 5 -pix_fmt rgb24 -vf scale -af aresample -FATE_VIDEO-$(call DEMDEC, BFI, BFI) += fate-bfi +FATE_VIDEO-$(call FRAMECRC, BFI, BFI, ARESAMPLE_FILTER SCALE_FILTER) += fate-bfi fate-bfi: CMD = framecrc -i $(TARGET_SAMPLES)/bfi/2287.bfi -pix_fmt rgb24 -vf scale -af aresample FATE_BINK_VIDEO += fate-bink-video-b @@ -64,69 +65,69 @@ fate-bink-video-f: CMD = framecrc -i $(TARGET_SAMPLES)/bink/hol2br.bik FATE_BINK_VIDEO += fate-bink-video-i fate-bink-video-i: CMD = framecrc -i $(TARGET_SAMPLES)/bink/RazOnBull.bik -an -FATE_VIDEO-$(call DEMDEC, BINK, BINK) += $(FATE_BINK_VIDEO) +FATE_VIDEO-$(call FRAMECRC, BINK, BINK) += $(FATE_BINK_VIDEO) -FATE_VIDEO-$(call DEMDEC, BMV, BMV_VIDEO) += fate-bmv-video -fate-bmv-video: CMD = framecrc -i $(TARGET_SAMPLES)/bmv/SURFING-partial.BMV -pix_fmt rgb24 -an -vf scale -vf scale +FATE_VIDEO-$(call FRAMECRC, BMV, BMV_VIDEO, SCALE_FILTER) += fate-bmv-video +fate-bmv-video: CMD = framecrc -i $(TARGET_SAMPLES)/bmv/SURFING-partial.BMV -pix_fmt rgb24 -an -vf scale -FATE_VIDEO-$(call DEMDEC, MPEGPS, CAVS) += fate-cavs +FATE_VIDEO-$(call FRAMECRC, MPEGPS, CAVS) += fate-cavs fate-cavs: CMD = framecrc -i $(TARGET_SAMPLES)/cavs/cavs.mpg -an -FATE_VIDEO-$(call DEMDEC, CDG, CDGRAPHICS) += fate-cdgraphics +FATE_VIDEO-$(call FRAMECRC, CDG, CDGRAPHICS, SCALE_FILTER) += fate-cdgraphics fate-cdgraphics: CMD = framecrc -i $(TARGET_SAMPLES)/cdgraphics/BrotherJohn.cdg -pix_fmt rgba -t 1 -vf scale -FATE_CFHD-$(CONFIG_AVI_DEMUXER) += fate-cfhd-1 +FATE_CFHD-$(call FRAMECRC, AVI, CFHD, SCALE_FILTER) += fate-cfhd-1 fate-cfhd-1: CMD = framecrc -i $(TARGET_SAMPLES)/cfhd/cfhd_422.avi -pix_fmt yuv422p10le -vf scale -FATE_CFHD-$(CONFIG_AVI_DEMUXER) += fate-cfhd-2 +FATE_CFHD-$(call FRAMECRC, AVI, CFHD, SCALE_FILTER) += fate-cfhd-2 fate-cfhd-2: CMD = framecrc -i $(TARGET_SAMPLES)/cfhd/cfhd_444.avi -pix_fmt gbrp12le -vf scale -FATE_CFHD-$(CONFIG_MOV_DEMUXER) += fate-cfhd-3 +FATE_CFHD-$(call FRAMECRC, MOV, CFHD, SCALE_FILTER) += fate-cfhd-3 fate-cfhd-3: CMD = framecrc -i $(TARGET_SAMPLES)/cfhd/cfhd_odd.mov -pix_fmt yuv422p10le -vf scale -FATE_VIDEO-$(CONFIG_CFHD_DECODER) += $(FATE_CFHD-yes) +FATE_VIDEO += $(FATE_CFHD-yes) fate-cfhd: $(FATE_CFHD-yes) -FATE_VIDEO-$(call DEMDEC, AVI, CLJR) += fate-cljr +FATE_VIDEO-$(call FRAMECRC, AVI, CLJR) += fate-cljr fate-cljr: CMD = framecrc -i $(TARGET_SAMPLES)/cljr/testcljr-partial.avi -FATE_VIDEO-$(call DEMDEC, AVI, PNG) += fate-corepng -fate-corepng: CMD = framecrc -i $(TARGET_SAMPLES)/png1/corepng-partial.avi -vf scale -af aresample +FATE_VIDEO-$(call FRAMECRC, AVI, PNG, ARESAMPLE_FILTER) += fate-corepng +fate-corepng: CMD = framecrc -i $(TARGET_SAMPLES)/png1/corepng-partial.avi -af aresample -FATE_VIDEO-$(call DEMDEC, AVI, PNG) += fate-rgbapng-4816 +FATE_VIDEO-$(call FRAMECRC, AVI, PNG) += fate-rgbapng-4816 fate-rgbapng-4816: CMD = framecrc -i $(TARGET_SAMPLES)/png1/55c99e750a5fd6_50314226.png -FATE_VIDEO-$(call DEMDEC, AVS, AVS) += fate-creatureshock-avs +FATE_VIDEO-$(call FRAMECRC, AVS, AVS, ARESAMPLE_FILTER SCALE_FILTER) += fate-creatureshock-avs fate-creatureshock-avs: CMD = framecrc -i $(TARGET_SAMPLES)/creatureshock-avs/OUTATIME.AVS -pix_fmt rgb24 -vf scale -af aresample -FATE_CVID-$(CONFIG_MOV_DEMUXER) += fate-cvid-palette +FATE_CVID-$(call FRAMECRC, MOV, CINEPAK, SCALE_FILTER) += fate-cvid-palette fate-cvid-palette: CMD = framecrc -i $(TARGET_SAMPLES)/cvid/catfight-cvid-pal8-partial.mov -pix_fmt rgb24 -an -vf scale -FATE_CVID-$(CONFIG_AVI_DEMUXER) += fate-cvid-partial +FATE_CVID-$(call FRAMECRC, AVI, CINEPAK) += fate-cvid-partial fate-cvid-partial: CMD = framecrc -i $(TARGET_SAMPLES)/cvid/laracroft-cinepak-partial.avi -an -FATE_CVID-$(CONFIG_AVI_DEMUXER) += fate-cvid-grayscale +FATE_CVID-$(call FRAMECRC, AVI, CINEPAK) += fate-cvid-grayscale fate-cvid-grayscale: CMD = framecrc -i $(TARGET_SAMPLES)/cvid/pcitva15.avi -an -FATE_VIDEO-$(CONFIG_CINEPAK_DECODER) += $(FATE_CVID-yes) +FATE_VIDEO += $(FATE_CVID-yes) fate-cvid: $(FATE_CVID-yes) -FATE_VIDEO-$(call DEMDEC, C93, C93) += fate-cyberia-c93 +FATE_VIDEO-$(call FRAMECRC, C93, C93, SCALE_FILTER ARESAMPLE_FILTER) += fate-cyberia-c93 fate-cyberia-c93: CMD = framecrc -i $(TARGET_SAMPLES)/cyberia-c93/intro1.c93 -t 3 -pix_fmt rgb24 -vf scale -af aresample -FATE_VIDEO-$(call DEMDEC, AVI, CYUV) += fate-cyuv +FATE_VIDEO-$(call FRAMECRC, AVI, CYUV) += fate-cyuv fate-cyuv: CMD = framecrc -i $(TARGET_SAMPLES)/cyuv/cyuv.avi -FATE_VIDEO-$(call DEMDEC, DSICIN, DSICINVIDEO) += fate-delphine-cin-video +FATE_VIDEO-$(call FRAMECRC, DSICIN, DSICINVIDEO, SCALE_FILTER) += fate-delphine-cin-video fate-delphine-cin-video: CMD = framecrc -i $(TARGET_SAMPLES)/delphine-cin/LOGO-partial.CIN -pix_fmt rgb24 -an -vf scale -FATE_VIDEO-$(call DEMDEC, ANM, ANM) += fate-deluxepaint-anm +FATE_VIDEO-$(call FRAMECRC, ANM, ANM, SCALE_FILTER) += fate-deluxepaint-anm fate-deluxepaint-anm: CMD = framecrc -i $(TARGET_SAMPLES)/deluxepaint-anm/INTRO1.ANM -pix_fmt rgb24 -vf scale -FATE_VIDEO-$(call DEMDEC, DIRAC, DIRAC) += fate-dirac +FATE_VIDEO-$(call FRAMECRC, DIRAC, DIRAC) += fate-dirac fate-dirac: CMD = framecrc -i $(TARGET_SAMPLES)/dirac/vts.profile-main.drc -FATE_VIDEO-$(call DEMDEC, DIRAC, DIRAC) += fate-dirac-low-delay +FATE_VIDEO-$(call FRAMECRC, DIRAC, DIRAC) += fate-dirac-low-delay fate-dirac-low-delay: CMD = framecrc -i $(TARGET_SAMPLES)/dirac/vts.profile-vc2-low-delay.drc FATE_DXA += fate-dxa-feeble @@ -135,8 +136,9 @@ fate-dxa-feeble: CMD = framecrc -i $(TARGET_SAMPLES)/dxa/meetsquid.dxa -t 2 -pix FATE_DXA += fate-dxa-scummvm fate-dxa-scummvm: CMD = framecrc -i $(TARGET_SAMPLES)/dxa/scummvm.dxa -pix_fmt rgb24 -vf scale -FATE_VIDEO-$(call DEMDEC, DXA, DXA) += $(FATE_DXA) -fate-dxa: $(FATE_DXA) +FATE_DXA-$(call FRAMECRC, DXA, DXA, SCALE_FILTER) += $(FATE_DXA) +FATE_VIDEO += $(FATE_DXA-yes) +fate-dxa: $(FATE_DXA-yes) FATE_DXV += fate-dxv-dxt1 fate-dxv-dxt1: CMD = framecrc -i $(TARGET_SAMPLES)/dxv/dxv-na.mov @@ -150,10 +152,10 @@ fate-dxv3-dxt1: CMD = framecrc -i $(TARGET_SAMPLES)/dxv/dxv3-nqna.mov FATE_DXV += fate-dxv3-dxt5 fate-dxv3-dxt5: CMD = framecrc -i $(TARGET_SAMPLES)/dxv/dxv3-nqwa.mov -FATE_VIDEO-$(call DEMDEC, MOV, DXV) += $(FATE_DXV) +FATE_VIDEO-$(call FRAMECRC, MOV, DXV) += $(FATE_DXV) fate-dxv: $(FATE_DXV) -FATE_VIDEO-$(call DEMDEC, SEGAFILM, CINEPAK) += fate-film-cvid +FATE_VIDEO-$(call FRAMECRC, SEGAFILM, CINEPAK) += fate-film-cvid fate-film-cvid: CMD = framecrc -i $(TARGET_SAMPLES)/film/logo-capcom.cpk -an FATE_FLIC += fate-flic-af11-palette-change @@ -165,49 +167,50 @@ fate-flic-af12: CMD = framecrc -i $(TARGET_SAMPLES)/fli/jj00c2.fli -pix_fmt rgb2 FATE_FLIC += fate-flic-magiccarpet fate-flic-magiccarpet: CMD = framecrc -i $(TARGET_SAMPLES)/fli/intel.dat -pix_fmt rgb24 -vf scale -FATE_VIDEO-$(call DEMDEC, FLIC, FLIC) += $(FATE_FLIC) -fate-flic: $(FATE_FLIC) +FATE_FLIC-$(call FRAMECRC, FLIC, FLIC, SCALE_FILTER) += $(FATE_FLIC) +FATE_VIDEO += $(FATE_FLIC-yes) +fate-flic: $(FATE_FLIC-yes) -FATE_VIDEO-$(call DEMDEC, AVI, FRWU) += fate-frwu +FATE_VIDEO-$(call FRAMECRC, AVI, FRWU) += fate-frwu fate-frwu: CMD = framecrc -i $(TARGET_SAMPLES)/frwu/frwu.avi -FATE_VIDEO-$(call DEMDEC, IDCIN, IDCIN) += fate-id-cin-video +FATE_VIDEO-$(call FRAMECRC, IDCIN, IDCIN, SCALE_FILTER) += fate-id-cin-video fate-id-cin-video: CMD = framecrc -i $(TARGET_SAMPLES)/idcin/idlog-2MB.cin -pix_fmt rgb24 -vf scale -FATE_VIDEO-$(call ENCDEC, ROQ PGMYUV, ROQ IMAGE2) += fate-idroq-video-encode +FATE_VIDEO-$(call ENCDEC, ROQ PGMYUV, ROQ IMAGE2, SCALE_FILTER) += fate-idroq-video-encode fate-idroq-video-encode: CMD = md5 -auto_conversion_filters -f image2 -c:v pgmyuv -i $(TARGET_SAMPLES)/ffmpeg-synthetic/vsynth1/%02d.pgm -r 30 -sws_flags +bitexact -vf pad=512:512:80:112 -f roq -t 0.2 -FATE_IFF-$(CONFIG_IFF_ILBM_DECODER) += fate-iff-byterun1 +FATE_IFF-$(call FRAMECRC, IFF, IFF_ILBM, SCALE_FILTER) += fate-iff-byterun1 fate-iff-byterun1: CMD = framecrc -i $(TARGET_SAMPLES)/iff/ASH.LBM -pix_fmt rgb24 -vf scale -FATE_IFF-$(CONFIG_EIGHTSVX_FIB_DECODER) += fate-iff-fibonacci -fate-iff-fibonacci: CMD = md5 -i $(TARGET_SAMPLES)/iff/dasboot-in-compressed -f s16le -vf scale -af aresample +FATE_IFF-$(call ENCDEC, PCM_S16LE EIGHTSVX_FIB, PCM_S16LE IFF, ARESAMPLE_FILTER) += fate-iff-fibonacci +fate-iff-fibonacci: CMD = md5 -i $(TARGET_SAMPLES)/iff/dasboot-in-compressed -f s16le -af aresample -FATE_IFF-$(CONFIG_IFF_ILBM_DECODER) += fate-iff-ilbm +FATE_IFF-$(call FRAMECRC, IFF, IFF_ILBM, SCALE_FILTER) += fate-iff-ilbm fate-iff-ilbm: CMD = framecrc -i $(TARGET_SAMPLES)/iff/lms-matriks.ilbm -pix_fmt rgb24 -vf scale FATE_VIDEO-$(CONFIG_IFF_DEMUXER) += $(FATE_IFF-yes) fate-iff: $(FATE_IFF-yes) -FATE_VIDEO-$(call DEMDEC, IPMOVIE, INTERPLAY_VIDEO) += fate-interplay-mve-8bit +FATE_VIDEO-$(call FRAMECRC, IPMOVIE, INTERPLAY_VIDEO, SCALE_FILTER) += fate-interplay-mve-8bit fate-interplay-mve-8bit: CMD = framecrc -i $(TARGET_SAMPLES)/interplay-mve/interplay-logo-2MB.mve -pix_fmt rgb24 -an -vf scale -FATE_VIDEO-$(call DEMDEC, IPMOVIE, INTERPLAY_VIDEO) += fate-interplay-mve-16bit +FATE_VIDEO-$(call FRAMECRC, IPMOVIE, INTERPLAY_VIDEO, SCALE_FILTER) += fate-interplay-mve-16bit fate-interplay-mve-16bit: CMD = framecrc -i $(TARGET_SAMPLES)/interplay-mve/descent3-level5-16bit-partial.mve -pix_fmt rgb24 -an -vf scale -FATE_VIDEO-$(call DEMDEC, MXF, JPEG2000) += fate-jpeg2000-dcinema +FATE_VIDEO-$(call FRAMECRC, MXF, JPEG2000, SCALE_FILTER) += fate-jpeg2000-dcinema fate-jpeg2000-dcinema: CMD = framecrc -flags +bitexact -c:v jpeg2000 -i $(TARGET_SAMPLES)/jpeg2000/chiens_dcinema2K.mxf -pix_fmt xyz12le -vf scale -FATE_VIDEO-$(call DEMDEC, JV, JV) += fate-jv +FATE_VIDEO-$(call FRAMECRC, JV, JV, SCALE_FILTER) += fate-jv fate-jv: CMD = framecrc -i $(TARGET_SAMPLES)/jv/intro.jv -an -pix_fmt rgb24 -vf scale -FATE_VIDEO-$(call DEMDEC, AVI, KGV1) += fate-kgv1 +FATE_VIDEO-$(call FRAMECRC, AVI, KGV1, SCALE_FILTER) += fate-kgv1 fate-kgv1: CMD = framecrc -i $(TARGET_SAMPLES)/kega/kgv1.avi -pix_fmt rgb555le -an -vf scale -FATE_VIDEO-$(call DEMDEC, AVI, KMVC) += fate-kmvc +FATE_VIDEO-$(call FRAMECRC, AVI, KMVC, SCALE_FILTER) += fate-kmvc fate-kmvc: CMD = framecrc -i $(TARGET_SAMPLES)/KMVC/LOGO1.AVI -an -t 3 -pix_fmt rgb24 -vf scale -FATE_VIDEO-$(call DEMDEC, AVI, LSCR) += fate-lscr +FATE_VIDEO-$(call FRAMECRC, AVI, LSCR) += fate-lscr fate-lscr: CMD = framecrc -i $(TARGET_SAMPLES)/lscr/lscr_compr9_short.avi FATE_MAGICYUV += fate-magicyuv-y4444i \ @@ -218,7 +221,7 @@ FATE_MAGICYUV += fate-magicyuv-y4444i \ fate-magicyuv-rgba \ fate-magicyuv-rgb -FATE_VIDEO-$(call DEMDEC, AVI, MAGICYUV) += $(FATE_MAGICYUV) +FATE_VIDEO-$(call FRAMECRC, AVI, MAGICYUV) += $(FATE_MAGICYUV) fate-magicyuv: $(FATE_MAGICYUV) fate-magicyuv-rgb: CMD = framecrc -i $(TARGET_SAMPLES)/magy/magy_rgb_median.avi @@ -229,41 +232,41 @@ fate-magicyuv-y422i: CMD = framecrc -i $(TARGET_SAMPLES)/magy/magy_yuv422_media fate-magicyuv-y4444i: CMD = framecrc -i $(TARGET_SAMPLES)/magy/magy_yuv4444_left_interlaced.avi fate-magicyuv-y444: CMD = framecrc -i $(TARGET_SAMPLES)/magy/magy_yuv444_left.avi -FATE_VIDEO-$(call DEMDEC, EA, MDEC) += fate-mdec +FATE_VIDEO-$(call FRAMECRC, EA, MDEC) += fate-mdec fate-mdec: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/ea-dct/NFS2Esprit-partial.dct -an -FATE_VIDEO-$(call DEMDEC, STR, MDEC) += fate-mdec-v3 +FATE_VIDEO-$(call FRAMECRC, STR, MDEC) += fate-mdec-v3 fate-mdec-v3: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/psx-str/abc000_cut.str -an -FATE_VIDEO-$(call DEMDEC, MSNWC_TCP, MIMIC) += fate-mimic +FATE_VIDEO-$(call FRAMECRC, MSNWC_TCP, MIMIC) += fate-mimic fate-mimic: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/mimic/mimic2-womanloveffmpeg.cam -FATE_VIDEO-$(call DEMDEC, MOV, MJPEGB) += fate-mjpegb +FATE_VIDEO-$(call FRAMECRC, MOV, MJPEGB) += fate-mjpegb fate-mjpegb: CMD = framecrc -idct simple -fflags +bitexact -i $(TARGET_SAMPLES)/mjpegb/mjpegb_part.mov -an -FATE_VIDEO-$(call DEMDEC, AVI, MJPEG) += fate-mjpeg-ticket3229 +FATE_VIDEO-$(call FRAMECRC, AVI, MJPEG) += fate-mjpeg-ticket3229 fate-mjpeg-ticket3229: CMD = framecrc -idct simple -fflags +bitexact -i $(TARGET_SAMPLES)/mjpeg/mjpeg_field_order.avi -an -FATE_VIDEO-$(call DEMDEC, MVI, MOTIONPIXELS) += fate-motionpixels +FATE_VIDEO-$(call FRAMECRC, MVI, MOTIONPIXELS, SCALE_FILTER) += fate-motionpixels fate-motionpixels: CMD = framecrc -i $(TARGET_SAMPLES)/motion-pixels/INTRO-partial.MVI -an -pix_fmt rgb24 -frames:v 111 -vf scale -FATE_VIDEO-$(call DEMDEC, MPEGTS, MPEG2VIDEO) += fate-mpeg2-field-enc fate-mpeg2-ticket186 +FATE_VIDEO-$(call FRAMECRC, MPEGTS, MPEG2VIDEO) += fate-mpeg2-field-enc fate-mpeg2-ticket186 fate-mpeg2-field-enc: CMD = framecrc -flags +bitexact -idct simple -i $(TARGET_SAMPLES)/mpeg2/mpeg2_field_encoding.ts -an -frames:v 30 fate-mpeg2-ticket186: CMD = framecrc -flags +bitexact -idct simple -i $(TARGET_SAMPLES)/mpeg2/t.mpg -an -FATE_VIDEO-$(call DEMDEC, MPEGVIDEO, MPEG2VIDEO) += fate-mpeg2-ticket6677 +FATE_VIDEO-$(call FRAMECRC, MPEGVIDEO, MPEG2VIDEO) += fate-mpeg2-ticket6677 fate-mpeg2-ticket6677: CMD = framecrc -flags +bitexact -idct simple -i $(TARGET_SAMPLES)/mpeg2/sony-ct3.bs -FATE_VIDEO-$(call DEMDEC, MV, MVC1) += fate-mv-mvc1 +FATE_VIDEO-$(call FRAMECRC, MV, MVC1, SCALE_FILTER) += fate-mv-mvc1 fate-mv-mvc1: CMD = framecrc -i $(TARGET_SAMPLES)/mv/posture.mv -an -frames 25 -pix_fmt rgb555le -vf scale -FATE_VIDEO-$(call DEMDEC, MV, MVC2) += fate-mv-mvc2 +FATE_VIDEO-$(call FRAMECRC, MV, MVC2, SCALE_FILTER) += fate-mv-mvc2 fate-mv-mvc2: CMD = framecrc -i $(TARGET_SAMPLES)/mv/12345.mv -an -frames 30 -pix_fmt bgra -vf scale -FATE_VIDEO-$(call DEMDEC, MV, SGIRLE) += fate-mv-sgirle +FATE_VIDEO-$(call FRAMECRC, MV, SGIRLE) += fate-mv-sgirle fate-mv-sgirle: CMD = framecrc -i $(TARGET_SAMPLES)/mv/pet-rle.movie -an -FATE_VIDEO-$(call DEMDEC, MXG, MXPEG) += fate-mxpeg +FATE_VIDEO-$(call FRAMECRC, MXG, MXPEG) += fate-mxpeg fate-mxpeg: CMD = framecrc -idct simple -flags +bitexact -i $(TARGET_SAMPLES)/mxpeg/m1.mxg -an # FIXME dropped frames in this test because of coarse timebase @@ -276,43 +279,43 @@ fate-nuv-rtjpeg-fh: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/nuv/rtjpeg_ FATE_VIDEO-$(call DEMDEC, NUV, NUV) += $(FATE_NUV) fate-nuv: $(FATE_NUV) -FATE_VIDEO-$(call DEMDEC, PAF, PAF_VIDEO) += fate-paf-video +FATE_VIDEO-$(call FRAMECRC, PAF, PAF_VIDEO, SCALE_FILTER) += fate-paf-video fate-paf-video: CMD = framecrc -i $(TARGET_SAMPLES)/paf/hod1-partial.paf -pix_fmt rgb24 -an -vf scale -FATE_VIDEO-$(call DEMDEC, AVI, QPEG) += fate-qpeg +FATE_VIDEO-$(call FRAMECRC, AVI, QPEG, SCALE_FILTER) += fate-qpeg fate-qpeg: CMD = framecrc -i $(TARGET_SAMPLES)/qpeg/Clock.avi -an -pix_fmt rgb24 -vf scale -FATE_VIDEO-$(call DEMDEC, AVI, R210) += fate-r210 +FATE_VIDEO-$(call FRAMECRC, AVI, R210, SCALE_FILTER) += fate-r210 fate-r210: CMD = framecrc -i $(TARGET_SAMPLES)/r210/r210.avi -pix_fmt rgb48le -vf scale -FATE_VIDEO-$(call DEMDEC, RL2, RL2) += fate-rl2 +FATE_VIDEO-$(call FRAMECRC, RL2, RL2, SCALE_FILTER) += fate-rl2 fate-rl2: CMD = framecrc -i $(TARGET_SAMPLES)/rl2/Z4915300.RL2 -pix_fmt rgb24 -an -vf scale -FATE_VIDEO-$(call DEMDEC, ROQ, ROQ) += fate-roqvideo +FATE_VIDEO-$(call FRAMECRC, ROQ, ROQ) += fate-roqvideo fate-roqvideo: CMD = framecrc -i $(TARGET_SAMPLES)/idroq/idlogo.roq -an -FATE_VIDEO-$(call DEMDEC, SMUSH, SANM) += fate-sanm +FATE_VIDEO-$(call FRAMECRC, SMUSH, SANM, SCALE_FILTER) += fate-sanm fate-sanm: CMD = framecrc -i $(TARGET_SAMPLES)/smush/ronin_part.znm -an -pix_fmt rgb24 -vf scale -FATE_VIDEO-$(call DEMDEC, VMD, VMDVIDEO) += fate-sierra-vmd-video +FATE_VIDEO-$(call FRAMECRC, VMD, VMDVIDEO, SCALE_FILTER) += fate-sierra-vmd-video fate-sierra-vmd-video: CMD = framecrc -i $(TARGET_SAMPLES)/vmd/12.vmd -pix_fmt rgb24 -an -vf scale -FATE_VIDEO-$(call DEMDEC, SMACKER, SMACKER) += fate-smacker-video +FATE_VIDEO-$(call FRAMECRC, SMACKER, SMACKER, SCALE_FILTER) += fate-smacker-video fate-smacker-video: CMD = framecrc -i $(TARGET_SAMPLES)/smacker/wetlogo.smk -pix_fmt rgb24 -an -vf scale -FATE_VIDEO-$(call DEMDEC, MOV, SMC) += fate-smc +FATE_VIDEO-$(call FRAMECRC, MOV, SMC, SCALE_FILTER) += fate-smc fate-smc: CMD = framecrc -i $(TARGET_SAMPLES)/smc/cass_schi.qt -pix_fmt rgb24 -vf scale -FATE_VIDEO-$(call DEMDEC, AVI, SP5X) += fate-sp5x -fate-sp5x: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/sp5x/sp5x_problem.avi -vf scale -af aresample +FATE_VIDEO-$(call FRAMECRC, AVI, SP5X, ARESAMPLE_FILTER) += fate-sp5x +fate-sp5x: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/sp5x/sp5x_problem.avi -af aresample -FATE_VIDEO-$(call DEMDEC, THP, THP) += fate-thp +FATE_VIDEO-$(call FRAMECRC, THP, THP) += fate-thp fate-thp: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/thp/pikmin2-opening1-partial.thp -an -FATE_VIDEO-$(call DEMDEC, TIERTEXSEQ, TIERTEXSEQVIDEO) += fate-tiertex-seq +FATE_VIDEO-$(call FRAMECRC, TIERTEXSEQ, TIERTEXSEQVIDEO, SCALE_FILTER) += fate-tiertex-seq fate-tiertex-seq: CMD = framecrc -i $(TARGET_SAMPLES)/tiertex-seq/Gameover.seq -pix_fmt rgb24 -vf scale -FATE_VIDEO-$(call DEMDEC, TMV, TMV) += fate-tmv +FATE_VIDEO-$(call FRAMECRC, TMV, TMV, ARESAMPLE_FILTER SCALE_FILTER) += fate-tmv fate-tmv: CMD = framecrc -i $(TARGET_SAMPLES)/tmv/pop-partial.tmv -pix_fmt rgb24 -vf scale -af aresample FATE_TXD += fate-txd-16bpp @@ -321,53 +324,54 @@ fate-txd-16bpp: CMD = framecrc -i $(TARGET_SAMPLES)/txd/misc.txd -an FATE_TXD += fate-txd-odd fate-txd-odd: CMD = framecrc -i $(TARGET_SAMPLES)/txd/odd.txd -an -FATE_TXD += fate-txd-pal8 +FATE_TXD-$(call FRAMECRC, TXD, TXD, SCALE_FILTER) += fate-txd-pal8 fate-txd-pal8: CMD = framecrc -i $(TARGET_SAMPLES)/txd/outro.txd -pix_fmt rgb24 -an -vf scale -FATE_VIDEO-$(call DEMDEC, TXD, TXD) += $(FATE_TXD) -fate-txd: $(FATE_TXD) +FATE_TXD-$(call FRAMECRC, TXD, TXD) += $(FATE_TXD) +FATE_VIDEO += $(FATE_TXD-yes) +fate-txd: $(FATE_TXD-yes) -FATE_VIDEO-$(call DEMDEC, AVI, ULTI) += fate-ulti +FATE_VIDEO-$(call FRAMECRC, AVI, ULTI) += fate-ulti fate-ulti: CMD = framecrc -i $(TARGET_SAMPLES)/ulti/hit12w.avi -an -FATE_VIDEO-$(call DEMDEC, AVI, V210) += fate-v210 +FATE_VIDEO-$(call FRAMECRC, AVI, V210, SCALE_FILTER) += fate-v210 fate-v210: CMD = framecrc -i $(TARGET_SAMPLES)/v210/v210_720p-partial.avi -pix_fmt yuv422p16be -an -vf scale -FATE_VIDEO-$(call DEMDEC, MOV, V410) += fate-v410dec +FATE_VIDEO-$(call FRAMECRC, MOV, V410, SCALE_FILTER) += fate-v410dec fate-v410dec: CMD = framecrc -i $(TARGET_SAMPLES)/v410/lenav410.mov -pix_fmt yuv444p10le -vf scale -FATE_VIDEO-$(call ENCDEC, V410 PGMYUV, AVI IMAGE2) += fate-v410enc +FATE_VIDEO-$(call ENCDEC, V410 PGMYUV, AVI IMAGE2, SCALE_FILTER) += fate-v410enc fate-v410enc: $(VREF) fate-v410enc: CMD = md5 -f image2 -c:v pgmyuv -i $(TARGET_PATH)/tests/vsynth1/%02d.pgm -fflags +bitexact -c:v v410 -f avi -vf scale -FATE_VIDEO-$(call DEMDEC, SIFF, VB) += fate-vb +FATE_VIDEO-$(call FRAMECRC, SIFF, VB, SCALE_FILTER) += fate-vb fate-vb: CMD = framecrc -i $(TARGET_SAMPLES)/SIFF/INTRO_B.VB -t 3 -pix_fmt rgb24 -an -vf scale -FATE_VIDEO-$(call DEMDEC, AVI, VCR1) += fate-vcr1 +FATE_VIDEO-$(call FRAMECRC, AVI, VCR1) += fate-vcr1 fate-vcr1: CMD = framecrc -i $(TARGET_SAMPLES)/vcr1/VCR1test.avi -an -FATE_VIDEO-$(call DEMDEC, AVI, MPEG2VIDEO) += fate-vcr2 +FATE_VIDEO-$(call FRAMECRC, AVI, MPEG2VIDEO) += fate-vcr2 fate-vcr2: CMD = framecrc -flags +bitexact -idct simple -i $(TARGET_SAMPLES)/vcr2/VCR2test.avi -an -FATE_VIDEO-$(call DEMDEC, AVI, XL) += fate-videoxl +FATE_VIDEO-$(call FRAMECRC, AVI, XL) += fate-videoxl fate-videoxl: CMD = framecrc -i $(TARGET_SAMPLES)/vixl/pig-vixl.avi -FATE_VIDEO-$(call DEMDEC, WSVQA, VQA) += fate-vqa-cc +FATE_VIDEO-$(call FRAMECRC, WSVQA, VQA, SCALE_FILTER) += fate-vqa-cc fate-vqa-cc: CMD = framecrc -i $(TARGET_SAMPLES)/vqa/cc-demo1-partial.vqa -pix_fmt rgb24 -an -vf scale -FATE_VIDEO-$(call DEMDEC, WC3, XAN_WC3) += fate-wc3movie-xan +FATE_VIDEO-$(call FRAMECRC, WC3, XAN_WC3, SCALE_FILTER) += fate-wc3movie-xan fate-wc3movie-xan: CMD = framecrc -i $(TARGET_SAMPLES)/wc3movie/SC_32-part.MVE -pix_fmt rgb24 -vf scale -FATE_VIDEO-$(call DEMDEC, AVI, WNV1) += fate-wnv1 +FATE_VIDEO-$(call FRAMECRC, AVI, WNV1) += fate-wnv1 fate-wnv1: CMD = framecrc -i $(TARGET_SAMPLES)/wnv1/wnv1-codec.avi -an -FATE_VIDEO-$(call DEMDEC, YOP, YOP) += fate-yop +FATE_VIDEO-$(call FRAMECRC, YOP, YOP, SCALE_FILTER) += fate-yop fate-yop: CMD = framecrc -i $(TARGET_SAMPLES)/yop/test1.yop -pix_fmt rgb24 -an -vf scale -FATE_VIDEO-$(call DEMDEC, AVI, XAN_WC4) += fate-xxan-wc4 +FATE_VIDEO-$(call FRAMECRC, AVI, XAN_WC4) += fate-xxan-wc4 fate-xxan-wc4: CMD = framecrc -i $(TARGET_SAMPLES)/wc4-xan/wc4trailer-partial.avi -an -FATE_VIDEO-$(call DEMDEC, WAV, SMVJPEG) += fate-smvjpeg +FATE_VIDEO-$(call FRAMECRC, WAV, SMVJPEG) += fate-smvjpeg fate-smvjpeg: CMD = framecrc -idct simple -flags +bitexact -i $(TARGET_SAMPLES)/smv/clock.smv -an FATE_VIDEO += $(FATE_VIDEO-yes)