From patchwork Sun Apr 24 03:34:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35415 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b9e:b0:7d:cfb5:dc7c with SMTP id b30csp1220346pzh; Sat, 23 Apr 2022 20:38:20 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzAt67z2MG+i6yfiu5jR9jgg2vfw5E4LfulA5GMe54MhYvJQUcRL6GpmhiJ65NjPpnXilCg X-Received: by 2002:aa7:cd87:0:b0:41d:90a8:2670 with SMTP id x7-20020aa7cd87000000b0041d90a82670mr12523660edv.404.1650771500170; Sat, 23 Apr 2022 20:38:20 -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 we23-20020a170907235700b006dfa8b9bc20si8991341ejb.894.2022.04.23.20.38.19; Sat, 23 Apr 2022 20:38:20 -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=sfXmEKta; 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 C93E168B498; Sun, 24 Apr 2022 06:35:29 +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-oln040092074090.outbound.protection.outlook.com [40.92.74.90]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3148868B493 for ; Sun, 24 Apr 2022 06:35:27 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lhKhJiR9/IoJXLbCfKBAqOrEWnSCK1F4iv40k/QEmovuAfEZ5tNODPEqT3YbVmVOnOukR1WDOuwZHs1VFRl2eMZdlEVERnOyLYEJUEm3ZGhu884ShEfbFLTiJRNC57uET381pCttgs38kCKaoWvvIqmEvwmiuBGxtGj0GockieFMxDFhXNYbHlPBS9ecSPPRh0jv+v3jhYSvKLqi4XaiP96/BLgFOmHaHA8rBlDVINhDIXnG+1GS3TOyuge0/C4x4iScWd3JTmqMxxbX1k+/n9URDHv5+k258hKbg1fWTU6+Bc9PchZlJZkLEV8KNUBroUd6OAN3rthrCOCLumevcg== 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=aU6x/yootn2bwLoAM4HdgV+hC3cIH6RZ2s/rEFtpT5k=; b=Y6KqSvnv1Y8mzrBErkyxsxDRxDT5nrCN9XpKUEVOvVMPNA9luOtzhZRH5qhZzGdGD4B/TI5DWOwQaKN6q+ZRX5kQ6AF2foDkA9TCOnehURvn19U0Gz5N+3UH6gBhJz9n+ijZV63KGisASEnRgEJceFJOnAwrmf4da1C2+tpi9LSNVNQWlUNdQeQAC1Qnkj21hUFxSofjNozvyYsE08VHbpLb9LaJzYCK3YdTQksMuzun+AnszMhSTJYLgC2GKr78qjG7+dB8KfdHZ9XcuIyw53tobTY0BZ4lqTW5hKSq2Dy6NPG5RpkXH0QKIjBLfrAsjkn55D1EyDDK6BEwsuijHg== 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=aU6x/yootn2bwLoAM4HdgV+hC3cIH6RZ2s/rEFtpT5k=; b=sfXmEKtaCcuy2Dj2BODTF3R3lJFWQNyZM7bg2tekXwpPnFE49f2RJVkjXrQrETHANXPDimKTkGhhgnMC1q4JnLKWuPrgFzOwt6SGldDLKXkM6njl/+Cw6jVfyWAyFy0fAinuTEep2bkucyJhw7QZKwp3NR0aiWQkUyRA7HKTkzZbPJ/yxO4XgTRUMo7PTBF18LWHo02xIqJKeXg8kCfSeE4jDtcGoUrAbfrHmmplCqM89HjGUZU1KAcwNSnwSYzjetB+ryrDygtt/nTY65xYIjnCB0KoWHqAnJHk5IJZ3MRcyDeY/k0u9ukmzmpLEwr2DisODEJ5wIZp/WqGXeUMuw== Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) by VE1PR01MB5534.eurprd01.prod.exchangelabs.com (2603:10a6:803:11e::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5186.16; Sun, 24 Apr 2022 03:35:26 +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:35:26 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 24 Apr 2022 05:34:09 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [g9vLx3ZbZVERscqRlCz1CwirrIMN4Dxi] 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-23-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 935887b3-8d3c-4a8d-af6e-08da25a3788e X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiT4+P6zBac8z1eXEhCqSjjDF9QO2SHPVMoCJGrmSWTtNPqP10QR9Xw6Wp3BJ5rp7XicNSP/7h10FgxuV/JKSUHD5hO0c19+KTDqA8m5p4zvWFxg+Q4/iOJvkdvITDfEcHjAMwT8NlGmzgGYT+SqbBeF+40epAM5MMnQF3doUmd9d9R4pWvVPE8tgMLnfSaAsTil0TBikWNd56oDET9UyU2Ul9dY2erLi8v2UJ1Plukq6qC96dAmFgExKxFf/6i/SW5a1iOl98Ugpd4QH2E3DskZIE4XWQhnrD/cYsZ51/45FybrMC/UWtn1Gou84A3y3YaaqDp1F3jRvPjyL+vQ9Yrpb1R1oTcE8WO8lK3rWfn8ggeVOyMQVtaju7ukCrf6qEFjnk7DcIOjRTHK31hNWLca1G43GX/9IVauTQZ9OiXGODOlx0XhCl6YR062Buu7E3ogrRWqI3jEfkVci2VK1Ype2Wn0+DPSItI3KHrctwRlywx8P/ARvknzHRZx2z0U+mtTjiXNNNQ7fuheYp1dnIxR90VUMw/OdiR+5ysQxtce81Wd/OY8xJO2BMP7epmpKa0gc33nuGgGV+ozEmZ8wFGYmmRw7Ufz6LddPvVb3BlTjQJEOmf0USjuDN2F/b2dnS15hNeTHZmUA6esJAbRlEyh0/oZ29E8GK9ehxYnh2nGh6yzoSz7x/OoK2X3/2/1RvA5pMmUD31X/t7rbM6a19oQQCYDl6vqYXGjjRulTKcekDhfXeIZM4U44eqylPGnoBU= X-MS-TrafficTypeDiagnostic: VE1PR01MB5534:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: gtLb06LVOGRyB/FHatG8U8LO8gRAYbO1kdcUG/0dpVQubHi3TARCOl8s7ZhNF0RqOCE6KOm3wSy191u0qkoFTS6nhXOi94e2Lxczjjlz+YaAoi2M7DiLZpKR0U99Ui+hm90/Gs47IAn2KEn2Ry+dx1Oi828+EbtdQAzD3bZl5OwWnAfH6lPvpxyqlOK1HAawLK9HIio0SeY1UDqvx4HYzDUhWxT3vbBkz1VClK7ZSR+vBPNGS1e1/gOf+pRiTUcGGqOADuguB0RyWBodCqA9MoF2oNWABhCR5JxHhXmQcyfUUtSKYo4pCpg1tbi1OFNQl4ZeNRRgDPyJwDjbhVwALLKY/CgxQLZBk2A1GJLqIXSHbyrjpMf628hoWPIhWvVWAUtGEUmMa0JAzDifU6hxgRFQf9m3AFm/7z7cPnJC0eeVlRP6/VgldtcBZf1aePbtQS/IEB+Q5MExo9zWYMkKIX45OSDMY1YyW3PUKLsBzKnsxsvbeFnZeNmaYNgEsKAsLWGQHAvJgvIFdvFLfoxLqgDX0LUX25bKVCFu9W9hj5UHNtK7DX31yYbRKvWep4aRJYkFGgzfFFep942mu91HxA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 5HEICShTZ7B4ouJgxxfzNFqbpoW1NoSWHMO1iflOaHEv5tpGRjn0wkKvlXs68g43QNVZsjpmSp9hwcH40NgoyVMZ5kGmLuKwj/sRnkEtvcV+cUEtwI6F3zbzqjJiHRQwXgbsZoGdlsqaCtyH3+Q5ZwV6w6UKoZ7Bz/gwL8TlyGsbKvceE4wox4tpB+dfvu+bKHcOyA8ZJ6kbLQYl6tVWt5okI/lg2qRzFvnJNSET/rlvTa7Ru4TueS3JzxQfkFUVs3mQrnKnOI0i4gJ43edR5NTWsBPvFUKD1qNdRQw6EaiwhNgMcCPvbYq1tfDeNZzAGDOFGH7pd6qGrqcgbrIsvBl62nU6g3o0VUyon0SAPXz07EqSVa7o48D7vfgHDvDC7p4Zt9UhS7wn6dStvreY42Hsqp5G2Kh+dbh7Cq7/Dc7gWwWvsrVZRaHjI2c4DUIbmsKGNGDIFw+C3wbe5ITXLx2SYG7z8AHxJzhlxk+g1bDyD3AtsDuMEOaLVu/EkR6zRu2b6SpRF3lzQ/Rf89Wr4pE5LnTO0DKyBXtpRUr7ZQJKOZlT5NW9hcU7qzo2pNtSHKTTSmKbn9DENRB5pN0ytVAE3Ldwkh9TbASDtExdW9e1nbeYQGALgneI8NcHhxxbJpR3r7bDcOGQNl8X9UP+f94cXOilcwg7PZvOgCsSyRpOYOyvP0aFGVElkuM6kwMSWe5+C6ws/gQWEabJ/2Xy/Dun1HPCH+koYvuhF9OSpnMFetEvzksUbZOAeX0f+S1Xyi2u5zneqY1ILJjD8wMXGTPoCPXT6cIg2/T8uY9HHTrvp0JnO8DG749abj7EnwuIRMX15h1SKGSX7Ry5Qsa/ejM1LopC2fApXwCGHAN4PhyqEeU0qfFDjaiHeZWHYQl4i2JcJ0Lp7UOaqejIiNoPOzQLsv/ANZ28QipgBb4vDzK9unXaTWRQlORft/zW12fyqMDkfq1l6ssEPDqsBXIMOCvkUHBfjqkqM5pHogxBt+lGl1WSRZz43wodj+HWyGLbkPlxKKyQTaXJIu7XxOyP1UoMzQ6By9zxB30YTQUex+xQPY37QthdRK4a89pVNkeaC624ULpk3a0igPTfV4kA8h57odywqJIuRL/r9GEW3jo1O6f2boiuUe2gdtLBoScSefOfdcnnXjF8LeBgzwiK/F8VAPXsQkCn3KvxLB+L5NPuyguD5w1ce+NZkLnbm3/VL/sevuLt72HcYXuYpfEYBYAjGA0bWBgXeBz3FMH2k99QYt9I/t3ysXFjpzb3HLpW/IVvpWo5xGkT+XrpxvHfzM7wvU3nsA/9NhYJpvXMZ0mDpar+esQVELuKWJBX0PfbeRD7cuXWuss2YeFq0AwhcEdWHlez3zOQUOf/wiBHycGEEzbW7P9eGdhd622RZxwDZjSfPg3kaN9Fz9zvcucdBAhn+zfVz4rZEM4RaMtp/Tt1vc6Mxhw7OPsI0jYAdf3Z X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 935887b3-8d3c-4a8d-af6e-08da25a3788e 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:35:26.0734 (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: VE1PR01MB5534 Subject: [FFmpeg-devel] [PATCH 24/32] fate/vcodec: 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: tkzCrtcXDH/7 This automatically fixes the requirements of the fate-seek-vsynth* tests (e.g. 16 of the 49 such tests are now automatically disabled if the scale filter is disabled). Signed-off-by: Andreas Rheinhardt --- tests/fate/vcodec.mak | 82 +++++++++++++++++++++++-------------------- 1 file changed, 44 insertions(+), 38 deletions(-) diff --git a/tests/fate/vcodec.mak b/tests/fate/vcodec.mak index 667e3759a5..6f49ffed40 100644 --- a/tests/fate/vcodec.mak +++ b/tests/fate/vcodec.mak @@ -10,7 +10,7 @@ fate-vsynth%: CMD = enc_dec "rawvideo $(DEFAULT_SIZE) -pix_fmt yuv420p $(RAWDECO fate-vsynth%: CMP_UNIT = 1 fate-vsynth%: REF = $(SRC_PATH)/tests/ref/vsynth/$(@:fate-%=%) -FATE_VCODEC-$(call ENCDEC, AMV, AVI) += amv +FATE_VCODEC_SCALE-$(call ENCDEC, AMV, AVI) += amv fate-vsynth%-amv: ENCOPTS = -strict -1 FATE_VCODEC-$(call ENCDEC, ASV1, AVI) += asv1 @@ -19,16 +19,17 @@ fate-vsynth%-asv1: ENCOPTS = -qscale 10 FATE_VCODEC-$(call ENCDEC, ASV2, AVI) += asv2 fate-vsynth%-asv2: ENCOPTS = -qscale 10 -FATE_VCODEC-$(call ENCDEC, CINEPAK, AVI) += cinepak +FATE_VCODEC_SCALE-$(call ENCDEC, CINEPAK, AVI) += cinepak fate-vsynth%-cinepak: ENCOPTS = -s sqcif -strip_number_adaptivity 1 -FATE_VCODEC-$(call ENCDEC, CLJR, AVI) += cljr +FATE_VCODEC_SCALE-$(call ENCDEC, CLJR, AVI) += cljr fate-vsynth%-cljr: ENCOPTS = -strict -1 -FATE_VCODEC-$(call ENCDEC, VC2 DIRAC, MOV) += vc2-420p vc2-420p10 vc2-420p12 \ - vc2-422p vc2-422p10 vc2-422p12 \ - vc2-444p vc2-444p10 vc2-444p12 \ - vc2-thaar vc2-t5_3 +FATE_VCODEC-$(call ENCDEC, VC2 DIRAC, MOV) += vc2-420p +FATE_VCODEC_SCALE-$(call ENCDEC, VC2 DIRAC, MOV) += vc2-420p10 vc2-420p12 \ + vc2-422p vc2-422p10 vc2-422p12 \ + vc2-444p vc2-444p10 vc2-444p12 \ + vc2-thaar vc2-t5_3 fate-vsynth1-vc2-4%: FMT = mov fate-vsynth1-vc2-4%: ENCOPTS = -pix_fmt yuv$(@:fate-vsynth1-vc2-%=%) \ -c:v vc2 -frames 5 -strict -1 @@ -57,7 +58,7 @@ FATE_VCODEC_DNXHD_DNXHD := dnxhd-720p \ dnxhd-2k-hr-hq \ dnxhd-uhd-hr-sq) \ -FATE_VCODEC-$(call ENCDEC, DNXHD, DNXHD) += $(FATE_VCODEC_DNXHD_DNXHD) +FATE_VCODEC_SCALE-$(call ENCDEC, DNXHD, DNXHD) += $(FATE_VCODEC_DNXHD_DNXHD) fate-vsynth%-dnxhd-720p: ENCOPTS = -s hd720 -b 90M \ -pix_fmt yuv422p -frames 5 -qmax 8 @@ -102,7 +103,7 @@ $(FATE_VCODEC_DNXHD_DNXHD:%=fate-vsynth\%-%): DECOPTS += $(DEFAULT_SIZE) FATE_VCODEC_DNXHD_MOV := dnxhd-1080i dnxhd-1080i-10bit dnxhd-1080i-colr \ dnxhd-hr-lb-mov dnxhd-hr-sq-mov dnxhd-hr-hq-mov \ -FATE_VCODEC-$(call ENCDEC, DNXHD, MOV) += $(FATE_VCODEC_DNXHD_MOV) +FATE_VCODEC_SCALE-$(call ENCDEC, DNXHD, MOV) += $(FATE_VCODEC_DNXHD_MOV) fate-vsynth%-dnxhd-1080i: ENCOPTS = -s hd1080 -b 120M -flags +ildct \ -pix_fmt yuv422p -frames 5 -qmax 8 @@ -130,7 +131,7 @@ $(FATE_VCODEC_DNXHD_MOV:%=fate-vsynth\%-%): FMT = mov $(FATE_VCODEC_DNXHD_MOV:%=fate-vsynth\%-%): DECOPTS += $(DEFAULT_SIZE) FATE_VCODEC_DV := dv dv-411 dv-50 dv-hd dv-fhd -FATE_VCODEC-$(call ENCDEC, DVVIDEO, DV) += $(FATE_VCODEC_DV) +FATE_VCODEC_SCALE-$(call ENCDEC, DVVIDEO, DV) += $(FATE_VCODEC_DV) fate-vsynth%-dv: ENCOPTS = -dct int -s pal fate-vsynth%-dv-411: ENCOPTS = -dct int -s pal -pix_fmt yuv411p \ @@ -154,8 +155,9 @@ $(FATE_VCODEC_DV:%=fate-vsynth\%-%): FMT = dv $(FATE_VCODEC_DV:%=fate-vsynth\%-%): DECOPTS += $(DEFAULT_SIZE) FATE_VCODEC-$(call ENCDEC, FFV1, AVI) += ffv1 ffv1-v0 \ - ffv1-v3-yuv420p ffv1-v3-yuv422p10 ffv1-v3-yuv444p16 \ - ffv1-v3-bgr0 ffv1-v3-rgb48 + ffv1-v3-yuv420p +FATE_VCODEC_SCALE-$(call ENCDEC, FFV1, AVI) += ffv1-v3-yuv422p10 ffv1-v3-yuv444p16 \ + ffv1-v3-bgr0 ffv1-v3-rgb48 fate-vsynth%-ffv1: ENCOPTS = -slices 4 fate-vsynth%-ffv1-v0: CODEC = ffv1 fate-vsynth%-ffv1-v3-yuv420p: ENCOPTS = -level 3 -pix_fmt yuv420p @@ -172,18 +174,19 @@ fate-vsynth%-ffv1-v3-rgb48: ENCOPTS = -level 3 -pix_fmt rgb48 -strict -2 \ -sws_flags neighbor+bitexact fate-vsynth%-ffv1-v3-rgb48: DECOPTS = -sws_flags neighbor+bitexact -FATE_VCODEC-$(call ENCDEC, FFVHUFF, AVI) += ffvhuff ffvhuff444 ffvhuff420p12 ffvhuff422p10left ffvhuff444p16 +FATE_VCODEC-$(call ENCDEC, FFVHUFF, AVI) += ffvhuff +FATE_VCODEC_SCALE-$(call ENCDEC, FFVHUFF, AVI) += ffvhuff444 ffvhuff420p12 ffvhuff422p10left ffvhuff444p16 fate-vsynth%-ffvhuff444: ENCOPTS = -c:v ffvhuff -pix_fmt yuv444p fate-vsynth%-ffvhuff420p12: ENCOPTS = -c:v ffvhuff -pix_fmt yuv420p12le fate-vsynth%-ffvhuff422p10left: ENCOPTS = -c:v ffvhuff -pix_fmt yuv422p10le -pred left fate-vsynth%-ffvhuff444p16: ENCOPTS = -c:v ffvhuff -pix_fmt yuv444p16le -pred plane -FATE_VCODEC-$(call ENCDEC, FLASHSV, FLV) += flashsv +FATE_VCODEC_SCALE-$(call ENCDEC, FLASHSV, FLV) += flashsv fate-vsynth%-flashsv: ENCOPTS = -sws_flags neighbor+full_chroma_int fate-vsynth%-flashsv: DECOPTS = -sws_flags area fate-vsynth%-flashsv: FMT = flv -FATE_VCODEC-$(call ENCDEC, FLASHSV2, FLV) += flashsv2 +FATE_VCODEC_SCALE-$(call ENCDEC, FLASHSV2, FLV) += flashsv2 fate-vsynth%-flashsv2: ENCOPTS = -sws_flags neighbor+full_chroma_int -strict experimental -compression_level 0 fate-vsynth%-flashsv2: DECOPTS = -sws_flags area fate-vsynth%-flashsv2: FMT = flv @@ -201,7 +204,7 @@ fate-vsynth%-h263: ENCOPTS = -qscale 10 fate-vsynth%-h263-obmc: ENCOPTS = -qscale 10 -obmc 1 fate-vsynth%-h263p: ENCOPTS = -qscale 2 -flags +aic -umv 1 -aiv 1 -ps 300 -FATE_VCODEC-$(call ENCDEC, HUFFYUV, AVI) += huffyuv huffyuvbgr24 huffyuvbgra +FATE_VCODEC_SCALE-$(call ENCDEC, HUFFYUV, AVI) += huffyuv huffyuvbgr24 huffyuvbgra fate-vsynth%-huffyuv: ENCOPTS = -c:v huffyuv -pix_fmt yuv422p -sws_flags neighbor fate-vsynth%-huffyuv: DECOPTS = -sws_flags neighbor fate-vsynth%-huffyuvbgr24: ENCOPTS = -c:v huffyuv -pix_fmt bgr24 -sws_flags neighbor @@ -209,11 +212,11 @@ fate-vsynth%-huffyuvbgr24: DECOPTS = -sws_flags neighbor fate-vsynth%-huffyuvbgra: ENCOPTS = -c:v huffyuv -pix_fmt bgr32 -sws_flags neighbor fate-vsynth%-huffyuvbgra: DECOPTS = -sws_flags neighbor -FATE_VCODEC-$(call ENCDEC, JPEGLS, AVI) += jpegls +FATE_VCODEC_SCALE-$(call ENCDEC, JPEGLS, AVI) += jpegls fate-vsynth%-jpegls: ENCOPTS = -sws_flags neighbor+full_chroma_int fate-vsynth%-jpegls: DECOPTS = -sws_flags area -FATE_VCODEC-$(call ENCDEC, JPEG2000, AVI) += jpeg2000 jpeg2000-97 +FATE_VCODEC_SCALE-$(call ENCDEC, JPEG2000, AVI) += jpeg2000 jpeg2000-97 fate-vsynth%-jpeg2000: ENCOPTS = -qscale 7 -strict experimental -pred 1 -pix_fmt rgb24 fate-vsynth%-jpeg2000: DECINOPTS = -c:v jpeg2000 fate-vsynth%-jpeg2000-97: ENCOPTS = -qscale 7 -strict experimental -pix_fmt rgb24 @@ -222,7 +225,7 @@ fate-vsynth%-jpeg2000-97: DECINOPTS = -c:v jpeg2000 FATE_VCODEC-$(call ENCDEC, LJPEG MJPEG, AVI) += ljpeg fate-vsynth%-ljpeg: ENCOPTS = -strict -1 -FATE_VCODEC-$(call ENCDEC, MJPEG, AVI) += mjpeg mjpeg-422 mjpeg-444 mjpeg-trell mjpeg-huffman mjpeg-trell-huffman +FATE_VCODEC_SCALE-$(call ENCDEC, MJPEG, AVI) += mjpeg mjpeg-422 mjpeg-444 mjpeg-trell mjpeg-huffman mjpeg-trell-huffman fate-vsynth%-mjpeg: ENCOPTS = -qscale 9 -pix_fmt yuvj420p fate-vsynth%-mjpeg-422: ENCOPTS = -qscale 9 -pix_fmt yuvj422p fate-vsynth%-mjpeg-444: ENCOPTS = -qscale 9 -pix_fmt yuvj444p @@ -239,8 +242,8 @@ fate-vsynth%-mpeg1b: CODEC = mpeg1video fate-vsynth%-mpeg1b: ENCOPTS = -qscale 8 -bf 3 -ps 200 fate-vsynth%-mpeg1b: FMT = mpeg1video -FATE_MPEG2 = mpeg2 \ - mpeg2-422 \ +FATE_MPEG2 := mpeg2 \ + $(if $(CONFIG_SCALE_FILTER), mpeg2-422) \ mpeg2-idct-int \ mpeg2-ilace \ mpeg2-ivlc-qprd \ @@ -332,12 +335,12 @@ fate-vsynth%-msmpeg4: ENCOPTS = -qscale 10 FATE_VCODEC-$(call ENCDEC, MSMPEG4V2, AVI) += msmpeg4v2 fate-vsynth%-msmpeg4v2: ENCOPTS = -qscale 10 -FATE_VCODEC-$(call ENCDEC, PNG, AVI) += mpng +FATE_VCODEC_SCALE-$(call ENCDEC, PNG, AVI) += mpng fate-vsynth%-mpng: CODEC = png -FATE_VCODEC-$(call ENCDEC, MSVIDEO1, AVI) += msvideo1 +FATE_VCODEC_SCALE-$(call ENCDEC, MSVIDEO1, AVI) += msvideo1 -FATE_VCODEC-$(call ENCDEC, PRORES, MOV) += prores prores_int prores_444 prores_444_int prores_ks +FATE_VCODEC_SCALE-$(call ENCDEC, PRORES, MOV) += prores prores_int prores_444 prores_444_int prores_ks fate-vsynth%-prores: FMT = mov fate-vsynth%-prores_int: CODEC = prores @@ -355,14 +358,14 @@ fate-vsynth%-prores_444_int: FMT = mov fate-vsynth%-prores_ks: ENCOPTS = -profile hq fate-vsynth%-prores_ks: FMT = mov -FATE_VCODEC-$(call ENCDEC, QTRLE, MOV) += qtrle qtrlegray +FATE_VCODEC_SCALE-$(call ENCDEC, QTRLE, MOV) += qtrle qtrlegray fate-vsynth%-qtrle: FMT = mov fate-vsynth%-qtrlegray: CODEC = qtrle fate-vsynth%-qtrlegray: ENCOPTS = -pix_fmt gray fate-vsynth%-qtrlegray: FMT = mov -FATE_VCODEC-$(call ENCDEC, RAWVIDEO, AVI) += rgb bpp1 bpp15 +FATE_VCODEC_SCALE-$(call ENCDEC, RAWVIDEO, AVI) += rgb bpp1 bpp15 fate-vsynth%-rgb: CODEC = rawvideo fate-vsynth%-rgb: ENCOPTS = -pix_fmt bgr24 fate-vsynth%-bpp1: CODEC = rawvideo @@ -370,7 +373,7 @@ fate-vsynth%-bpp1: ENCOPTS = -pix_fmt monow fate-vsynth%-bpp15: CODEC = rawvideo fate-vsynth%-bpp15: ENCOPTS = -pix_fmt bgr555le -FATE_VCODEC-$(call ENCDEC, RAWVIDEO, MOV) += mov-bgr24 mov-bpp15 mov-bpp16 +FATE_VCODEC_SCALE-$(call ENCDEC, RAWVIDEO, MOV) += mov-bgr24 mov-bpp15 mov-bpp16 fate-vsynth%-mov-bgr24: CODEC = rawvideo fate-vsynth%-mov-bgr24: ENCOPTS = -pix_fmt bgr24 fate-vsynth%-mov-bgr24: FMT = mov @@ -381,7 +384,7 @@ fate-vsynth%-mov-bpp16: CODEC = rawvideo fate-vsynth%-mov-bpp16: ENCOPTS = -pix_fmt rgb565le fate-vsynth%-mov-bpp16: FMT = mov -FATE_VCODEC-$(call ENCDEC, ROQ, ROQ) += roqvideo +FATE_VCODEC_SCALE-$(call ENCDEC, ROQ, ROQ) += roqvideo fate-vsynth%-roqvideo: CODEC = roqvideo fate-vsynth%-roqvideo: ENCOPTS = -frames 5 fate-vsynth%-roqvideo: RAWDECOPTS = -r 30 @@ -395,7 +398,7 @@ FATE_VCODEC-$(call ENCDEC, RV20, RM) += rv20 fate-vsynth%-rv20: ENCOPTS = -qscale 10 fate-vsynth%-rv20: FMT = rm -FATE_VCODEC-$(call ENCDEC, SNOW, AVI) += snow snow-hpel snow-ll +FATE_VCODEC_SCALE-$(call ENCDEC, SNOW, AVI) += snow snow-hpel fate-vsynth%-snow: ENCOPTS = -qscale 2 -flags +qpel \ -motion_est iter -dia_size 2 \ -cmp 12 -subcmp 12 -s 128x64 @@ -405,25 +408,26 @@ fate-vsynth%-snow-hpel: ENCOPTS = -qscale 2 \ -cmp 12 -subcmp 12 -s 128x64 fate-vsynth%-snow fate-vsynth%-snow-hpel: DECOPTS = $(DEFAULT_SIZE) +FATE_VCODEC-$(call ENCDEC, SNOW, AVI) += snow-ll fate-vsynth%-snow-ll: ENCOPTS = -qscale .001 -pred 1 \ -flags +mv4+qpel -FATE_VCODEC-$(call ENCDEC, SVQ1, MOV) += svq1 +FATE_VCODEC_SCALE-$(call ENCDEC, SVQ1, MOV) += svq1 fate-vsynth%-svq1: ENCOPTS = -qscale 3 -pix_fmt yuv410p fate-vsynth%-svq1: FMT = mov -FATE_VCODEC-$(call ENCDEC, R210, AVI) += r210 +FATE_VCODEC_SCALE-$(call ENCDEC, R210, AVI) += r210 -FATE_VCODEC-$(call ENCDEC, V210, AVI) += v210 v210-10 +FATE_VCODEC_SCALE-$(call ENCDEC, V210, AVI) += v210 v210-10 fate-vsynth%-v210-10: ENCOPTS = -pix_fmt yuv422p10 -FATE_VCODEC-$(call ENCDEC, V308, AVI) += v308 +FATE_VCODEC_SCALE-$(call ENCDEC, V308, AVI) += v308 -FATE_VCODEC-$(call ENCDEC, V408, AVI) += v408 +FATE_VCODEC_SCALE-$(call ENCDEC, V408, AVI) += v408 fate-vsynth%-v408: ENCOPTS = -sws_flags neighbor+bitexact fate-vsynth%-v408: DECOPTS = -sws_flags neighbor+bitexact -FATE_VCODEC-$(call ENCDEC, AVUI, MOV) += avui +FATE_VCODEC_SCALE-$(call ENCDEC, AVUI, MOV) += avui fate-vsynth%-avui: ENCOPTS = -s pal -strict experimental -sws_flags neighbor+bitexact fate-vsynth%-avui: DECOPTS = -sws_flags neighbor+bitexact $(DEFAULT_SIZE) fate-vsynth%-avui: FMT = mov @@ -437,18 +441,20 @@ fate-vsynth%-wmv2: ENCOPTS = -qscale 10 FATE_VCODEC-$(call ENCDEC, RAWVIDEO, AVI) += yuv fate-vsynth%-yuv: CODEC = rawvideo -FATE_VCODEC-$(call ENCDEC, XFACE, NUT) += xface +FATE_VCODEC_SCALE-$(call ENCDEC, XFACE, NUT) += xface fate-vsynth%-xface: ENCOPTS = -s 48x48 -sws_flags neighbor+bitexact fate-vsynth%-xface: DECOPTS = -sws_flags neighbor+bitexact $(DEFAULT_SIZE) fate-vsynth%-xface: FMT = nut FATE_VCODEC-$(call ENCDEC, YUV4, AVI) += yuv4 -FATE_VCODEC-$(call ENCDEC, Y41P, AVI) += y41p +FATE_VCODEC_SCALE-$(call ENCDEC, Y41P, AVI) += y41p -FATE_VCODEC-$(call ENCDEC, ZLIB, AVI) += zlib +FATE_VCODEC_SCALE-$(call ENCDEC, ZLIB, AVI) += zlib +FATE_VCODEC-$(CONFIG_SCALE_FILTER) += $(FATE_VCODEC_SCALE-yes) FATE_VCODEC += $(FATE_VCODEC-yes) +FATE_VCODEC := $(if $(call ENCDEC, RAWVIDEO, RAWVIDEO),$(FATE_VCODEC)) FATE_VSYNTH1 = $(FATE_VCODEC:%=fate-vsynth1-%) FATE_VSYNTH2 = $(FATE_VCODEC:%=fate-vsynth2-%) FATE_VSYNTH_LENA = $(FATE_VCODEC:%=fate-vsynth_lena-%)