From patchwork Sat Apr 30 06:25:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35524 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp708263pzb; Fri, 29 Apr 2022 23:27:00 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwpUprqT36A380E4+JAYFrC/ftUt5vYaWwksT4le0dDUtcl7gBhCYvNNMsvsuyXlPNxuytZ X-Received: by 2002:a05:6402:518a:b0:427:ae8c:1ad3 with SMTP id q10-20020a056402518a00b00427ae8c1ad3mr729760edd.275.1651300020239; Fri, 29 Apr 2022 23:27:00 -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 dn20-20020a05640222f400b00425b8e21a14si7213392edb.383.2022.04.29.23.26.58; Fri, 29 Apr 2022 23:27:00 -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=FuKSQK++; 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 98C1568B369; Sat, 30 Apr 2022 09:26:39 +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 AD83F68B180 for ; Sat, 30 Apr 2022 09:26:33 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iv3hx7cwOpkrxVY756hpORFmyr9RRpkhEF53cg8Op9L781MQsB1Nosbtt9VxXrEUTV59cQO2ypv8u5rdzOjJkofHssfSHJNUwELSpmgEtp5Xo7/pWegxC6cI50/XsO75o0n+rYN22RMIZf/arFWBT2Z/CT428JstiF2bmblj1VLYT4GqomLkU+s8PaVthcigS6XHx/mii02KpSepYRsWTf9UrQt/4KF5o4WG3PHWEZe7yQfOK5lePLk69CCtNMaKYVj3e4puS6NLLhJjlwc0lGgxvKgWG2q+A+wVvd22zmbRH2ZuiXhmmu7UDAXTU7YZVXWc79bpkbzqdSGrG9jKQQ== 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+aPj3KdVUbizjmJmZNaTGzwg24VnsywgzPT7aC2b14=; b=UNp85D0KjvsBUwM72z8hNjbcg/rboL/6hOFxO4pzrvs7O0gZOhe8mrDkA4ObwUEnNPPIxiO2XUYwmlMQbMBjxtUJkTyaFmefAAPLqa0TqStyqvNz6bFcf8qrohLl+FhYSt5ZBstvzLvl7YbpNpMepzMHyJ87fhbTZ0UQdhf+MGiGE8Bd2Q+B//hLUWZamqOhlBV54i1OASdcm+7ymRmdCKZSOryE6GBUvARc/Xh046NxtjFsKjYPFztJqQY0e6zAL/yJxz6lCKrexR/MX24ZGh14/9Rq/2woQt0nRe5Vk/loXv8LZoTAOOhVwXCL1LKl7HE6IkX93MUB758TV6G4XQ== 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+aPj3KdVUbizjmJmZNaTGzwg24VnsywgzPT7aC2b14=; b=FuKSQK++E9TZqF0GtAdA0pVCwybPfjo5p0nmSOPopoDRXaiCqH2Medpc/w0uvXrLHPJwPD8+qJJh8SekUhSviR14VNz1+nKD8r+awl9pDJSmtPpqYYs/vJkc3peUdJST7dkWY3vtaET4WMwSfGZIQfdm2bdRcMsktBpYHHYxhJYpNtXGEjKTiK/VtZAlYd2q8azwE6nn8zZrAQqQ5uA+A2fuKgvCJ1G0lBzVzgNW+XDSs37BpmNPEVAzq3pqUVllc/10KYbQuQBLyupKtbPggI8xw70xjgxBhoRNjWtQnrUSAymB3KTxtj/9b++7Cgva4OiAKhnQaZuIZntWkTEGYg== 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:23 +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:23 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 30 Apr 2022 08:25:23 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [OQf6tvwTJPIgZem2RAppvzXiq3xsTmWk] 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-5-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7a4eb4fa-0d15-4830-12ef-08da2a7258f6 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiSp1XYbE3vnwUBkebNAZYX6hlF05tSA4exK5vicPX7Ll2PjiedwkecM0Udpuz6ZekdoL8vFhZwnO7JPclj1qbxmIZADUhHAEjYHPImW/WHkRb72NAM2ISwBagOwP1u+BbAngc3e3dUxk1BUmtt0Iv1QJEqkllClBG8CHZ6wDxnPqcD2cKWNBI8xtWzpU2pYrbUfDgOjhGP6lWdPzqE9xUCajcE+Y7x73KeVDApzUBHf3R0KVuZLfy1nHeHfgdgsWSKeuKo6yX0sQE6NonCA5TTZYKWbLedr0Q6+1U56J7dM759CT35schv4o4KRDjX34ryNByk7GIsl8wF3Vh4fbnEJsQcR1xzEPB33BEDS1VIWFOdSKgbH1XcFgeX8/9IS4aIdptz4ggwmq8XIziRPfNFcVaxBPT//FQn2oPAt3VYEMVoficJpumREjKU0ZFMvPBhS6LNbvwly4kEO8uVq0Y00m7+l6Y9ckRh0PDCJdAx8vETeiQYQKuw2GGNSoYaARg5bzIhxv4Cex6GyktbAzrQqFw2SSoTz745jb3GGwCczP8C7qe83RMEkfTUWApq7tv4x9er7VogTu84sjIH0cslnERt9317jl/DvfSHUNiPPNIV9oMfeT/zdaTScYFvUhpneUPFNHhdS2kw1zvYSA+TLgzj3k39eVcr57IWvyrQLMfYeMHO6VLfIGUkWLMnYeLsB9v0EVY6J4Jgsrl04V3oXNFyfzE4ct2MFN36VqfLHJezMZ/QTtbm/ljlkIHveK+c= X-MS-TrafficTypeDiagnostic: VI1PR01MB5406:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: dhaCw/QQKcpsKClIOecGL9kxBqtXWps9xRP73VcwZJJmqi/XWcXWmhOgj4Cp1KdsOZC5RybED/lH0C4UFwZXStA2DL6f4ZKbNj923lYKfNsPM90sO+4ZXitqAOWhn8hqRpNtXHpBza9fRrwN6Zq1tJsOfbSomfLZLNDc1du0xv0TbgJ8ma7zu10YSGfD6C7vxXwZEc/vg7Okiozf3s8Is3vFwjEF5xUp9zW7MUIBCH2zqUjI/aVn9F66c9LlTws623VAW8dC9Q+WLYWpVPda+EbbnSPVTco8z4N4Z4Z26RjUwwk1D4Yf09TCx25jbC1lZg7rZ8jyOH00Ai6rPbsRZVk0ItQFoEDuCUdPoBJPWz4dCRx0SYzvg40F6orm4fN0+L+xZ11mXWd6+X87LUj2xWn5s2zO8yBDAhWVp694r227PR3acA4TI4736r8rFXzdtjagTFDs9+VmIZuM4x/L7qQLiGb7jFA5jxeZImwXf9sGQz4NpqPmumaqBZIPKMAwD90Ahf5yAlg9sTxWGQftT76CpRkPM37GSRAkGtM6K5ymObll8gNAutpsuSk7cYk/tT9QN5wJ5cjuGDRxU7ArQA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: XJ/lvYwcZMrDGbydhc5/kjPyuoR5cqWcKKmLvjSwO8hQM1wSWjCMHeQYj3LaIVk8jpOsaaL0JHysV+ROqRW/MzB9kuRWEuqqp9wSxxHn93B/fBL409r7Ge2e5nFh87GgbiRYGrxa05IRDCM7fzzd+R/1mv1UcypU0zspOSwi2985sM4zQkZjhhDyEG4DDfsIQ4r8gMr8Gl9tXd3BDLTdlZviy69J6vjOuU5w1SddonkqNMs4BeMj5Hkcyl2KBeZRYUH+y87Kf2n+tZgP4qipYqTeU0ylK34CBMfFQlTyz9NygGjfkWI0wnVE//2B2Tj9hEK65Kbv9sF0LdKTt1TMHCL3SOdRBIfsGD9GCv4qzDehp7WOpscGMJkONLXvwvIEVyvbSNFUachDRtbzhltcsxAjY+vSXqFt46/iZDwfmHntb0WaFNYeVHAiuJjCJzwQRiuwh2Zoh+2cemDjJ/y/kgDw6eqs8pUnczYOSHyblbMrnjuzUwjN20UC/c1lEK5r4z9gFAxLuq77CwaKVVATgPq2lR5Iv6PSyycz4g6bVqWUJYsUYFIx69qxmnxbVuCs8HoRR5g5DnnNKZFrc1oy4lrvFWrWjXDVNmxXVcdnrYbvP+5pxjryjFrsIgCcGT8oRYt4mp/41Gr/hYLx/MNsjzzi6d1EuTbLPmXqRQia2JLUNz4v6Qx4dU/qBFt02v9okq0xC8usHUO/lZBxwS2n/EvgxZ3AUFf3HnH3B9iMRbzpSOb8HDat/nNOnI9EgXvBVnG9KCUb7GVMbhzydRxy0AHi3WuidiP0Fm5BhxlJ77z+B2ah/YsV70z4WVLXdlr6Dy3GsXLAQy4tnqZ2hGGuU77V+jPdBGwvbbavCjZbDYi+V4lTl9WfIgzrU9Z0aKXn8TkFqZXhSxYtMLuf5lvvKStcWM3lYz6Jqfc4vbjzKYjTCzejZaZDB2eJbv84OQKlgO/27okvc/5GGDKWUN9yMmECpRPK6pBrIB/D8OnhP+Xvp9kBmrXKiSp3ULDKGgDt7THPlZ6irPnZk42zsv/VSqGJFvEnG1Go1eQR82fNnR9ghetIMUjJ5hpiPtGJRzatFHfc+PRSdnmgohF1LTq52V5QVuGQfjB5I0SLjfUj7/UI3hDOuOlo+rZlnDw/GHa44wApK1Y8u/C8WpxbjUPL0Vnq1lZ7IxHQaeF33u8GxaXOaea/wT2n4k0G+1Kg3WNBr7Hjq+S7/7WJtz+diMOpfn6X7DitaOB9n+/vzwUoDvvJ365Xcyj8TQIK1bw9ZDlzjhcm+igqo8SBt8OBqlkVPssiYeeMS5D+bEYRuGgS6XFBFOl7DZPnCIAG9ZTRdh+1oOBMM6BH56N5BvhQB+LKen9ZYqY4ZuRobW1O0WvAj5ERlnhrFtq0OGfxffx6xO4cIqB5tGJ7Nugq6tkEJvS+wYvyh0jfYe9GJZsS/YjY3wk3CgIwqrDIrqwbFBBrSTbvldGQXYs3FRX8jhle5+U2sw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7a4eb4fa-0d15-4830-12ef-08da2a7258f6 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:23.7738 (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 24/24] fate/h264: 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: tX0C3jn5DFg8 Signed-off-by: Andreas Rheinhardt --- tests/fate/h264.mak | 69 +++++++++++++++++++++++---------------------- 1 file changed, 36 insertions(+), 33 deletions(-) diff --git a/tests/fate/h264.mak b/tests/fate/h264.mak index e075b6f67f..44e20f7259 100644 --- a/tests/fate/h264.mak +++ b/tests/fate/h264.mak @@ -1,3 +1,21 @@ +FATE_H264_HIGH_BIT_DEPTH := \ + frext-hi422fr13_sony_b \ + frext-hi422fr6_sony_a \ + frext-pph10i1_panasonic_a \ + frext-pph10i2_panasonic_a \ + frext-pph10i3_panasonic_a \ + frext-pph10i4_panasonic_a \ + frext-pph10i5_panasonic_a \ + frext-pph10i6_panasonic_a \ + frext-pph10i7_panasonic_a \ + frext-pph422i1_panasonic_a \ + frext-pph422i2_panasonic_a \ + frext-pph422i3_panasonic_a \ + frext-pph422i4_panasonic_a \ + frext-pph422i5_panasonic_a \ + frext-pph422i6_panasonic_a \ + frext-pph422i7_panasonic_a \ + FATE_H264 = aud_mw_e \ ba1_ft_c \ ba1_sony_d \ @@ -115,9 +133,7 @@ FATE_H264 = aud_mw_e \ frext-hcafr4_hhi_a \ frext-hcamff1_hhi_b \ frext-hi422fr10_sony_b \ - frext-hi422fr13_sony_b \ frext-hi422fr1_sony_a \ - frext-hi422fr6_sony_a \ frext-hpca_brcm_c \ frext-hpcadq_brcm_b \ frext-hpcafl_bcrm_c \ @@ -132,20 +148,6 @@ FATE_H264 = aud_mw_e \ frext-hpcvflnl_bcrm_a \ frext-hpcvmolq_brcm_b \ frext-hpcvnl_brcm_a \ - frext-pph10i1_panasonic_a \ - frext-pph10i2_panasonic_a \ - frext-pph10i3_panasonic_a \ - frext-pph10i4_panasonic_a \ - frext-pph10i5_panasonic_a \ - frext-pph10i6_panasonic_a \ - frext-pph10i7_panasonic_a \ - frext-pph422i1_panasonic_a \ - frext-pph422i2_panasonic_a \ - frext-pph422i3_panasonic_a \ - frext-pph422i4_panasonic_a \ - frext-pph422i5_panasonic_a \ - frext-pph422i6_panasonic_a \ - frext-pph422i7_panasonic_a \ hcbp2_hhi_a \ hcmp1_hhi_a \ ls_sva_d \ @@ -182,6 +184,7 @@ FATE_H264 = aud_mw_e \ sva_fm1_e \ sva_nl1_b \ sva_nl2_e \ + $(if $(CONFIG_SCALE_FILTER),$(FATE_H264_HIGH_BIT_DEPTH)) FATE_H264_REINIT_TESTS := large_420_8-to-small_420_8 \ small_420_8-to-large_444_10 \ @@ -189,44 +192,44 @@ FATE_H264_REINIT_TESTS := large_420_8-to-small_420_8 \ small_422_9-to-small_420_9 \ FATE_H264 := $(FATE_H264:%=fate-h264-conformance-%) \ - $(FATE_H264_REINIT_TESTS:%=fate-h264-reinit-%) \ - fate-h264-extreme-plane-pred \ fate-h264-intra-refresh-recovery \ fate-h264-lossless \ fate-h264-3386 \ fate-h264-missing-frame \ fate-h264-ref-pic-mod-overflow \ fate-h264-timecode \ - fate-h264-encparams -FATE_H264-$(call DEMDEC, H264, H264) += $(FATE_H264) -FATE_H264-$(call DEMDEC, MOV, H264) += fate-h264-crop-to-container +FATE_H264-$(call FRAMECRC, H264, H264, H264_PARSER SCALE_FILTER) += $(FATE_H264_REINIT_TESTS:%=fate-h264-reinit-%) +FATE_H264-$(call FRAMECRC, H264, H264, H264_PARSER) += $(FATE_H264) +FATE_H264-$(call FRAMEMD5, H264, H264, H264_PARSER) += fate-h264-extreme-plane-pred +FATE_H264-$(call FRAMEMD5, MOV, H264) += fate-h264-crop-to-container +FATE_H264-$(call DEMDEC, H264, H264, H264_PARSER) += fate-h264-encparams # this sample has two stsd entries and needs to reload extradata -FATE_H264-$(call DEMDEC, MOV, H264) += fate-h264-extradata-reload +FATE_H264-$(call FRAMEMD5, MOV, H264, SCALE_FILTER) += fate-h264-extradata-reload -FATE_H264-$(call DEMDEC, MOV, H264) += fate-h264-interlace-crop +FATE_H264-$(call FRAMECRC, MOV, H264) += fate-h264-interlace-crop # this sample has invalid reference list modification, but decodes fine # by using a previous ref frame instead of a missing one -FATE_H264-$(call DEMDEC, MOV, H264) += fate-h264-invalid-ref-mod +FATE_H264-$(call FRAMECRC, MOV, H264, SCALE_FILTER) += fate-h264-invalid-ref-mod # this sample gives an explicit size for a single NAL unit, but contains # several NAL units -FATE_H264-$(call DEMDEC, MOV, H264) += fate-h264-mixed-nal-coding +FATE_H264-$(call FRAMECRC, MOV, H264) += fate-h264-mixed-nal-coding # this sample has invalid extradata that is not escaped -FATE_H264-$(call DEMDEC, MOV, H264) += fate-h264-unescaped-extradata +FATE_H264-$(call FRAMECRC, MOV, H264) += fate-h264-unescaped-extradata # this sample contains field-coded frames, with both fields in a single packet -FATE_H264-$(call DEMDEC, MOV, H264) += fate-h264-twofields-packet +FATE_H264-$(call FRAMECRC, MOV, H264) += fate-h264-twofields-packet -FATE_H264-$(call ALLYES, MOV_DEMUXER H264_MP4TOANNEXB_BSF H264_MUXER) += fate-h264-bsf-mp4toannexb -FATE_H264-$(call DEMDEC, MATROSKA, H264) += fate-h264-direct-bff -FATE_H264-$(call DEMDEC, FLV, H264) += fate-h264-brokensps-2580 -FATE_H264-$(call DEMDEC, MXF, H264) += fate-h264-xavc-4389 -FATE_H264-$(call DEMDEC, MOV, H264) += fate-h264-attachment-631 -FATE_H264-$(call DEMDEC, MPEGTS, H264) += fate-h264-skip-nokey fate-h264-skip-nointra +FATE_H264-$(call DEMMUX, MOV, H264, H264_MP4TOANNEXB_BSF) += fate-h264-bsf-mp4toannexb +FATE_H264-$(call FRAMECRC, MATROSKA, H264) += fate-h264-direct-bff +FATE_H264-$(call FRAMECRC, FLV, H264, SCALE_FILTER) += fate-h264-brokensps-2580 +FATE_H264-$(call FRAMECRC, MXF, H264, PCM_S24LE_DECODER SCALE_FILTER ARESAMPLE_FILTER) += fate-h264-xavc-4389 +FATE_H264-$(call FRAMECRC, MOV, H264) += fate-h264-attachment-631 +FATE_H264-$(call FRAMECRC, MPEGTS, H264, H264_PARSER MP3_DECODER SCALE_FILTER ARESAMPLE_FILTER) += fate-h264-skip-nokey fate-h264-skip-nointra FATE_H264_FFPROBE-$(call DEMDEC, MATROSKA, H264) += fate-h264-dts_5frames FATE_SAMPLES_AVCONV += $(FATE_H264-yes)