From patchwork Sun Apr 24 03:34:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35414 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b9e:b0:7d:cfb5:dc7c with SMTP id b30csp1220300pzh; Sat, 23 Apr 2022 20:38:09 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx90j2tqr6A9TBuv0YO8+APzrBnU6Kd9uko2dTmz4hMRGjEw73pRE4rHvvApsq9qDP6u0cO X-Received: by 2002:a05:6402:516:b0:425:c896:b1b8 with SMTP id m22-20020a056402051600b00425c896b1b8mr7348605edv.212.1650771489544; Sat, 23 Apr 2022 20:38:09 -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 z9-20020a170906434900b006e8cb75fd59si10321375ejm.723.2022.04.23.20.38.09; Sat, 23 Apr 2022 20:38:09 -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=mttJIsDy; 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 B2B6C68B490; Sun, 24 Apr 2022 06:35:28 +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 DC30D68B493 for ; Sun, 24 Apr 2022 06:35:26 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RZCxovIGS/bHmfrT9rP/VVXFyM/xkUMzh2t1LcJsJ5pu1pmDAlZvi8X0eh2eKA2IIyv4Mi4BIncCH+n9E8l5GFf0a9ubAdd82IgdcQoxGZ/plZtGxMKIQu4++07a/ctiLvUl1L5+0GrHV7YNX2MA4f9cZqrKIm8/l3u0TwEQYhptRte28PwsEG8eEyWxDZIkbP4a9y/Nae58XMMYFMriAWZJB21QUHPHywuTjJXeFgangbHZVmkNDsEDbcdtFE1gGbTV9Re7DYaeSVZo2YW5Jd1PETqyFmkhVbKK5JbBTyZ1PpOcEBtaRek5XSXAr7BVPzIJaobS9sGmnIhxIWKUEg== 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=8oive2Vir79Oh0kkFSkg50MohFIjlvECrV2ivVBSDSY=; b=oZP+W3fy72KH3IvfGWsl6twKnEaHF0bUvBy25GF6p0zGDI2jFEnuRNS8dzcjO1e7cRXB7zZ4h9HWKthp07r0q7ET4yzkJem0IkksLfSdUrsBXZb1JbKGKVsovYQ1u3pV334IfTFja/wt1jjXZ5NL7DzY6lGI8EdPXLnzX+4EnujqWHZfu5WtHV55ZBJrsbM2hBqkDljkAw9iC2lKaXFWmENdT0dskm/fwgKRiUB8kcIo4LJE1TWXTUcgARIRsBrGV6j5REBkzJk+/31NQiXVgTkuoB2oZouE8ikI+/64JQb0R4CvY1xWytQQxvDP3pBOoMayvjiRLcrpAD2E4Q8JWg== 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=8oive2Vir79Oh0kkFSkg50MohFIjlvECrV2ivVBSDSY=; b=mttJIsDyo8RM6YYAr7NSngaYm/lHdIO7CYOspOgDQTvm+lsBCpQvCZt1qUy2GTnT8GzZXbWKTNvs2b/c4H5d4OWOIx1leMyc2+R9MSsBTVNq9OyHtkIPp1L84nZmyCXyARN31feDo4shX0asEWgKwrYNSWbY7lyi9Z3ytaNJ2DdM4OxpD6TVZZZNLi2QozZyd8HSD0kzFzSOu8gU/wTx+lJcF9H4CYOmmL1Wn8c2OOU5Pm5zxJ0YvO3qlztkbJy9wKtT070/w2/bfkueZ5sLI2Vtt7d+JbSu/hZCvxXU7nUaazJSoO/jYSuJdpbzM3UIo1WWTmS2mcYCmlyIbmgWOg== 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:24 +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:24 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 24 Apr 2022 05:34:08 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [hlwgkdLSNgnZhivs3q0CJTSeGnZGInMd] 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-22-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 24ffe152-e962-4ba3-b783-08da25a377d6 X-MS-Exchange-SLBlob-MailProps: ZTmCor6bjd+FHMe7F+Xmni76aaulW81hQbUy7jLk37YWvlOngxXBcSWcxYhzhx2guSNlwEp6rMDK+EvEIT3PObIWutRhcnzfLIOegkc4KLLEJPd4hPEjso1u7WirR2VUVc5ojAUB3V326ursxT7Lc2HWqCLQ5SAiqcBoszpECzKfgx9MQWFH98Ihv1PagXblV/C4PHO2FWADCP0QL9SgZYuRkZWlVA+ji+j0HaQRpHshNS1fVpkh7tmjdELsc5IZ8t+L7QMTcWEjYqdWJIMNCUUcDD0G0VM/CZDMX97sjt5iaEw/2fBB7QDcAaHueUPqh8zemru5RsvaELZT+aDGZSji0YvsK9/RQJUJezoDDigdWx2F0GdlIK5AslJVnC42ZgEqzohqTZo1/EBQSs6r97W+GrWgHDK+Fyrjo3JKmub5CRzbsiDteXZAkzXoWlKyzUsGGqi28sV1KBNuZVZu/TJoKIUvZ6DfYNP9PDgDuvMVKmN+opleqo/iR4aNfWfCEsXXTdaI1eOaHlFgXN4GTqoZevJ+0UxEbMjhnn/Yn+i7gVtuumI0YqOxdsToHVz3fkwtgunTO0+iCkIw1WouPfaovhadXZOvlOSrtjXAqVHbx2vve3SHCzdhLVxzeVsjgii5sRNpsUN4IvH2hwATS10gJJTxjMI+0lNjoisD2O3OPsm6Nu+Dj+c6ZpdPpjqvunNnsFZqX+2mCxZ13s/ei4kCQdeqAfxwZUmRh7pFhidIm9qnNGWrWkYIqCmyAAmW9S8KL+b9YvlbWr4m+hdDU1OsmjNP8hBhH6r3Nfgeqk9vJmyfLCi3OBIcg4MtK6Aa X-MS-TrafficTypeDiagnostic: VE1PR01MB5534:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: MimHFDxmhBKEGEMpBOWdATSp3OAzp67SXOoW679bkuTZF7exq+e5FH7hxlL9b0YpXUsdoyyZsm0c3vDfcBdBGXq9ZW6OiHu607Wniqcjwl//LVW21bHCByDGqUJq2kJrdHo8kxPjsqy58k6WB4wusU1oSdMY/BOTr4pMOJVGAiOc0VXS7WiMlxwVtF/VrXhF9YiWg2ma89XPj5n0iaIe1Xchiy92j1MeBGiTF7D6gL/9lsl6qUANoHDNEJ5L6+ETm6LJxJNcxUq6lN7/3ROXdRjD0vspg/ygRlPunPkBY9Z5rSl900SEK45zwb52ZIpU/V/CjyQWbdCQC0nBF5Btp4EnaWvgSrBSN0Z6NpE+vaqSavFP0Nt1XpvscqLDYL0oMOGBvhInVOAYLGeGAprfwxTXAqRi7aN60RXq8AOM7iln9C63Rv5qiCO8vkw1crJBUvdNdS8/gVrMafUjYNh2vqnHrMl0XWEzJ9XRivoyHNKkmYzPHhMIM5F5iuYl9lXNQoElmjMICaIZnmdx5U0tNaCfYj36WAnuMCohZFP5fVRjHgtTwBWaka/8c73vyrLrYAuj0HdFfYe/4aUtTurfww== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: zSzItMaor8NN5DQIFkt/mOb1mB8ckLMDrSap5cGmeo2YqY2mxIQlPtA2/lB4PdNCUjf+dbiv7HkA47IzmyW/2iQSkN7TyO6kXFS4C3Yt46ESZ+1/46AZ/xRmrFVMPGPlE9CNmH0G4h0Hcg+4ghO6L6zQBPQK5ZT6hiKQSEGj6TfRvWxIiyB6dSH4yEEfcDoBs6PjDId8luDolKkdRIkVIzg5bmFeY2hMTQEC9OwcwKuNjq9vSNWknzOPr/0thfhBkY/G9vNars8pFS/ygvczZ3pG5c9Z/ACnrQEe5SBOaRAEWF6g0kpxpseDW2u4ZyhRj/zqsNZdi5SscJIURHqYfB071HOlnN6X6ULY909vf+UnQafuWyye5nfoTaQZKi+XStKTCTtALLzdLIp9HJg9gJPW3rSBBbqtCCa+2ghIs8pqufaevRFER1uv307AOClL0V31b2OKyf5bS9HvIgokd3LXd0nzMeB78WjnMAu644DpvAdmS9GQCpPf+yqlJruLcY6pviObXZ+6SDfQe87zkjC6G1hbk6VFcVnI39q5JpiwCW5hdPxyqQHU5zafai3ONLZcwUwBOvUB/HbzDLO88J9ROgfMuOTuntJY15Og5OxWIa4KJjmkU5SUlnWSySjHICCnRFwvWQ45MexInnYgEncnL0+lEn5FGl6royswUBKsgc6IhBT/gf/J2K9QWmnmyj8CcOCdC2LH0tWzM7vlWjrFAm688c6hmkcTnZUhLyLcE7RK0pziBsptrc3J7oP85H/+chCMyKDPTYOpUT1bjRm2RQYhG602ZTTQVAqpJyXW1z/6YsoE+T90ZfiXdvukj5nf6SMaWOvU7P6RZeJXU4/XrKJVp9QYj2s4Hmar3WnwAQh6EMOCPWXDYzvBN2ug6Vndd/kCbsYd9bQtRHs6Xihyq+3UiNQ7yQOm22y6HTwYbkXkmMWCaUJBRtb/A5ITCMZxLr1WF1hWzRlBObUDEckS0+Yu3OE3DGHGkON9ZHeiq2+kt8ZXYySWtN1SSO5F6ygNnSSL7t0hkLkS3fK+z1O6TaDQNlRZKRL/LJt1mseqS+GVw2IgqK4KAwbaFmvUdjFQpRylnp/DcBjjvB87xTX/jeI7nt3Q2LlxXhXpnvUpJc56rUEFupl9v4GMZ3bYLbsCReheOkHIiIgEOUweXIfrcSTRe9Xgqj6nwPD0r88rXXsVPQqUlk/2iGWvNQZ8RXGxuMA2dgjIWhwYwuHoJ9oToLEf6zcqtS+lm/WVNFYtlpVHfXSqnzdSYxP+YX1ZvaT+fU8gNPFxkViaegZdZhkBm8SlE/Hjm2yTI0MJLjovzz0g5re9SSM1sARAJNe9gc5asQcdyW3niAY+9sjf4v0YLNU9Xk8d03WhygZztOEige39OV/9cfVETs3mLqDARjcxSys+7VHs7BeaEv35Vq0mK+SeGfmfBTZwRxg/dwCwDqDOx21HkLy0zzC68XU3 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 24ffe152-e962-4ba3-b783-08da25a377d6 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:24.8990 (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 23/32] fate/vcodec: Don't add scale filter unnecessarily 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: 6kSOoCf4lRFf If one uses a -s command, a scale filter is inserted even when doing so is redundant. This patch stops doing so. This makes the tests that don't need libswscale actually succeed in case it is disabled (only 315 of 470 tests need it). Signed-off-by: Andreas Rheinhardt --- tests/fate/vcodec.mak | 82 ++++++++++++++++++------------------------- 1 file changed, 35 insertions(+), 47 deletions(-) diff --git a/tests/fate/vcodec.mak b/tests/fate/vcodec.mak index 2e6d16f1e7..667e3759a5 100644 --- a/tests/fate/vcodec.mak +++ b/tests/fate/vcodec.mak @@ -4,8 +4,9 @@ fate-vsynth_lena-%: SRC = tests/data/vsynth_lena.yuv fate-vsynth3-%: SRC = tests/data/vsynth3.yuv fate-vsynth%: CODEC = $(word 3, $(subst -, ,$(@))) fate-vsynth%: FMT = avi -fate-vsynth%: CMD = enc_dec "rawvideo -s 352x288 -pix_fmt yuv420p $(RAWDECOPTS)" $(SRC) $(FMT) "-c $(CODEC) $(ENCOPTS)" rawvideo "-s 352x288 -pix_fmt yuv420p -vsync passthrough $(DECOPTS)" "$(KEEP_OVERRIDE)" "$(DECINOPTS)" -fate-vsynth3-%: CMD = enc_dec "rawvideo -s $(FATEW)x$(FATEH) -pix_fmt yuv420p $(RAWDECOPTS)" $(SRC) $(FMT) "-c $(CODEC) $(ENCOPTS)" rawvideo "-s $(FATEW)x$(FATEH) -pix_fmt yuv420p -vsync passthrough $(DECOPTS)" "" "$(DECINOPTS)" +fate-vsynth%: DEFAULT_SIZE = -s 352x288 +fate-vsynth3-%: DEFAULT_SIZE = -s $(FATEW)x$(FATEH) +fate-vsynth%: CMD = enc_dec "rawvideo $(DEFAULT_SIZE) -pix_fmt yuv420p $(RAWDECOPTS)" $(SRC) $(FMT) "-c $(CODEC) $(ENCOPTS)" rawvideo "-pix_fmt yuv420p -vsync passthrough $(DECOPTS)" "$(KEEP_OVERRIDE)" "$(DECINOPTS)" fate-vsynth%: CMP_UNIT = 1 fate-vsynth%: REF = $(SRC_PATH)/tests/ref/vsynth/$(@:fate-%=%) @@ -20,24 +21,10 @@ fate-vsynth%-asv2: ENCOPTS = -qscale 10 FATE_VCODEC-$(call ENCDEC, CINEPAK, AVI) += cinepak fate-vsynth%-cinepak: ENCOPTS = -s sqcif -strip_number_adaptivity 1 -fate-vsynth%-cinepak: DECOPTS = -s sqcif FATE_VCODEC-$(call ENCDEC, CLJR, AVI) += cljr fate-vsynth%-cljr: ENCOPTS = -strict -1 -FATE_VCODEC-$(call ENCDEC, DNXHD, DNXHD) += dnxhd-720p \ - dnxhd-720p-rd \ - dnxhd-720p-10bit \ - dnxhd-720p-hr-lb \ - dnxhd-edge1-hr \ - dnxhd-edge2-hr \ - dnxhd-edge3-hr - -FATE_VCODEC-$(call ALLYES, DNXHD_ENCODER DNXHD_DECODER LARGE_TESTS) += dnxhd-4k-hr-lb \ - dnxhd-2k-hr-hq \ - dnxhd-uhd-hr-sq - - 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 \ @@ -59,112 +46,112 @@ fate-vsynth2-vc2-t%: ENCOPTS = -pix_fmt yuv422p10 -c:v vc2 -frames 5 fate-vsynth_lena-vc2-t%: FMT = mov fate-vsynth_lena-vc2-t%: ENCOPTS = -pix_fmt yuv422p10 -c:v vc2 -frames 5 -strict -1 -wavelet_type $(@:fate-vsynth_lena-vc2-t%=%) +FATE_VCODEC_DNXHD_DNXHD := dnxhd-720p \ + dnxhd-720p-rd \ + dnxhd-720p-10bit \ + dnxhd-720p-hr-lb \ + dnxhd-edge1-hr \ + dnxhd-edge2-hr \ + dnxhd-edge3-hr \ + $(if $(CONFIG_LARGE_TESTS), dnxhd-4k-hr-lb \ + dnxhd-2k-hr-hq \ + dnxhd-uhd-hr-sq) \ + +FATE_VCODEC-$(call ENCDEC, DNXHD, DNXHD) += $(FATE_VCODEC_DNXHD_DNXHD) + fate-vsynth%-dnxhd-720p: ENCOPTS = -s hd720 -b 90M \ -pix_fmt yuv422p -frames 5 -qmax 8 -fate-vsynth%-dnxhd-720p: FMT = dnxhd fate-vsynth%-dnxhd-720p-rd: ENCOPTS = -s hd720 -b 90M -threads 4 -mbd rd \ -pix_fmt yuv422p -frames 5 -qmax 8 -fate-vsynth%-dnxhd-720p-rd: FMT = dnxhd fate-vsynth%-dnxhd-720p-10bit: ENCOPTS = -s hd720 -b 90M \ -pix_fmt yuv422p10 -frames 5 -qmax 8 -fate-vsynth%-dnxhd-720p-10bit: FMT = dnxhd fate-vsynth%-dnxhd-720p-hr-lb: ENCOPTS = -s hd720 -profile:v dnxhr_lb \ -pix_fmt yuv422p -frames 5 fate-vsynth%-dnxhd-720p-hr-lb: DECOPTS = -sws_flags area+accurate_rnd+bitexact -fate-vsynth%-dnxhd-720p-hr-lb: FMT = dnxhd fate-vsynth%-dnxhd-4k-hr-lb: ENCOPTS = -s 4k -profile:v dnxhr_lb \ -pix_fmt yuv422p -frames 5 fate-vsynth%-dnxhd-4k-hr-lb: DECOPTS = -sws_flags area+accurate_rnd+bitexact -fate-vsynth%-dnxhd-4k-hr-lb: FMT = dnxhd fate-vsynth%-dnxhd-uhd-hr-sq: ENCOPTS = -s uhd2160 -profile:v dnxhr_sq \ -pix_fmt yuv422p -frames 5 fate-vsynth%-dnxhd-uhd-hr-sq: DECOPTS = -sws_flags area+accurate_rnd+bitexact -fate-vsynth%-dnxhd-uhd-hr-sq: FMT = dnxhd fate-vsynth%-dnxhd-2k-hr-hq: ENCOPTS = -s 2k -profile:v dnxhr_hq \ -pix_fmt yuv422p -frames 5 fate-vsynth%-dnxhd-2k-hr-hq: DECOPTS = -sws_flags area+accurate_rnd+bitexact -fate-vsynth%-dnxhd-2k-hr-hq: FMT = dnxhd fate-vsynth%-dnxhd-edge1-hr: ENCOPTS = -s 264x128 -profile:v dnxhr_hq \ -pix_fmt yuv422p -frames 5 fate-vsynth%-dnxhd-edge1-hr: DECOPTS = -sws_flags area+accurate_rnd+bitexact -fate-vsynth%-dnxhd-edge1-hr: FMT = dnxhd fate-vsynth%-dnxhd-edge2-hr: ENCOPTS = -s 271x135 -profile:v dnxhr_hq \ -pix_fmt yuv422p -frames 5 fate-vsynth%-dnxhd-edge2-hr: DECOPTS = -sws_flags area+accurate_rnd+bitexact -fate-vsynth%-dnxhd-edge2-hr: FMT = dnxhd fate-vsynth%-dnxhd-edge3-hr: ENCOPTS = -s 257x121 -profile:v dnxhr_hq \ -pix_fmt yuv422p -frames 5 fate-vsynth%-dnxhd-edge3-hr: DECOPTS = -sws_flags area+accurate_rnd+bitexact -fate-vsynth%-dnxhd-edge3-hr: FMT = dnxhd -FATE_VCODEC-$(call ENCDEC, DNXHD, MOV) += dnxhd-1080i dnxhd-1080i-10bit dnxhd-1080i-colr \ - dnxhd-hr-lb-mov dnxhd-hr-sq-mov dnxhd-hr-hq-mov +$(FATE_VCODEC_DNXHD_DNXHD:%=fate-vsynth\%-%): FMT = dnxhd +$(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-vsynth%-dnxhd-1080i: ENCOPTS = -s hd1080 -b 120M -flags +ildct \ -pix_fmt yuv422p -frames 5 -qmax 8 -fate-vsynth%-dnxhd-1080i: FMT = mov fate-vsynth%-dnxhd-1080i-10bit: ENCOPTS = -s hd1080 -b 185M -flags +ildct \ -pix_fmt yuv422p10 -frames 5 -qmax 8 fate-vsynth%-dnxhd-1080i-10bit: DECOPTS = -sws_flags area+accurate_rnd+bitexact -fate-vsynth%-dnxhd-1080i-10bit: FMT = mov fate-vsynth%-dnxhd-1080i-colr: ENCOPTS = -s hd1080 -b 120M -flags +ildct -movflags write_colr \ -pix_fmt yuv422p -frames 5 -qmax 8 fate-vsynth%-dnxhd-1080i-colr: DECOPTS = -sws_flags area+accurate_rnd+bitexact -fate-vsynth%-dnxhd-1080i-colr: FMT = mov fate-vsynth%-dnxhd-hr-lb-mov: ENCOPTS = -s uhd2160 -profile:v dnxhr_lb \ -pix_fmt yuv422p -frames 5 fate-vsynth%-dnxhd-hr-lb-mov: DECOPTS = -sws_flags area+accurate_rnd+bitexact -fate-vsynth%-dnxhd-hr-lb-mov: FMT = mov fate-vsynth%-dnxhd-hr-sq-mov: ENCOPTS = -s 2kscope -profile:v dnxhr_sq \ -pix_fmt yuv422p -frames 5 fate-vsynth%-dnxhd-hr-sq-mov: DECOPTS = -sws_flags area+accurate_rnd+bitexact -fate-vsynth%-dnxhd-hr-sq-mov: FMT = mov fate-vsynth%-dnxhd-hr-hq-mov: ENCOPTS = -s 2kflat -profile:v dnxhr_hq \ -pix_fmt yuv422p -frames 5 fate-vsynth%-dnxhd-hr-hq-mov: DECOPTS = -sws_flags area+accurate_rnd+bitexact -fate-vsynth%-dnxhd-hr-hq-mov: FMT = mov -FATE_VCODEC-$(call ENCDEC, DVVIDEO, DV) += dv dv-411 dv-50 dv-hd dv-fhd -fate-vsynth%-dv: CODEC = dvvideo +$(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-vsynth%-dv: ENCOPTS = -dct int -s pal -fate-vsynth%-dv: FMT = dv -fate-vsynth%-dv-411: CODEC = dvvideo fate-vsynth%-dv-411: ENCOPTS = -dct int -s pal -pix_fmt yuv411p \ -sws_flags area fate-vsynth%-dv-411: DECOPTS = -sws_flags area -fate-vsynth%-dv-411: FMT = dv -fate-vsynth%-dv-50: CODEC = dvvideo fate-vsynth%-dv-50: ENCOPTS = -dct int -s pal -pix_fmt yuv422p \ -sws_flags neighbor fate-vsynth%-dv-50: DECOPTS = -sws_flags neighbor -fate-vsynth%-dv-50: FMT = dv -fate-vsynth%-dv-fhd: CODEC = dvvideo fate-vsynth%-dv-fhd: ENCOPTS = -dct int -s 1440x1080 -pix_fmt yuv422p \ -sws_flags neighbor fate-vsynth%-dv-fhd: DECOPTS = -sws_flags neighbor -fate-vsynth%-dv-fhd: FMT = dv -fate-vsynth%-dv-hd: CODEC = dvvideo fate-vsynth%-dv-hd: ENCOPTS = -dct int -s 960x720 -pix_fmt yuv422p \ -sws_flags neighbor fate-vsynth%-dv-hd: DECOPTS = -sws_flags neighbor -fate-vsynth%-dv-hd: FMT = dv + +$(FATE_VCODEC_DV:%=fate-vsynth\%-%): CODEC = dvvideo +$(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 \ @@ -416,6 +403,7 @@ fate-vsynth%-snow: ENCOPTS = -qscale 2 -flags +qpel \ fate-vsynth%-snow-hpel: ENCOPTS = -qscale 2 \ -motion_est iter -dia_size 2 \ -cmp 12 -subcmp 12 -s 128x64 +fate-vsynth%-snow fate-vsynth%-snow-hpel: DECOPTS = $(DEFAULT_SIZE) fate-vsynth%-snow-ll: ENCOPTS = -qscale .001 -pred 1 \ -flags +mv4+qpel @@ -437,7 +425,7 @@ fate-vsynth%-v408: DECOPTS = -sws_flags neighbor+bitexact FATE_VCODEC-$(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 +fate-vsynth%-avui: DECOPTS = -sws_flags neighbor+bitexact $(DEFAULT_SIZE) fate-vsynth%-avui: FMT = mov FATE_VCODEC-$(call ENCDEC, WMV1, AVI) += wmv1 @@ -451,7 +439,7 @@ fate-vsynth%-yuv: CODEC = rawvideo FATE_VCODEC-$(call ENCDEC, XFACE, NUT) += xface fate-vsynth%-xface: ENCOPTS = -s 48x48 -sws_flags neighbor+bitexact -fate-vsynth%-xface: DECOPTS = -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