From patchwork Sat Apr 30 06:25:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35523 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp708253pzb; Fri, 29 Apr 2022 23:26:58 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxDMN0lUXehdG0Y7ZYYSZVpXQc3IY21G2HNgTYW77nn91GsZBddOAvEWWR2+EH4MxNomUvD X-Received: by 2002:a05:6402:518b:b0:427:ae8b:a400 with SMTP id q11-20020a056402518b00b00427ae8ba400mr733298edd.52.1651300018151; Fri, 29 Apr 2022 23:26:58 -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 ka24-20020a170907991800b006e8cb4353d9si7164652ejc.290.2022.04.29.23.26.47; Fri, 29 Apr 2022 23:26:58 -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=X99X0DNm; 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 AFD6168B363; Sat, 30 Apr 2022 09:26:34 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-oln040092069081.outbound.protection.outlook.com [40.92.69.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 94F7568B30A for ; Sat, 30 Apr 2022 09:26:28 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MDmLLP/w/aLMDrpfxkFwquCQD+ljJv45f0bIdGhOL2HFI4FQAfhxCN+cZAlpJwdXYfCriE+ZCtN/qAaa1/3Asw3PTId6J+IACcQrYohCbiE/JqxKsg6qgj/ftIz7UgD16bQdx7vYTJAdwJDKcv+eB/3bRd0viicUsqmTofcuTFl71CiV+NJsp8PzdZfd4IfpPZbCch3FP7BSnnWU9tA/+TlRW+Vt8YCthrIFCk+HExrLxq5KZZVo6M3rgnjnqZuTDuqPLMt8XoXyhUfzruOzWcIjzZ4QLgWRDEe0VV8QDHt6dHpv1MXH1NK8NyJ/CLVB40TGCZQTozlvTBThpnd7CA== 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=d/jEJAriKSP79s0cKuGmUtcz4wsv5Jpz+MwyR/S4puk=; b=B1vhQVSB1mq2mit6KheJuq8iCr6cb9fTL3Vvj0Ayz5iewXs7PHYeX1GxwKp3i8IjSm1EZhAz63bBrJ4TdPhduf8WgNTQoXVp3kfn7emEHTSGD1wti1fUD9L2LPCFqtbmiyeQlBCIgkcke2J5EgxlkDS8944qDkwe+N4zqlq2s5f+gb7C0fbaudrtbq3spF0tHPkyI3eIYQJyOt0MjI6xbwOE7+yOmBmwCGRTvQ0vWqUg0tQc4N+kg+YQ/jJO+QztkWIphUVmzlVqWmRRjWqsbddkdcZziCH2BDqGnNtdLZr1kQ1PXxddbq3AVYjaqukafRp5ARvVEiT3EcakVw2fyg== 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=d/jEJAriKSP79s0cKuGmUtcz4wsv5Jpz+MwyR/S4puk=; b=X99X0DNmq1gs5tfZo1sdvnEIT1X9G7YcrpM1pp/GwyYfNBuusMfKlDFmJ/vVQ0daFct5bT1CndcN7EFYqDKkCuESAB2uUGZHMi/Kq4N2gO6KhuKr+Y+xRctV6ywi8DIGH3MSmMndRwXldf//+2yVAEChBHE308ED8LLCcIBvpHyXyuGX081SpE9EbaODcuIV7CHywnEASJWnAR2/99KJ40DK5Re8qMqmQiC7l+z4Xb0GtubXLB2pg6YeGX9yabwAsE6ybxA0ICtuctzId93AC4N/dV+Qv69vysZi9+lZpKH816tbr/v5Oz5r8imb5R+5KrdfxHti8/WGcPGHT27P3w== Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) by VI1PR01MB5406.eurprd01.prod.exchangelabs.com (2603:10a6:803:cc::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5186.15; Sat, 30 Apr 2022 06:26:18 +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; Sat, 30 Apr 2022 06:26:18 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 30 Apr 2022 08:25:22 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [vcsGZ/hkn/IfwLluEecPOR/VfDCBTvC+] X-ClientProxiedBy: ZR0P278CA0192.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:44::16) To AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) X-Microsoft-Original-Message-ID: <20220430062523.1425391-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 74039e2e-a805-4384-7ce4-08da2a7255a9 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNViLEfi+B1v2W1R2oBej65d+rm0I2cwkBZbWv4zgNpr6lr0Vnlqg9CnyMjIRRw0+BVSMi8Hb4Xm5D9DE+nHA3XIb9rHjxywG/mY5ZnrY1WdxcPktfGLJ6+Z0xQY7GYTU6dk2aFgJoHDxHnPqva0loQ7Q78Cs8yuSttRUClGPMk8YvAXgP/Bx6JsGW1wBZkRMhlv+lCLHYGgSm2UQ1Y5hkoLFLZ9qyB6W75CmYP3ptAOZoNzUVwbSNetbow8zbR4YenfoRn5encptpkDZLHz2MRhZmZhMVoUVgr6cWutVivOx/IZAYDRekgjHbpVFlDzmymcH8j3d93p+jYG1x0rsQun4UF/Y82xYokRGiKm73M+zZfKfCLghfQAb72f698OZNRWIhVzMq0tqou50KwnVreoMxqrziGrclXTyvx9XdgAuHw67Yx4W6ENCaxDzcxYHOr1+oJJBkG9NtUPgiAQ10Ca/EAoGxAN2eHjrmXguhvpNd2dzMOUcWf5jYNq87vaxTR9aDmuYYtc62cRp0kcrOcpbi9EdddzrtnHUywWZtZrN7dYI4TgL56yIx9ah/ZJMs7BRglB4ScfsMoQ/K2Avplr3mq4c+379wHPmq7v0tGpx6JPuTJ6gYLgx5uKIpaMdC5mrJAo5LbUa0Gzk1drb54r0Pj6xW3dA5G7nUJXXzGuWBh9ZH4bYXkgx12nNLiiBERthT5P6bpl/nFBPQUokPJfVo5G9PG3AFk= X-MS-TrafficTypeDiagnostic: VI1PR01MB5406:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Mn58uJ+Gl9Sx8C9IoGPdw9dCyfgD3Uswo9Lk6aJ9VNtUJklbYBYdPhvSHJKD9ioF1jYZXdZwYYlo8jPfpFLanPxF0aIxIaeJmZFkAyI8A4dOc6q+AibhzvTW9NfQCtAsqcVN0iDXCHrIE0fjL6WbHCFmu1j2g5L4s68CSpXi1qVasSKfBdkK/bmdoaxsXR74AadszDo0XENU9GodpxNpN7IDQ7lUZEljljYyJz2K3KRQVLpJSAihxmw4uxBDd50eNjtvn55XeelMM7sBVYasi8L7FuwolcW8IQfhqhbrCYlVZV+L0ge1ZJZC4ldVurYLzVAHx4voxwmu/J4aJuAvP1u8/iGwN0Sp2HonS2gpQYzWOb61kWiZyYxpt4xSc12egftVM/m0nFL6xdZ3GBnr9heCcxyXPBHLVoeF1E744ec4/H7iOz6LGLaO7ewQlgqH9Af4iVrg+kaVi7ufvVWrA7sp8Vmr+qWVmBifCYFRv2Hx8Ul674nyjLG/P1qDkv+qr+0/8Er0n2kxoIQkDPZJYYI8FJTLJqiM9cwA4XeTWUI2CgleCHOGcUl5P/X3gFQ0OdQKNNJFUF490iG2SQa0Kw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ZLqzQ4B8+6gHmKhQsmMRRUyhIN+f5xU3WQfl8qEBC/o6MLBcQKBnZGZbjpkVwtj87+bv7Ux2wddPQ8v4lDR/lHl4Qk+9LiSM4pQJ8/imgCcgR4PpU6MrB7UPPEnyL6mKSZgxYj6PvVNZvdiWck3yRSqX32MGwp66ltl7Am1CGujQx0Iaif66TWxN7MMAkmnHoskfBHcmUD3xt/A1Pmk0ifSpuVFXMJfEhcK67ZuakzKTubLDL4ruCJVMT4+a4ISLXnZPtzDUc/PglNSma7jT30TdVeG3IHrpkhYfTage3fUVjd5qGCkfUcjSsOWvbGP6/mJQ5WAXoE4+xuLiV+eMF4XTEFxLTZ6MoNMNevJ9U/dfM5UrX5ukDlyL4XzUUVtY1M4sYCWC8TK1qwt8uvwLBtQAExuI5Su2iTePaTItVh3YyNzwWjCD8tZWzRBYYAlN5Hnt+F/xKkI3KZvR8aW6ayjCTLYYOjadtJF45HD0+1QOukZKta9CtikY3jcY7cK8zQCz+RpDX+WC2UWxnTVa2/a69XlA3kKY9V6rloMzPEFUgykBRmXoNdC1l/YhNfetkXtqirdN/nEPsSQQ+8YJML+O69cfwtpnP5ij/aJp9DDf0I4le+v0NwJEAWGjMMW5BXUsqwpVt9zwEJTclJGirS7VCFUtiCQrnY4pAi4G8ncRGMZGdLwhLFtTIFYQKtX5FNt5DeOcE7ZkmujX39w4h0s0OTv/VIog5/N9/m8rZ4u7LLmlI8ESfo/6R6IJPFbtAB1TpkzD67q6b0/14Ma4XlNjQaGF/XtolsTRJYALI+oRefz6MlhIVWR0L128W5ASpTpFgXNmEl5pfaqqv+odfGMw63rxgkfJQgXIDAhDsW+Ah7CAlA070if3LmMuTt/4E9IM3nGme67Z/kgAfDe8ihaA6wsyTpSfHXlxhcV1+uD6H3hEyuj0DqCdnbuNsKuXvA2Z08bKe3WHVcvQDsr6ygpvGyh/1FdAAqG5HGLUA7NtdxiyPA2g7uL3oVlWtWXjlQQ45TqhL7sKMjXCB/kKzpq8/U2ptmL7XqVIce56UMxtZGxualyKrkVKWyR0RGrtGHmQrX7Kw39izGcjnLpD0p8weFR/CLDdnv5HKU56LnirTXiTaOZDm+3wHPAtLHudxpsv9GZF8Z3V88QY66kvGekoaxKeihlCMSu/u/602HpCV2dPscxGPWppeTWXEQY9k20td7cnt5ubINiJl5v7LrFU6GIFF9y45xkqRhPX6IO5sVaySVLByduMK1MDIZt+yS57A53j9DJZoIxXIT27zgprFirav50MOKsh/TAFv581kyYloNxjK3JglP+TKownVqqNlfft+UODfjbjPXf5fBjh7Rd+iK07Ece1Bi5ktYuKSu/thY2WXH3mI7ixgRWHjX8/bmfke2IhQyI73Np017RdhHj2xV3lzeYW8+Y4w5ODM4irNx6/5sd0KfxXC8Q7ICQVGEoyHGZJspsNgYhkaA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 74039e2e-a805-4384-7ce4-08da2a7255a9 X-MS-Exchange-CrossTenant-AuthSource: AS8PR01MB7944.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Apr 2022 06:26:18.6122 (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: VI1PR01MB5406 Subject: [FFmpeg-devel] [PATCH 23/24] fate/hap: 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: Z2cIWJ1Jx+NS Signed-off-by: Andreas Rheinhardt --- tests/fate/hap.mak | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/tests/fate/hap.mak b/tests/fate/hap.mak index ba921798cc..8268798f4a 100644 --- a/tests/fate/hap.mak +++ b/tests/fate/hap.mak @@ -25,8 +25,10 @@ fate-hap-alpha-only-nosnappy-128x72: CMD = framecrc -i $(TARGET_SAMPLES)/hap/Hap FATE_HAP += fate-hap-alpha-only-snappy-127x71 fate-hap-alpha-only-snappy-127x71: CMD = framecrc -i $(TARGET_SAMPLES)/hap/HapAlphaOnly_snappy1chunk_127x71.mov -pix_fmt gray8 -FATE_SAMPLES_AVCONV-$(call DEMDEC, MOV, HAP) += $(FATE_HAP) -fate-hap: $(FATE_HAP) +FATE_HAP-$(call FRAMECRC, MOV, HAP) += $(FATE_HAP) + +FATE_SAMPLES_FFMPEG += $(FATE_HAP-yes) +fate-hap: $(FATE_HAP-yes) #Test bsf conversion @@ -42,6 +44,7 @@ fate-hapqa-extract-snappy1-to-hapalphaonly: CMD = framecrc -i $(TARGET_SAMPLES)/ FATE_HAPQA_EXTRACT_BSF += fate-hapqa-extract-snappy16-to-hapalphaonly fate-hapqa-extract-snappy16-to-hapalphaonly: CMD = framecrc -i $(TARGET_SAMPLES)/hap/HAPQA_Snappy_16chunk_127x1.mov -c:v copy -bsf:v hapqa_extract=texture=alpha -tag:v HapA -metadata:s:v:0 encoder="HAPAlphaOnly" +FATE_HAPQA_EXTRACT_BSF-$(call REMUX, FRAMECRC MOV, HAPQA_EXTRACT_BSF) += $(FATE_HAPQA_EXTRACT_BSF) #Test bsf conversion and mov tests/data/hapq_nosnappy.mov: TAG = GEN @@ -65,8 +68,8 @@ FATE_HAPQA_EXTRACT_BSF_FFPROBE += fate-hapqa-extract-nosnappy-to-hapalphaonly-mo fate-hapqa-extract-nosnappy-to-hapalphaonly-mov: tests/data/hapalphaonly_nosnappy.mov fate-hapqa-extract-nosnappy-to-hapalphaonly-mov: CMD = run ffprobe$(PROGSSUF)$(EXESUF) -show_packets -show_data_hash adler32 -bitexact -show_streams -select_streams v -v 0 $(TARGET_PATH)/tests/data/hapalphaonly_nosnappy.mov +FATE_HAPQA_EXTRACT_BSF_FFPROBE-$(call DEMMUX, MOV, MOV, HAPQA_EXTRACT_BSF HAP_DECODER) += $(FATE_HAPQA_EXTRACT_BSF_FFPROBE) -FATE_SAMPLES_FFMPEG-$(call ALLYES, MOV_DEMUXER HAPQA_EXTRACT_BSF MOV_MUXER) += $(FATE_HAPQA_EXTRACT_BSF) -FATE_SAMPLES_FFPROBE += $(FATE_HAPQA_EXTRACT_BSF_FFPROBE) - -fate-hapqa-extract-bsf: $(FATE_HAPQA_EXTRACT_BSF) $(FATE_HAPQA_EXTRACT_BSF_FFPROBE) +FATE_SAMPLES_FFMPEG += $(FATE_HAPQA_EXTRACT_BSF-yes) +FATE_SAMPLES_FFMPEG_FFPROBE += $(FATE_HAPQA_EXTRACT_BSF_FFPROBE-yes) +fate-hapqa-extract-bsf: $(FATE_HAPQA_EXTRACT_BSF-yes) $(FATE_HAPQA_EXTRACT_BSF_FFPROBE-yes)