From patchwork Thu Apr 28 23:28:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35488 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b9e:b0:7d:cfb5:dc7c with SMTP id b30csp235160pzh; Thu, 28 Apr 2022 16:29:49 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxKR7ly36OLUYQo9YkxSyx9BkClFbqWeSMv4N//A0RN4EOOFnoNND9gvARkzLHVmKpT05g3 X-Received: by 2002:a05:6402:6d9:b0:425:e968:725b with SMTP id n25-20020a05640206d900b00425e968725bmr23850390edy.213.1651188589330; Thu, 28 Apr 2022 16:29:49 -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 u8-20020a1709067d0800b006f3a83e2606si5149224ejo.125.2022.04.28.16.29.49; Thu, 28 Apr 2022 16:29:49 -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="c1EZEoR/"; 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 C4AE768B353; Fri, 29 Apr 2022 02:28:59 +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-oln040092075108.outbound.protection.outlook.com [40.92.75.108]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D474968B2C2 for ; Fri, 29 Apr 2022 02:28:49 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VId47bUyKDJqzn/DG0NLvdgX6fAr9TYMKzM+HDYG1wY+qfHOcRBlJFA1f2BQ93js8ekXFqruxvjaK3+zYS4sTAyXE2AIaUYU/m3gfHAQPUCedviqenLwJ8A0Kac6VXJP6PypoVL4fHPUYbmOLcyeJ/sExKAjOdOoFlLxEKVaruk0aguRbStesnaPVhH9rFTL8FyYJ4QQt1toPI8d0T397NifrbziF4Uoy+/yIa7a0Egf1k7kyaqfsbT9D69QoZUwk7lMTc3OLCbku0EFZxxKsN5prfmlIsM4jrsxlwPjYKIqxN+vP/rLv6Sl9qtKzfEeGxa9Gwgx8QTMdoCs3DlE3Q== 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=uxBiRBz3BZNIedQyujZrL6hZx9X2gsh/i/Vd/szhbL4=; b=hQ24pbm+X4iJqjZ6vukbMGuKKwjInIs6e2rLGR/FAOhUMfd49bEDfvS64IsPxotsVMa8RKWyaVpR60ShqVcT5CtmJmYd/Uj4R3EE7APUrFC//2uU/Bq/f7LT7SPM0YrCv+X+W7xuHJi3rORNFAfnLZO8Zb4UDo4VNS9ZEEz7gNPEuA3dtkSLNlZcIIg5IeS7MwTUTvDmUvImc2QtuZRt3CE/JwDmTSI0VbN/kV/X4renVd7x1SSupmBWxzGSNpu6GFSiUPWdGW8r+EOCWBN84hKFlOJQI+1l3PYowq/JksIbvivrarsoGjp4CVa2V9BURtzKIM6GbWuKicplA7RFIQ== 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=uxBiRBz3BZNIedQyujZrL6hZx9X2gsh/i/Vd/szhbL4=; b=c1EZEoR/EyyujP16uuvIk0rgVAMQJVTeiLf0ARDdWK2QZd5SzHR7xWwf8vYR5FEFNTbzDheVZmCYyUrgrKYOm3nbBjRkxdWjOdL9JDQUKf8pqxabg/pj7K/XEl5P+ln8FicbGvqSdx6A2/1SxF9jUNLquZ4TEjZ3de7RxloymYQzWaaSfxrDQd5zl/RfFKpHWpAaZCKiqOT6BAGSSzID1xOBMtQ5G2xMtYRRaMcgUMTpLrUNexOScLMvbKeBLguMe1f6CWIXO0Kvq4LHASl6Nv0qvYeCUuQw8bhsdDxWH4qV5MSEs1bo/a1jKSPevlPPRb1egvV1o1gHARjTV5osGg== Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) by PA4PR01MB9140.eurprd01.prod.exchangelabs.com (2603:10a6:102:27f::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.13; Thu, 28 Apr 2022 23:28:48 +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.021; Thu, 28 Apr 2022 23:28:48 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 29 Apr 2022 01:28:20 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [Xar78O59Yw04LFIMT7Z72UiGcQkDKzMB] X-ClientProxiedBy: ZR0P278CA0054.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:1d::23) To AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) X-Microsoft-Original-Message-ID: <20220428232824.657476-8-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e386860f-970b-42a4-a0d5-08da296ed868 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiRlrIlNS1TwwjxLRzEWC2xMurPcyEtAbfW4tfTFEceVY4/hQqQ+L1g57OouAXfdW9N4MVT9ZF8jFSu4mtwvxT3VaFDcO6WbjWt3aEcOp8oL903E4smc7lvXLvj6UfshuwNGKE8YEXjRwW3qu8/NJsySSYY0wrnGFE6b+k4bCK/0Ej/EOJzOzWIR5OzoGWIL5gg6HqZQoF0IO0irNHxP6ekj4bHyJVjoseqP52NTCwJxn6AzTc7CgjIkmd5Qg6DzvJxFwzRXYuES3dmiuk7tmCyaNh5M329gjul0lO5RCQxizznLB4x6HXL9F8GOgJtUAgvfdnqdJRfJgloRCqNj1l3yC2m5kaMfkcI18dDJ5AnwL54edfXmdBTt9GFz/DWiYiIN+HfNjOauH6FSSJlQVWQqtsXEfRfjh/5FZx2OVEbXQvz/YfExRc7oZfA4/gGOI/kuASZA9db3ZtK8k/RBVzIqxiUAiMaG5rDlWLK1My8CP3XYo0ITgF0kMIY/V0QTmeujWf0rHV0D+3Aqcs2cqL/xwKQUgBICRBrFyWew1DZwjFlarnbYuRlewQYVvmuc3rBUNy1FWqELzxIEF8B8ikyyBBNYJrd4tJ6JxcWJRv3RZy3ozlotRvDnXy4B5K5Pee/vjiHoNyDEsIruqBLF2gW0Zxvm5g7YfR6Tz68omhGK7eJE9fjFKYGf60lw22hJNW+nxCHeoaPbekCYFwfaG07/nAXBjaAyT8dHiNNXNw/IlmnUnSglcdFTf1n59EwJ2rE= X-MS-TrafficTypeDiagnostic: PA4PR01MB9140:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: DKuDv+zbZUIQW2nH5eRyp5gBeKakp6tEUGSHJeExSDw/28T4nTbRyaeHvEmqCwotbgArGYOO+1Azw5UApmxOl6SEuvcphWprFa8l7UxmWHJDlmI0Q9EsQnHrwveIKekVJngAJ/EXhsGyqy+PIh/ECMbY2/bvG6pkX+BUP4+jpNVRLXibHNz1K7mp9Ecnd8dEOBE42uKLStXStJg7nvuqANKRMxA0enrdF6HmrZr9cbHH5G/uRgUit/jJgNwon+x1nv8AHTRvmkZmMJNk+wORCwPcEMOOphrJVt3CIRExMezRpgvcTF1MA3W7cqjo+DeNgS5glxk1pZsgiUJI6mCFn2yrdTd3RS3Zb5Zvr2TYY/NB9seQSTIJ84O/mdpKW8fvGAfFAqGHV1fWP92OqWyJ7o2Gt8Li3Ja3afRMCFCUVATkbk/Fylw9REV1fc1NJf10THv/vLYtRly0vBtoZ82sUBo/KrcmJygMqsVs2cxs1ONrTl29feSg+1NFoI6cZrnulZlwzCMSUjkmbYZqpQfYOR5A4pZAsP5bYIM+5lc10YrWPPfkwbT1jBlhoYeArFUg9N4b8jVQQ1ldMHlECKIwAg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: o5nFl6FecYRnenCqI51ZpSAFHyyyxTIu42Z3PG3RhhvFFsDY+a95Lu6WLop2kBfnjIN0Dy97uhjvUTxI2tbENLnjffikNbSbbmeNeH61jLPEm8Fljxjy5drAVrofIfjaQUXZw0LGBvbRrMGFbp2akdqQMl2gfKik81zYbLQnN8TJwGIaaAWgEzHiZyO3aif3gb+W2v4rQSI+/m7quberFusVIhNmRb2UsjzcyiBSLXY5zGpDtDjzYn7xQCy1U60jNHcct0snHZJ3zMPqwfaH1/wtE5kUqEr2QJo8PiNJR21B5De6e+Gd087gN6LkA3CKrkHlsQ4wAvQ5TM5iDsNzQdTbP78FOgQN1SDNGN/oDeDbVJVmLUJrroqoo6bMJsjo5NGRfStrjJ9RQmHOOLb1ZNynICxqjKtKUoixaZqwAHpQm6ZuBFS/NH9MgdmzFJbHAUSYlyWoAyrIsgYs9QGifLBQKijCBZ6jLuwbBu0P0XR6G1OrLrTTJFT8qFqUGifgA0xcDXQ8vgFpAYU9Ic8z7v91LUN5psHuzJHEXbMKvEzig12hZITI9uf3BT8iw9mhJET4SNkEnPQavfVW2HCFyk4iRS6VUw+nbxu5RUK9gdI5ig8XxzvqgdPggTcipjoCx1MvLzxn8BUyhpKPmq/t5PYiVMn2Krxscs3yKgDYOXHi3LC9bEsLgS0cMpZDVVT+FoJGTTbhhmK26GHI5l7Fp+5j90pWUH1GRdriJkwhWmWzuywQ9bIsNS+Ok0ODR18adSGzmnMOz56gb5eemy2c9blyI7EcdPrijSAm3qRgV76gW1Kd5rMekgD9cpkCNwLgqFmaItHIAxGRTNNbytRnHNIaC0Cppaxw4o0KM+MJCiPhgssaK6vL1Occy3M/O+BKAmVOb7RuF23m4T05ElAUAYrjRQzdvctkQbUkjo4McIQx/n0UnvCmpvVtikixGH8oG0u5VqLVreRaWZnqaJI5CPVb18MA3Df3ozthsnKpFS3VPx3DvoZctMm7VgG6G7o5sz3q5FbZhv0ZZul4Zi+e2UT80tvfFnvX8CGiFnzFm3PHkBZZHy4J7aNkMmM2p+VSG9/QUtzEbC+3V+Emk2Ti7Fh2fKs+iLv9pjcVc5jMfNmT0ZFl8DcmnbGurtyKw34Xy2Hy8GAM3vE1/iwZLB5LdVQ8+k23lhKUoImbjuEn2mFGOKj9yzRUZtt3S14c5/fKgJUxV8a85VfS+ALQOgeSObjNTiQIryG4rdrIlIMoHPQXlMV7OAu5OFiNmGeDud0YuE3fDLXKpxds2xjnj4B4r91147wq6VFzAsOz+cLVuyRiAKV9SjjaMoUKFHr8Blel88V/WMC580SXmCPY+7jfypguvvDw9dsF35mgurNGSh37VnRRal+byF4Ch7Cy2o1qPmX2t+sX4fKFL9Lgay/0TeHVsdP1R2GXb2nNsogF0PhTss+tAJ+ozbDrqezW6aBN X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e386860f-970b-42a4-a0d5-08da296ed868 X-MS-Exchange-CrossTenant-AuthSource: AS8PR01MB7944.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Apr 2022 23:28:48.2426 (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: PA4PR01MB9140 Subject: [FFmpeg-devel] [PATCH 09/13] fate/vpx: 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: mhNdMkoBfgUb Signed-off-by: Andreas Rheinhardt --- tests/Makefile | 2 +- tests/fate/vpx.mak | 68 ++++++++++++++++++++++++---------------------- 2 files changed, 36 insertions(+), 34 deletions(-) diff --git a/tests/Makefile b/tests/Makefile index b4252a991b..5de9ad4c9f 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -245,7 +245,7 @@ $(FATE_FFMPEG) $(FATE_FFMPEG_FFPROBE) $(FATE_SAMPLES_AVCONV) $(FATE_SAMPLES_FFMP $(FATE_FFPROBE) $(FATE_FFMPEG_FFPROBE) $(FATE_SAMPLES_FFPROBE) $(FATE_SAMPLES_FFMPEG_FFPROBE): ffprobe$(PROGSSUF)$(EXESUF) $(FATE_SAMPLES_FASTSTART): tools/qt-faststart$(EXESUF) -$(FATE_SAMPLES_DUMP_DATA): tools/venc_data_dump$(EXESUF) +$(FATE_SAMPLES_DUMP_DATA) $(FATE_SAMPLES_DUMP_DATA-yes): tools/venc_data_dump$(EXESUF) $(FATE_SAMPLES_SCALE_SLICE): tools/scale_slice_test$(EXESUF) ifdef SAMPLES diff --git a/tests/fate/vpx.mak b/tests/fate/vpx.mak index a59971b092..dc8e9e04b7 100644 --- a/tests/fate/vpx.mak +++ b/tests/fate/vpx.mak @@ -4,10 +4,10 @@ fate-truemotion1-15: CMD = framecrc -i $(TARGET_SAMPLES)/duck/phant2-940.duk -pi FATE_TRUEMOTION1 += fate-truemotion1-24 fate-truemotion1-24: CMD = framecrc -i $(TARGET_SAMPLES)/duck/sonic3dblast_intro-partial.avi -pix_fmt rgb24 -an -vf scale -FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, TRUEMOTION1) += $(FATE_TRUEMOTION1) +FATE_SAMPLES_FFMPEG-$(call FRAMECRC, AVI, TRUEMOTION1, SCALE_FILTER) += $(FATE_TRUEMOTION1) fate-truemotion1: $(FATE_TRUEMOTION1) -FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, TRUEMOTION2) += fate-truemotion2 +FATE_SAMPLES_FFMPEG-$(call FRAMECRC, AVI, TRUEMOTION2) += fate-truemotion2 fate-truemotion2: CMD = framecrc -i $(TARGET_SAMPLES)/duck/tm20.avi FATE_TRUEMOTION2RT += fate-truemotion2rt-low @@ -19,73 +19,75 @@ fate-truemotion2rt-mid: CMD = framecrc -i $(TARGET_SAMPLES)/duck/tr20_mid.avi -a FATE_TRUEMOTION2RT += fate-truemotion2rt-high fate-truemotion2rt-high: CMD = framecrc -i $(TARGET_SAMPLES)/duck/tr20_high.avi -an -FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, TRUEMOTION2RT) += $(FATE_TRUEMOTION2RT) +FATE_SAMPLES_FFMPEG-$(call FRAMECRC, AVI, TRUEMOTION2RT) += $(FATE_TRUEMOTION2RT) fate-truemotion2rt: $(FATE_TRUEMOTION2RT) -FATE_VP3-$(call DEMDEC, MATROSKA, THEORA) += fate-theora-coeff-level64 +FATE_VP3-$(call FRAMECRC, MATROSKA, THEORA) += fate-theora-coeff-level64 fate-theora-coeff-level64: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/vp3/coeff_level64.mkv -FATE_VP3-$(call DEMDEC, OGG, THEORA) += fate-theora-offset +FATE_VP3-$(call FRAMECRC, OGG, THEORA) += fate-theora-offset fate-theora-offset: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/vp3/offset_test.ogv -FATE_VP3-$(call DEMDEC, AVI, VP3) += fate-vp31 +FATE_VP3-$(call FRAMECRC, AVI, VP3) += fate-vp31 fate-vp31: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/vp3/vp31.avi FATE_SAMPLES_AVCONV += $(FATE_VP3-yes) fate-vp3: $(FATE_VP3-yes) -FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, VP4) += fate-vp4 +FATE_SAMPLES_FFMPEG-$(call FRAMECRC, AVI, VP4) += fate-vp4 fate-vp4: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/vp4/KTkvw8dg1J8.avi -FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, VP5) += fate-vp5 +FATE_SAMPLES_FFMPEG-$(call FRAMECRC, AVI, VP5) += fate-vp5 fate-vp5: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/vp5/potter512-400-partial.avi -an -FATE_VP6-$(call DEMDEC, EA, VP6) += fate-vp60 +FATE_VP6-$(call FRAMECRC, EA, VP6) += fate-vp60 fate-vp60: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/ea-vp6/g36.vp6 -FATE_VP6-$(call DEMDEC, EA, VP6) += fate-vp61 +FATE_VP6-$(call FRAMECRC, EA, VP6) += fate-vp61 fate-vp61: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/ea-vp6/MovieSkirmishGondor.vp6 -t 4 -FATE_VP6-$(call DEMDEC, MOV, VP6A) += fate-vp6a +FATE_VP6-$(call FRAMECRC, MOV, VP6A) += fate-vp6a fate-vp6a: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/flash-vp6/300x180-Scr-f8-056alpha.mov -FATE_VP6-$(call DEMDEC, MOV, VP6A) += fate-vp6a-skip_alpha +FATE_VP6-$(call FRAMECRC, MOV, VP6A) += fate-vp6a-skip_alpha fate-vp6a-skip_alpha: CMD = framecrc -flags +bitexact -skip_alpha 1 -i $(TARGET_SAMPLES)/flash-vp6/300x180-Scr-f8-056alpha.mov -FATE_VP6-$(call DEMDEC, FLV, VP6F) += fate-vp6f +FATE_VP6-$(call FRAMECRC, FLV, VP6F) += fate-vp6f fate-vp6f: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/flash-vp6/clip1024.flv -FATE_VP8-$(CONFIG_WEBM_DASH_MANIFEST_DEMUXER) += fate-webm-dash-manifest +FATE_WEBM_DASH_MANIFEST += fate-webm-dash-manifest fate-webm-dash-manifest: CMD = run $(FFMPEG) -nostdin -f webm_dash_manifest -i $(TARGET_SAMPLES)/vp8/dash_video1.webm -f webm_dash_manifest -i $(TARGET_SAMPLES)/vp8/dash_video2.webm -f webm_dash_manifest -i $(TARGET_SAMPLES)/vp8/dash_audio1.webm -f webm_dash_manifest -i $(TARGET_SAMPLES)/vp8/dash_audio2.webm -c copy -map 0 -map 1 -map 2 -map 3 -f webm_dash_manifest -adaptation_sets "id=0,streams=0,1 id=1,streams=2,3" - -FATE_VP8-$(CONFIG_WEBM_DASH_MANIFEST_DEMUXER) += fate-webm-dash-manifest-unaligned-video-streams +FATE_WEBM_DASH_MANIFEST += fate-webm-dash-manifest-unaligned-video-streams fate-webm-dash-manifest-unaligned-video-streams: CMD = run $(FFMPEG) -nostdin -f webm_dash_manifest -i $(TARGET_SAMPLES)/vp8/dash_video1.webm -f webm_dash_manifest -i $(TARGET_SAMPLES)/vp8/dash_video3.webm -c copy -map 0 -map 1 -f webm_dash_manifest -adaptation_sets "id=0,streams=0,1" - -FATE_VP8-$(CONFIG_WEBM_DASH_MANIFEST_DEMUXER) += fate-webm-dash-manifest-unaligned-audio-streams +FATE_WEBM_DASH_MANIFEST += fate-webm-dash-manifest-unaligned-audio-streams fate-webm-dash-manifest-unaligned-audio-streams: CMD = run $(FFMPEG) -nostdin -f webm_dash_manifest -i $(TARGET_SAMPLES)/vp8/dash_audio1.webm -f webm_dash_manifest -i $(TARGET_SAMPLES)/vp8/dash_audio3.webm -c copy -map 0 -map 1 -f webm_dash_manifest -adaptation_sets "id=0,streams=0,1" - -FATE_VP8-$(CONFIG_WEBM_DASH_MANIFEST_DEMUXER) += fate-webm-dash-manifest-representations +FATE_WEBM_DASH_MANIFEST += fate-webm-dash-manifest-representations fate-webm-dash-manifest-representations: CMD = run $(FFMPEG) -nostdin -f webm_dash_manifest -i $(TARGET_SAMPLES)/vp8/dash_video1.webm -f webm_dash_manifest -i $(TARGET_SAMPLES)/vp8/dash_video4.webm -c copy -map 0 -map 1 -f webm_dash_manifest -adaptation_sets "id=0,streams=0,1" - -FATE_VP8-$(CONFIG_WEBM_DASH_MANIFEST_DEMUXER) += fate-webm-dash-manifest-live +FATE_WEBM_DASH_MANIFEST += fate-webm-dash-manifest-live fate-webm-dash-manifest-live: CMD = run $(FFMPEG) -nostdin -f webm_dash_manifest -live 1 -i $(TARGET_SAMPLES)/vp8/dash_live_video_360.hdr -f webm_dash_manifest -live 1 -i $(TARGET_SAMPLES)/vp8/dash_live_audio_171.hdr -c copy -map 0 -map 1 -fflags +bitexact -f webm_dash_manifest -live 1 -adaptation_sets "id=0,streams=0 id=1,streams=1" -chunk_start_index 1 -chunk_duration_ms 5000 -time_shift_buffer_depth 7200 -minimum_update_period 60 - -FATE_VP8-$(CONFIG_WEBM_DASH_MANIFEST_DEMUXER) += fate-webm-dash-manifest-live-bandwidth +FATE_WEBM_DASH_MANIFEST += fate-webm-dash-manifest-live-bandwidth fate-webm-dash-manifest-live-bandwidth: CMD = run $(FFMPEG) -nostdin -f webm_dash_manifest -live 1 -bandwidth 100 -i $(TARGET_SAMPLES)/vp8/dash_live_video_360.hdr -f webm_dash_manifest -live 1 -bandwidth 200 -i $(TARGET_SAMPLES)/vp8/dash_live_audio_171.hdr -c copy -map 0 -map 1 -fflags +bitexact -f webm_dash_manifest -live 1 -adaptation_sets "id=0,streams=0 id=1,streams=1" -chunk_start_index 1 -chunk_duration_ms 5000 -time_shift_buffer_depth 7200 -minimum_update_period 60 - -FATE_VP8-$(call DEMDEC, MATROSKA, VP8) += fate-vp8-2451 +FATE_VP8-$(call DEMMUX, WEBM_DASH_MANIFEST, WEBM_DASH_MANIFEST, PIPE_PROTOCOL) += $(FATE_WEBM_DASH_MANIFEST) + +FATE_VP8-$(call FRAMECRC, MATROSKA, VP8) += fate-vp8-2451 fate-vp8-2451: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/vp8/RRSF49-short.webm -vsync cfr -an FATE_SAMPLES_AVCONV += $(FATE_VP6-yes) fate-vp6: $(FATE_VP6-yes) -FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, VP7) += fate-vp7 +FATE_SAMPLES_FFMPEG-$(call FRAMECRC, AVI, VP7) += fate-vp7 fate-vp7: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/vp7/potter-40.vp7 -frames 30 -an VP8_SUITE = 001 002 003 004 005 006 007 008 009 010 011 012 013 014 015 016 017 define FATE_VP8_SUITE -FATE_VP8-$(call DEMDEC, IVF, VP8) += fate-vp8-test-vector-$(1) +FATE_VP8-$(call FRAMEMD5, IVF, VP8) += fate-vp8-test-vector-$(1) fate-vp8-test-vector-$(1): CMD = framemd5 -i $(TARGET_SAMPLES)/vp8-test-vectors-r1/vp80-00-comprehensive-$(1).ivf fate-vp8-test-vector-$(1): REF = $(SRC_PATH)/tests/ref/fate/vp8-test-vector-$(1) endef @@ -94,11 +96,11 @@ $(foreach N,$(VP8_SUITE),$(eval $(call FATE_VP8_SUITE,$(N)))) # FIXME this file contains two frames with identical timestamps, # so ffmpeg drops one of them -FATE_VP8-$(call DEMDEC, IVF, VP8) += fate-vp8-sign-bias +FATE_VP8-$(call FRAMEMD5, IVF, VP8) += fate-vp8-sign-bias fate-vp8-sign-bias: CMD = framemd5 -i $(TARGET_SAMPLES)/vp8/sintel-signbias.ivf fate-vp8-sign-bias: REF = $(SRC_PATH)/tests/ref/fate/vp8-sign-bias -FATE_VP8-$(call DEMDEC, MATROSKA, VP8) += fate-vp8-size-change +FATE_VP8-$(call FRAMEMD5, MATROSKA, VP8, SCALE_FILTER) += fate-vp8-size-change fate-vp8-size-change: CMD = framemd5 -flags +bitexact -i $(TARGET_SAMPLES)/vp8/frame_size_change.webm -frames:v 30 -sws_flags bitexact+bilinear fate-vp8-size-change: REF = $(SRC_PATH)/tests/ref/fate/vp8-size-change @@ -106,13 +108,13 @@ FATE_SAMPLES_AVCONV += $(FATE_VP8-yes) fate-vp8: $(FATE_VP8-yes) define FATE_VP9_SUITE -FATE_VP9-$(CONFIG_MATROSKA_DEMUXER) += fate-vp9$(2)-$(1) +FATE_VP9-$(call FRAMEMD5, MATROSKA, VP9) += fate-vp9$(2)-$(1) fate-vp9$(2)-$(1): CMD = framemd5 $(3) -i $(TARGET_SAMPLES)/vp9-test-vectors/vp90-2-$(1).webm fate-vp9$(2)-$(1): REF = $(SRC_PATH)/tests/ref/fate/vp9-$(1) endef define FATE_VP9_PROFILE_SUITE -FATE_VP9-$(CONFIG_MATROSKA_DEMUXER) += fate-vp9p$(2)-$(1) +FATE_VP9-$(call FRAMEMD5, MATROSKA, VP9, $(4)) += fate-vp9p$(2)-$(1) fate-vp9p$(2)-$(1): CMD = framemd5 -i $(TARGET_SAMPLES)/vp9-test-vectors/vp9$(2)-2-$(1).webm $(3) fate-vp9p$(2)-$(1): REF = $(SRC_PATH)/tests/ref/fate/vp9p$(2)-$(1) endef @@ -132,9 +134,9 @@ $(foreach SHARP,$(VP9_SHARP),$(eval $(call FATE_VP9_SUITE,01-sharpness-$(SHARP)) $(foreach W,$(VP9_SIZE_A),$(eval $(foreach H,$(VP9_SIZE_A),$(eval $(call FATE_VP9_SUITE,02-size-$(W)x$(H)))))) $(foreach W,$(VP9_SIZE_B),$(eval $(foreach H,$(VP9_SIZE_B),$(eval $(call FATE_VP9_SUITE,03-size-$(W)x$(H)))))) $(eval $(call FATE_VP9_SUITE,03-deltaq)) -$(foreach SS,$(VP9_CHROMA_SUBSAMPLE),$(eval $(call FATE_VP9_PROFILE_SUITE,04-yuv$(SS),1,))) -$(foreach BD,$(VP9_HIGH_BITDEPTH),$(eval $(call FATE_VP9_PROFILE_SUITE,20-$(BD)bit-yuv420,2,-pix_fmt yuv420p$(BD)le -vf scale))) -$(foreach BD,$(VP9_HIGH_BITDEPTH),$(eval $(foreach SS,$(VP9_CHROMA_SUBSAMPLE),$(eval $(call FATE_VP9_PROFILE_SUITE,20-$(BD)bit-yuv$(SS),3,-pix_fmt yuv$(SS)p$(BD)le -vf scale))))) +$(foreach SS,$(VP9_CHROMA_SUBSAMPLE),$(eval $(call FATE_VP9_PROFILE_SUITE,04-yuv$(SS),1,,))) +$(foreach BD,$(VP9_HIGH_BITDEPTH),$(eval $(call FATE_VP9_PROFILE_SUITE,20-$(BD)bit-yuv420,2,-pix_fmt yuv420p$(BD)le -vf scale, SCALE_FILTER))) +$(foreach BD,$(VP9_HIGH_BITDEPTH),$(eval $(foreach SS,$(VP9_CHROMA_SUBSAMPLE),$(eval $(call FATE_VP9_PROFILE_SUITE,20-$(BD)bit-yuv$(SS),3,-pix_fmt yuv$(SS)p$(BD)le -vf scale, SCALE_FILTER))))) $(eval $(call FATE_VP9_SUITE,06-bilinear)) $(eval $(call FATE_VP9_SUITE,09-lf_deltas)) $(eval $(call FATE_VP9_SUITE,10-show-existing-frame)) @@ -149,14 +151,14 @@ $(eval $(call FATE_VP9_SUITE,tiling-pedestrian)) $(eval $(call FATE_VP9_SUITE,trac3849)) $(eval $(call FATE_VP9_SUITE,trac4359)) -FATE_VP9-$(CONFIG_IVF_DEMUXER) += fate-vp9-05-resize +FATE_VP9-$(FRAMEMD5, IVF, VP9, SCALE_FILTER) += fate-vp9-05-resize fate-vp9-05-resize: CMD = framemd5 -i $(TARGET_SAMPLES)/vp9-test-vectors/vp90-2-05-resize.ivf -s 352x288 -sws_flags bitexact+bilinear fate-vp9-05-resize: REF = $(SRC_PATH)/tests/ref/fate/vp9-05-resize fate-vp9-encparams: CMD = venc_data $(TARGET_SAMPLES)/vp9-test-vectors/vp90-2-segmentation-aq-akiyo.webm 0 5 -FATE_SAMPLES_DUMP_DATA += fate-vp9-encparams +FATE_SAMPLES_DUMP_DATA-$(call DEMDEC, MATROSKA, VP9) += fate-vp9-encparams -FATE_VP9-$(CONFIG_MATROSKA_DEMUXER) += fate-vp9-encparams +FATE_VP9-$(call DEMDEC, MATROSKA, VP9) += fate-vp9-encparams -FATE_SAMPLES_AVCONV-$(CONFIG_VP9_DECODER) += $(FATE_VP9-yes) +FATE_SAMPLES_FFMPEG += $(FATE_VP9-yes) fate-vp9: $(FATE_VP9-yes)