From patchwork Fri Apr 29 20:23:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35516 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp500931pzb; Fri, 29 Apr 2022 13:24:08 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwrdqSFhOVZiP8IVh5HFMsB/AFJxBrYiBirPu0rFBlcMMREz2EgmLEZirLnEhfOlL2JKiSX X-Received: by 2002:a17:906:4fcc:b0:6e0:3269:2054 with SMTP id i12-20020a1709064fcc00b006e032692054mr929827ejw.117.1651263848478; Fri, 29 Apr 2022 13:24:08 -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 la17-20020a170906ad9100b006f3916bcfc8si6624180ejb.142.2022.04.29.13.24.08; Fri, 29 Apr 2022 13:24:08 -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=mWYAfRqD; 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 D0BEA68B374; Fri, 29 Apr 2022 23:23:49 +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-oln040092075065.outbound.protection.outlook.com [40.92.75.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 89B4168B341 for ; Fri, 29 Apr 2022 23:23:48 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Wa056T65cPD/hZT2V5ahyvxFWc6JXUESdi6xJ7oBwsJKVqCdjVD7rnHfDiuVIjdFA3ypQxG5yvJ05a1AIT/n5YnvtoOxefu9p4vVTk8FwmbWFUe+623W19+vGwhdVGEVS2hH+b9HO3PkBT8NteqpWC+Tv+W+VAmwpSN6bfJvTby0vazhuAHtwMlgg0Ifcdk+wWuMS+c2Bhr5Qb8AVmw1kwMpEr9045HbCUmQyM/yvFaU8M69XdNm6Lw2rrxK6Pyx6xhiJX8SEgKic1ki9Xmhg9UOhre5ueaUkD2AgB/9wDw5EgP5Wp3Ko6ffJPr7m4mGHTIBG1apq7JVlOPiDz43vA== 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=RuuHaS7+wHAjc3ls9uksun+xtojMkaFaHfiIzeXyKq8=; b=O3bkmsHWBlVCtDGXfh7jLJYEiADHHtEZjxyiLPZwA5ftP8C1fRu2B/yEPBZwr+IB+BG90ITn0e8Eh6+z/kqNhgSSXJl7BKfEsfYx9GBf8zK1UCJFwW31SPyyf4+OMAdTYXfbrDeKPFY8x9ref+UB6shIuG7IBjRNKKLL4l3FpBtGHr30UUbabximKBpW0XU7rGEYhu0nFWvR0LN8j7pdUhTjTEcOO9D3p9A0UZXCgT1yhIavRzOfg3qUa4X3LpV8GmP6HOHLRWrsmLBd/qv0esflOMu0qSLIy3xxa+zCQyMN5n96qbPmEMIijnc7GaFmjkXZaEG+3GB4ZikzkKgNlw== 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=RuuHaS7+wHAjc3ls9uksun+xtojMkaFaHfiIzeXyKq8=; b=mWYAfRqDjCS9bor1iqgPyNY+rEkfouzKEwNogKFmMc/aJwj3mmVlFkpxRijsMSGROpm7iFjH8dI4YmhM/qePit625L+PiBPrU4FvnSOqjEDeDYA753ywISIA/Ss0i3H1NO3/A4lytWzms2rNsVAr7pX5uC+qKxDQiFI3VIk6v6n5zhC2snbpu5GjirOyrW+ecQNoA1ruRLLb2ub+Bj4EQHw7fQf68RcXyNh35Mau3e3DLx/8CE2BuiF5RBzMRp4M8FsoT9Aj2+dj5iacBDoU5VX7p/4/rV+1fqg2VXRzB3p8UOnIc9u3iZvUGlV/MBJ53Qg+UQfEJBKSaAIorxxB/w== Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) by AM6PR0102MB3077.eurprd01.prod.exchangelabs.com (2603:10a6:209:b::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5186.20; Fri, 29 Apr 2022 20:23:45 +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; Fri, 29 Apr 2022 20:23:45 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 29 Apr 2022 22:23:01 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [Xj93EDg8ffyxyCQH3tcIE/GsT2uvHStB] X-ClientProxiedBy: ZRAP278CA0014.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:10::24) To AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) X-Microsoft-Original-Message-ID: <20220429202302.996974-5-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e0e4337c-cf5a-4038-c486-08da2a1e27d7 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNViLEfi+B1v2XXjcG3a0+vLcIbNHUJGmPYWu1Apvl1N/MMVxskr44FvRP+6zCX+voRzHAPTkmoMoixpEHZe3OFeaDUa1yx6frWu8KO6vPwAAd9hR0bhmhSyReJzZ1RK72a5r0oJE3/cNNl1lPgjz8Rbr/93NFwWHTvVD2jmJXWdoyOKLDSS3zvRyI+iLR4qXTw0toR5lUGjQd2khbxYa6THslQRH1QX6i5+qXBwVsusEslUSEFSVtDmNSNfTBLRDKic8p+p76jquejd0XN/YCkmDc9WKV1D1vZzBx/iBTug+OCiddaniSY20823ff9QXiM2AiotnGNWFDcNmv+qwtmktBsTHk0ju031TBDHtv7dbZIwhj1OPYGRiJa4XFd6vd135UCq5VdvitDbQ16xs/+Y4t0w1TozVYw7+A4ui8cv1gO+kaMGtB2nkVeWLsWhSeyjN3nkEp+7nvo4Pip6eG8JaAvjuSo/5bMlt1yWSAcj+RHM5uGIY45GGbSqDS1PgCdFFqdov/LzQHbxX/897SqBtjTNqPzJf9+IM5fYRZ+GrN+wY8PI1NiNpoaulNjN30sgXTQPu2qZb7WTgPqfVWyUBU2LBixoidqPUZ9eGdOKHkgu2ibQvHY9AIwfsVCoLk1F43Z9fyLpZGk6wF7Q3fW96PQTR2r49ZCYca0PhefimMbV+UjX94sqBFrV+uDx94CZPqcDw3N18CtpXSaLUa43fXfovTfgeDY= X-MS-TrafficTypeDiagnostic: AM6PR0102MB3077:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: t2gizTp5exqUMDGfsUDQBMtgiT32tK3hw/rrJZImcXSosRYm36EZ6+pLalDsDuoqYFLkKK4drwud6S2ez5kqf7W7s3yoQf7nyU7OrGAcwsVaXiSUmkwNy9OPgGH+JPRnl2smvQ+ykKTufsbPizqEOb7fkm1RYYFj8ZdzlApVZO6NsJdo9epNaAqR4ERQvi4Q++oadwC7GNXxWKlNmX/DiY/8bR54Up+PwOKIwraOw5y9YzrqfRj+sv7K4zu5Ch+HnHf/n7YgRbrwaQk4UatvPU0LCEWTvJ8vMv66V+vRQnO0eh1QScexYqU+tDXBTcH1sqzv3SLQ6lwr4zqrXohwqAbbB0GJs8Nb+RCi4REsu3ww8mdB3UCD411MPHCyQjpYYMgJiNv5cbFSgoT9xQoznNKveq0SizLhPJxdAitUn5Jo1c/NCIeJngWcn5Ca4CASXG06+KVZX2LX1xce4trUF+1i5jwTeSahNOKWHk80ZaaQ7k6FeOCDSb1RSy2/v6KHigzz/NDia1NgnYikFkmGE2G2sw2kesBB1VsUYOZmR2rwfN+KW7G2n4NAC/Ms5xrbU+GZuZcvoqbf3nvvYh/Pqw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: VrH7PKfHjrpPtOYuT6U7+5PGnj9FlviNyqDcZWts/08E4iu5Q1amdaGKwQJd72fkJOyIQv9uXP79ULF6KXemfHGJ0C6EZqkNy64f9dSB89zgFX56bOcsOinqnq6CzBrF4hhGRCEbpTJ34IjOHIKEpELTjp+sro7FGmuAEgIHKuGdhLulWZWO4LqNGGwakVPphj9/2nzcFA7wZOBj5v2KhnLBhCM/ZjNpLXkAvlBHcod46RQpHaktLkFy4eWwNCZQXOPe0LISK+Uru1wza87CvfLMVqSHRmI71brvFzQ6kmGsgCD4hcXLNDKGlKq6L8kpeypG666MNiX9fOyIoOD4mu+hBNQy4zlb9oFuvFiTdAiUb1o6sqYhnCg0UakPdJVgMSUVV5xKOB8ZTEB4HaSD4vkcy9JBQnWEeSX1IOnVW+1MUs/ywNkH9mmY7Cpll+JaNxAcTSi9nz2eg1QBVkZ4YYp7O61b5rUgPoAp+7WkSNcHjWBRR439qqHmA2by0y8qxEK5pAq8AXzIVjIordPdQsQNjPHNqpaEIzv293FCqO8efgUQupHyMItmw7+ZMl8Bve98y3ZAea8Cmjc2qDsJrI439jsILYXgL992rDB0RoYQoE1ibdRnEivfI/mQvefBdmNWTpMi1hiF3IfVxRWr+EpEvG9E1uU82M1iFRFxlLVaJBmBmRAjy/7P+ipoc3xOsEA6y7IqWUvBJi8vWq+z3Zet8j257+KqQXsVckqtDYzauvU11sgnDUBDvEtVonRgJStHEJFAz5W4ZwQKzs6AtIuKKtWbdmCm7hraHDIGbeTmfirUHHVd4+zQ/LB+v4uvdqe7OQfcGNF1+7sQNSknUAtJjQuEvjoII6V0x//tqGyHgoeupmqsga3XyH4h1jW88/CVn3HFVSGomnT6AzHtYIZUrl0FCREmzLrLYYIdmaJB0KdGhaUMQrRPj5h3cYK7lbFAhzMC1//FI/4uWGRbwOJbRpQxj4N5QcTODX+6cWgoaLOfrCfjJ7X8TiG/ZMeRp4IgqQAkkpnJ8gNE3j/remJu3BwsHble3bRXFBJWGRQeP+OEvTil9da0WhtS7y+lDwbtTCyQTEUIsAcyCgZSC9xz381snpHmcDMOi8ikzLN3sGV6c9GbktWk/Y4dYutn+pgO/cwalcCIaLsw19qM6eAXwlwrgi15ZkXqYzbY02LH9Dn9ePnUg/GP00yfVP1EKZWpH0GUnzylhnm8AgkLTDw8WLbzaTlY9UKh7sV+U0Am3vw/w1aycz++4OebqqUkY76ACL9ImRMVVmxFCBUv0hCLXO3wCcYbr8Jee0KPS9EkddCT8a9fNiIzu0ojYKSPvIXgHbdIaltutu9VgWkNl2y5O5K81CbH4lqEtK+PERCt+ixCCV2Sw1ONp/YoFvyOBGr+VO3JCOO3PDHquuVPE8woooMJ4/NKkn23DgxZvRD/4KFqLHRuP2JIiKrySwN6 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e0e4337c-cf5a-4038-c486-08da2a1e27d7 X-MS-Exchange-CrossTenant-AuthSource: AS8PR01MB7944.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Apr 2022 20:23:45.6873 (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: AM6PR0102MB3077 Subject: [FFmpeg-devel] [PATCH 18/19] fate/mpeg4: 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: PaIMcl+liaZW Signed-off-by: Andreas Rheinhardt --- tests/fate/mpeg4.mak | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/tests/fate/mpeg4.mak b/tests/fate/mpeg4.mak index 05c26b9be5..4cec21c547 100644 --- a/tests/fate/mpeg4.mak +++ b/tests/fate/mpeg4.mak @@ -3,21 +3,23 @@ MPEG4_RESOLUTION_CHANGE = down-down down-up up-down up-up fate-mpeg4-resolution-change-%: CMD = framemd5 -flags +bitexact -idct simple -i $(TARGET_SAMPLES)/mpeg4/resize_$(@:fate-mpeg4-resolution-change-%=%).h263 -sws_flags +bitexact -FATE_MPEG4-$(call DEMDEC, H263, H263) := $(addprefix fate-mpeg4-resolution-change-, $(MPEG4_RESOLUTION_CHANGE)) +FATE_MPEG4-$(call FRAMEMD5, M4V, MPEG4, SCALE_FILTER) := $(addprefix fate-mpeg4-resolution-change-, $(MPEG4_RESOLUTION_CHANGE)) fate-mpeg4-bsf-unpack-bframes: CMD = md5 -i $(TARGET_SAMPLES)/mpeg4/packed_bframes.avi -flags +bitexact -fflags +bitexact -c:v copy -bsf mpeg4_unpack_bframes -f avi -FATE_MPEG4-$(call ALLYES, AVI_DEMUXER MPEG4_UNPACK_BFRAMES_BSF AVI_MUXER) += fate-mpeg4-bsf-unpack-bframes +FATE_MPEG4-$(call DEMMUX, AVI, AVI, MPEG4_UNPACK_BFRAMES_BSF) += fate-mpeg4-bsf-unpack-bframes fate-mpeg4-packed: CMD = framecrc -flags +bitexact -idct simple -i $(TARGET_SAMPLES)/mpeg4/packed_bframes.avi -flags +bitexact -fflags +bitexact -vsync cfr -FATE_MPEG4-$(call ALLYES, AVI_DEMUXER MPEG4_DECODER) += fate-mpeg4-packed +FATE_MPEG4-$(call FRAMECRC, AVI, MPEG4) += fate-mpeg4-packed FATE_MPEG4-$(call ALLYES, FILE_PROTOCOL M4V_DEMUXER MPEG4_DECODER SCALE_FILTER \ RAWVIDEO_ENCODER FRAMECRC_MUXER PIPE_PROTOCOL) \ += fate-mpeg4-simple-studio-profile fate-mpeg4-simple-studio-profile: CMD = framecrc -bitexact -idct simple -i $(TARGET_SAMPLES)/mpeg4/mpeg4_sstp_dpcm.m4v -sws_flags +accurate_rnd+bitexact -pix_fmt yuv422p10le -vf scale -FATE_MPEG4-$(call DEMDEC, M4V, MPEG4) += fate-m4v fate-m4v-cfr +FATE_MPEG4-$(call FRAMECRC, M4V, MPEG4) += fate-m4v fate-m4v: CMD = framecrc -flags +bitexact -idct simple -i $(TARGET_SAMPLES)/mpeg4/demo.m4v + +FATE_MPEG4-$(call FRAMECRC, M4V, MPEG4, FPS_FILTER) += fate-m4v-cfr fate-m4v-cfr: CMD = framecrc -flags +bitexact -idct simple -i $(TARGET_SAMPLES)/mpeg4/demo.m4v -vf fps=5 FATE_SAMPLES_AVCONV += $(FATE_MPEG4-yes)