From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id E5BA64FCE3 for ; Mon, 30 Jun 2025 16:13:17 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 2BEC468E449; Mon, 30 Jun 2025 19:10:07 +0300 (EEST) Received: from PA5P264CU001.outbound.protection.outlook.com (mail-francecentralazon11020098.outbound.protection.outlook.com [52.101.167.98]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 39E0868E4B5 for ; Mon, 30 Jun 2025 19:09:53 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=o/JxAHhrnUqIi4ytNAE5dcAfVIYHSEjZBwkI3tqqC9GSnAEjccl785csonMpTJnrJ150SHSs5q7hi5yaPDdqhwpXowAveyQ6fBVdAQptlZBsPVAHB0Gfj2+lnm8mtgaVMpfwkP1zBVvYcaYGcDrN3mICdw8pz18QBpW5BAVr5N8sxOFZaWwi7B1WFpdviYOfZsXPmdArwVhA6KPc8OTEDtdwNszqiFbkxcfytI4yG9rM6cvybYHMnWEtSz0iO072KAwctx80WgvT/M2EVa5v77NDKQU6G/GuCnOFLyf7KhtZzjUqmRBgVBn0GdrUo9R68PERuwcYP02km9bd4bITSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=3DEmhd0xfc6UW52dFOEK7mS84M/bZD4W/7pZGYRuc0Y=; b=qk4xw+j3NwT36xU7x8XE57R4qPuAddokyBfutt37DZQQ9Qm4aU+CV5RBCCzV9Ktu/rTNd79ti6jTaU91BwFJ9+n6pZcCz/Qflpa+gF5cMwGfQ5hdL8H5+ZfiTaYj8Lbh6V2xJoXIBT8ce0y7Gav8V2UdYkPh9HBpUXUfc0w+SBSXnphG8ZixAEhucQVSLgOnNTOkuhnRIACDOBJtaoorNLzBGqEkIav7VXgSV4TMxSWBbpvx2VvIXFl4c0N3UyxSpQtgCLHBLBToLrHSFlW6FYcG/iLBW7o6yz1k09ITvjwY9WW2Ntgs1FRp2ERf41bFSN116oEfgcKspffPY0xL3Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=cji.paris; dmarc=pass action=none header.from=cji.paris; dkim=pass header.d=cji.paris; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cjiparis.onmicrosoft.com; s=selector1-cjiparis-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=3DEmhd0xfc6UW52dFOEK7mS84M/bZD4W/7pZGYRuc0Y=; b=NPxFELCp/kMqoTl4y5ttMSsguP/LTzGHNJOBYaxv8UFIWvpzct9G5hOVI2K6UNrk7deeYi86EY1A0KHgPVe4Zahs54lJO2QSwFJKZ7QwndB7XY7a4tZy4XhnT4Q4GnrFUDKd7DIdqg+p07c16eVIRuZmdGre4qIeX//fuUR3OQkRO76JR4COR68bCCXG+B2wKQHunI2Q4/0jo6K5LNdQmRAeLjxkv9oBybqndWsS5kZe9v1XaQlp+eP3V0EsF4LjWwfgOgKkse74HaSl4535PddIqXsibJz22EEgYJEaX9RYH0I5oQABkgF4u5in8NuxwUP1ATJo6WMGK3QuTu6LDQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=cji.paris; Received: from MRZP264MB2492.FRAP264.PROD.OUTLOOK.COM (2603:10a6:501:1d::24) by MR1P264MB3475.FRAP264.PROD.OUTLOOK.COM (2603:10a6:501:20::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8880.30; Mon, 30 Jun 2025 16:09:47 +0000 Received: from MRZP264MB2492.FRAP264.PROD.OUTLOOK.COM ([fe80::3804:836f:bc1e:7322]) by MRZP264MB2492.FRAP264.PROD.OUTLOOK.COM ([fe80::3804:836f:bc1e:7322%6]) with mapi id 15.20.8880.027; Mon, 30 Jun 2025 16:09:47 +0000 From: Nicolas Gaullier To: ffmpeg-devel@ffmpeg.org Date: Mon, 30 Jun 2025 18:09:10 +0200 Message-ID: <20250630160923.3678492-18-nicolas.gaullier@cji.paris> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250630160923.3678492-1-nicolas.gaullier@cji.paris> References: <20250630160923.3678492-1-nicolas.gaullier@cji.paris> X-ClientProxiedBy: PA7P264CA0275.FRAP264.PROD.OUTLOOK.COM (2603:10a6:102:373::11) To MRZP264MB2492.FRAP264.PROD.OUTLOOK.COM (2603:10a6:501:1d::24) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MRZP264MB2492:EE_|MR1P264MB3475:EE_ X-MS-Office365-Filtering-Correlation-Id: 97be8a5a-3f9d-4233-1d62-08ddb7f088a2 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|376014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?mmMpwRdeqc2lIyNM0spiNe4OnozXCqrMY19XrMo3RDmgKgI4FzmnelGkNKV1?= =?us-ascii?Q?ybJs1XYdvk6wKcTJ+SmXzVz9BleSKHNhflKzS+rhYnDit4F9lkBuXDrrMbx1?= =?us-ascii?Q?Yhtsj50JAyYTX81Q4RkVwydKfq9P3uoRTfjrBM3aQUa5ixnF5NJMyqAdIamV?= =?us-ascii?Q?3MHhropT/iZhxEd3KMpHw9KsmnzlKsMzHDvfuT57iXpzjJUMjQy0fdtqCyZZ?= =?us-ascii?Q?x+BnIyfTx67gP+mt+Aranu2UIN939VSactbAjZOR+1gxQ7XIrHohRdcdZTtH?= =?us-ascii?Q?HqzWPa5n8Ef9LQhE2K4HTpZIW6CuBTT1qWFTBMAOD7gwF2jHUd00rEBVVQjZ?= =?us-ascii?Q?aT7goMTrGRPuCsDhNwehZECV9jA2u5bIPmRh0AlleKK+9BhaCp0juImFwFpU?= =?us-ascii?Q?HTYkgtSaHeDDqnWAYtDXt09SBev3G+mBAPbnKWpNAw1fW9B7R8+bA16YmZk/?= =?us-ascii?Q?5Vf4tvrH+qbQmyyXvE8laKz9920aDzOXg+THJUNJXx3krRIcz4XLOz4sOEck?= =?us-ascii?Q?SeWSt9Ns2PGF96ylq2ZLyW+Il4zSF/Nyc2jIQNbzr4MNyo83t44rw4Xa+jz3?= =?us-ascii?Q?grzDD9YvgMnEHJEgWde1Z8eIkSna4NLMJv4fSikFEW3fgZ6gjHVf1iJQJQ+G?= =?us-ascii?Q?6Yu8ysMsguBym/Q1k6pcEkncULM239yeP5tlfwWo2vT1f0XrDUfKJgkgLwRI?= =?us-ascii?Q?Zklt0+OGZUl+baieZJKB4Lx6RVJcPRNGwvAMpSHAFbOd59VoybVoahmtGtEu?= =?us-ascii?Q?2FXjNqH5rSniCoJQ0TZISSMxNj3xCmuTpR/Cis97s1U24NbS9Ds6+MoQ4GTT?= =?us-ascii?Q?2hAGX9cfKMQFnpQ7cL5NG+M9qcX4DGllcywwgUFpbn5R2cGBfC8fzS4j7f7y?= =?us-ascii?Q?PbFcPScd4kyyFOQbhTRO7/St9zVOwriWMR/X56neMjcE7N3jQy4+bNmT+Q2v?= =?us-ascii?Q?+y8WH6GCHCxBm1HMPL6YxYePQJiNRVb9GoIkjxu4Beb+x8Avy6W2hmr+0/h5?= =?us-ascii?Q?N5idxM+6KWLjeG/DVIejbHfug0q4/Znx0slRMTAE/oZvVcKOuvHfgBxVbtUk?= =?us-ascii?Q?PCAu4+qGOG1rFGvANCntjeuQ1zrEgGeD/Cggns55Eu/MeSD+tIewRPhY4XbX?= =?us-ascii?Q?9H9SOV9q9vXV7qb8knzLow+kD68libJ1OU9X/tXKrNOgYTFuIJ67ywHfX45W?= =?us-ascii?Q?MQx23zsXO5UYV72EFgFVOyRTfc5BxsWcaTs/eSxepoQj6zQ59SNxKficsraB?= =?us-ascii?Q?oCJXyvtX4UcdH1klrQuBabh13ExZrLLnR2yfPU4ZlEA45u9RpCCfBoFrfwd0?= =?us-ascii?Q?OjPezLSWYZLpgx4BT7S8yBp4BGW3RiqtyZSukCXEAqtbHV5NxvM36ZVX5Etk?= =?us-ascii?Q?usOYKaOEbn+rrvP+iGs5Lw/a1TaalmAQ/oM8JTZCncHCAbXGu50DvIX96GOF?= =?us-ascii?Q?xCQD9ZCmylw=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:MRZP264MB2492.FRAP264.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(13230040)(1800799024)(366016)(376014); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?9nWewQ9qnOuX2/RyEuFyoN4uL7G340qd9F0TeKnvP1AzcL2/P3YIzKn6c7Lh?= =?us-ascii?Q?mwP58PY8Rd0gPxRQb8sQTcbGQNPuMzAYBhMVUR7DhFGnRgoDDM1t7gVOaUQZ?= =?us-ascii?Q?rUJgHnYHMRMdAyjTVqz9YIfHU2aluRm3KmiNhp1iQ/EWmG8V4oUn4nhdv221?= =?us-ascii?Q?1JO8/2Bcl58h50MzijXRvOf8WKIuTzMRPGlxgjJl5eryCoX5ELZApeQpQeTZ?= =?us-ascii?Q?GMeQLYt7AK+IWBajS5mStXwqgiiIKP6zK74avYhMFa3mXBXMOnw9ZEbqfkjr?= =?us-ascii?Q?mXzN+XX/OgrlhfQ3NRBOmbnvPjc9oP3I+tf7nr4F+s07tNsbelsrlPvmIZns?= =?us-ascii?Q?sjY+GAtcKvr3EsJ4Sk20muFxkhg9rQ79zwwNSbdOuJS5IQO9LK2oVl2kpFEj?= =?us-ascii?Q?d/TU46ev6ibBn50VMyhzji2Hm/sgxE3PkBBsGZyxaH8uGwJ2w4BpsIEKVxcd?= =?us-ascii?Q?ZKgC+HSuDDXcbxFKo2j6SOGpRc6jUKUMESizxMFXKCV1oMeUsJkNyJ+PY3tO?= =?us-ascii?Q?hqr47SRa4Xm7Rbb+8ESTwjYlfD17N4FJ3VW6b4MBLG5NlmWE8PHTKaGtJ69r?= =?us-ascii?Q?Vu7BZLOf2XV6PZHQ73LV4Y0xhjniJVQ3oz29L+dnFlzRyrd/EVvOBGTUNWKj?= =?us-ascii?Q?RwBUixqtm9jM0KMWmnK6RmeU2Bxu8c18qg7rOpXNiUosLKdIPxXLy1ys0Pth?= =?us-ascii?Q?K5QSnylbh91kg4tY0LIOD7uUFaJ6Mg0YPrBzwyy7DI+CVa/T1vnd/ZiLmRGy?= =?us-ascii?Q?/L5D6A6JXZsDa+xPfNxN78GYJ/G4zTFuRQDJCHEzQeY6O9ujOu81I6fjNnun?= =?us-ascii?Q?jFo0IRNij1dEg2S2IHcy/aHV7/vYw3jxjav0Y1DoCyWNe/q7L7DqekUJ7XBu?= =?us-ascii?Q?yxVxh0DqrtmzUR4iiJonWpb0Mn9Sal2d74rAZjloojGBjFZcVMbUekjlsIVO?= =?us-ascii?Q?hqXDJxU7b+wAoP9V56PlrPdYUosHPXkhE/ICCC/e/gEJ5Tb1ZBiJDo9bdRil?= =?us-ascii?Q?qMH/lilTDGuW+kIHAX71lWQdFnXAI7v5Ipxd9s+02UtaDdmJ9MADBjn/Ynsu?= =?us-ascii?Q?DiuOcnWdr0rp5EXYcv7+rrW9yXPHUmVTkSEGuWDiDjYd1JAqNssKKIygsOVP?= =?us-ascii?Q?VCMdt8Z48MG+mBwXT0/GwcUI3v6fuGY5ZAhhboIXvE+9KX7+cgBNiZ0d71KH?= =?us-ascii?Q?ehHemHvicP8AtIkucJa3XTBtx/wrgvyH3JKZ8opu0AVnWv4FN5AktDJi+GU4?= =?us-ascii?Q?yJPK435jH1I6zS6sXjEGKe8zG/SYfUtnZWoKrpardqgw4FjA7CuNtudqK8kc?= =?us-ascii?Q?fwaW+Ugo/+gsEYEV1yLat70E42PS2VvJ2zHJND8YV72v/E8Eez/H+6xav3EB?= =?us-ascii?Q?S44o6jaAnPZsqMrSGF9n5eXjU4Gcd25kA9YkTuFuB323GqMDfPAW2tDISXkg?= =?us-ascii?Q?tch+RK44Nfy7s+IOEH3Pjhb+DfUX8LQ/QiZa3TKi+dzpxywAZ9PoAA9KZYfB?= =?us-ascii?Q?D6mnLdNda+wvd1+qBQVdLFmWAA67LAc3nXxrhkhrUKGqQr+wMlhneov/jLP8?= =?us-ascii?Q?/PQKFY++ochw03eks77PJqZF+b9yM/cc5fs4K2f2bJMRn3CYaawZpFFTBffe?= =?us-ascii?Q?oQ=3D=3D?= X-OriginatorOrg: cji.paris X-MS-Exchange-CrossTenant-Network-Message-Id: 97be8a5a-3f9d-4233-1d62-08ddb7f088a2 X-MS-Exchange-CrossTenant-AuthSource: MRZP264MB2492.FRAP264.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jun 2025 16:09:47.0785 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: fc5390bc-7da7-4e42-b72b-a373be305b62 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: WrnhvWgFk7IQ7RGhycS8UZpHtTZQ0AuFnqa1fXMxrxIYD3rbxpTYD+r7eY3AcMTPMbTtQludu5bkkwqK19AnA/g/WY3u9p+7+sANus6yvlY= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MR1P264MB3475 Subject: [FFmpeg-devel] [PATCH v3 17/21] fate/all: fix multiple dependencies 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: Nicolas Gaullier Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Signed-off-by: Nicolas Gaullier --- tests/fate/api.mak | 2 +- tests/fate/cbs.mak | 2 +- tests/fate/ffmpeg.mak | 6 +++--- tests/fate/filter-audio.mak | 8 ++++---- tests/fate/filter-video.mak | 2 +- tests/fate/fits.mak | 4 ++-- tests/fate/gif.mak | 2 +- tests/fate/h264.mak | 6 +++--- tests/fate/image.mak | 2 +- tests/fate/libavformat.mak | 2 +- tests/fate/matroska.mak | 7 ++++--- tests/fate/ogg-flac.mak | 2 +- tests/fate/pixfmt.mak | 1 + tests/fate/segment.mak | 6 +++--- tests/fate/vcodec.mak | 4 +++- tests/fate/video.mak | 2 +- tests/fate/voice.mak | 4 ++-- tests/fate/xvid.mak | 2 +- 18 files changed, 34 insertions(+), 30 deletions(-) diff --git a/tests/fate/api.mak b/tests/fate/api.mak index d2868e57ac..6a4752e32b 100644 --- a/tests/fate/api.mak +++ b/tests/fate/api.mak @@ -8,7 +8,7 @@ fate-api-band: $(APITESTSDIR)/api-band-test$(EXESUF) fate-api-band: CMD = run $(APITESTSDIR)/api-band-test$(EXESUF) $(TARGET_SAMPLES)/mpeg4/resize_down-up.h263 fate-api-band: CMP = null -FATE_API_SAMPLES_LIBAVFORMAT-$(call DEMDEC, H264, H264) += fate-api-h264 +FATE_API_SAMPLES_LIBAVFORMAT-$(call DEMDEC, H264, H264, H264_PARSER) += fate-api-h264 fate-api-h264: $(APITESTSDIR)/api-h264-test$(EXESUF) fate-api-h264: CMD = run $(APITESTSDIR)/api-h264-test$(EXESUF) $(TARGET_SAMPLES)/h264-conformance/SVA_NL2_E.264 diff --git a/tests/fate/cbs.mak b/tests/fate/cbs.mak index 138dab67a9..2b6cf0df73 100644 --- a/tests/fate/cbs.mak +++ b/tests/fate/cbs.mak @@ -175,7 +175,7 @@ FATE_CBS_HEVC-$(call ALLYES, HEVC_DEMUXER HEVC_MUXER HEVC_PARSER FILTER_UNITS_BS fate-cbs-hevc-metadata-set-color: CMD = md5 -i $(TARGET_SAMPLES)/hevc-conformance/AMP_A_Samsung_4.bit -c:v copy -bsf:v hevc_metadata=colour_primaries=0:transfer_characteristics=0:matrix_coefficients=3 -f hevc fate-cbs-hevc-metadata-set-color: CMP = oneline fate-cbs-hevc-metadata-set-color: REF = d073124fca9e30a46c173292f948967c -FATE_CBS_HEVC-$(call ALLYES, HEVC_DEMUXER, HEVC_METADATA_BSF, HEVC_MUXER) += fate-cbs-hevc-metadata-set-color +FATE_CBS_HEVC-$(call ALLYES, HEVC_DEMUXER HEVC_METADATA_BSF HEVC_MUXER) += fate-cbs-hevc-metadata-set-color FATE_SAMPLES_AVCONV += $(FATE_CBS_HEVC-yes) fate-cbs-hevc: $(FATE_CBS_HEVC-yes) diff --git a/tests/fate/ffmpeg.mak b/tests/fate/ffmpeg.mak index d9348ee837..87130428d1 100644 --- a/tests/fate/ffmpeg.mak +++ b/tests/fate/ffmpeg.mak @@ -40,7 +40,7 @@ fate-force_key_frames-source-dup: CMD = framecrc -i $(TARGET_SAMPLES)/h264/intra -c:v mpeg2video -g 400 -sc_threshold 99999 \ -force_key_frames source -r 39 -force_fps -strict experimental -FATE_SAMPLES_FFMPEG-$(call ENCDEC, MPEG2VIDEO H264, FRAMECRC H264, CROP_FILTER DRAWBOX_FILTER) += \ +FATE_SAMPLES_FFMPEG-$(call ENCDEC, MPEG2VIDEO H264, FRAMECRC H264, H264_PARSER CROP_FILTER DRAWBOX_FILTER) += \ fate-force_key_frames-source fate-force_key_frames-source-drop fate-force_key_frames-source-dup # Tests that the video is properly autorotated using the contained @@ -171,7 +171,7 @@ FATE_STREAMCOPY-$(call REMUX, PSP MOV, H264_PARSER H264_DECODER) += fate-copy-ps fate-copy-psp: CMD = transcode "mov" $(TARGET_SAMPLES)/h264/wwwq_cut.mp4\ psp "-c copy" "-codec copy" -FATE_STREAMCOPY-$(call FRAMEMD5, FLV, H264) += fate-ffmpeg-streamloop-copy +FATE_STREAMCOPY-$(call FRAMEMD5, FLV, H264, H264_PARSER) += fate-ffmpeg-streamloop-copy fate-ffmpeg-streamloop-copy: CMD = framemd5 -stream_loop 2 -i $(TARGET_SAMPLES)/flv/streamloop.flv -c copy tests/data/audio_shorter_than_video.nut: TAG = GEN @@ -255,7 +255,7 @@ fate-ffmpeg-streamcopy-t: CMP = null fate-ffmpeg-streamcopy-t: CMD = ffmpeg \ -stream_loop -1 -f rawvideo -s 352x288 -pix_fmt yuv420p -i $(TARGET_PATH)/tests/data/vsynth1.yuv \ -c copy -f null -t 1 - -FATE_FFMPEG-$(call REMUX, RAWVIDEO) += fate-ffmpeg-streamcopy-t +FATE_FFMPEG-$(call REMUX, RAWVIDEO, NULL_MUXER) += fate-ffmpeg-streamcopy-t # Test loopback decoding and passing the output to a complex graph. fate-ffmpeg-loopback-decoding: tests/data/vsynth1.yuv diff --git a/tests/fate/filter-audio.mak b/tests/fate/filter-audio.mak index 343fa40e9d..22b544e3ef 100644 --- a/tests/fate/filter-audio.mak +++ b/tests/fate/filter-audio.mak @@ -210,7 +210,7 @@ tests/data/hls-list.m3u8: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data -f lavfi -i "aevalsrc=cos(2*PI*t)*sin(2*PI*(440+4*t)*t):d=20" -f segment -segment_time 10 -map 0 -flags +bitexact -codec:a mp2fixed \ -segment_list $(TARGET_PATH)/$@ -y $(TARGET_PATH)/tests/data/hls-out-%03d.ts 2>/dev/null -FATE_AFILTER-$(call ALLYES, HLS_DEMUXER MPEGTS_MUXER MPEGTS_DEMUXER AEVALSRC_FILTER ARESAMPLE_FILTER LAVFI_INDEV MP2FIXED_ENCODER) += fate-filter-hls +FATE_AFILTER-$(call FILTERDEMDECENCMUX, ARESAMPLE AEVALSRC, HLS MPEGTS, MP2 PCM_F64LE, MP2FIXED, SEGMENT MPEGTS, LAVFI_INDEV) += fate-filter-hls fate-filter-hls: tests/data/hls-list.m3u8 fate-filter-hls: CMD = framecrc -flags +bitexact -i $(TARGET_PATH)/tests/data/hls-list.m3u8 -af aresample @@ -224,7 +224,7 @@ tests/data/hls-list-append.m3u8: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data -hls_flags append_list -codec:a mp2fixed -hls_segment_filename $(TARGET_PATH)/tests/data/hls-append-out-%03d.ts \ $(TARGET_PATH)/tests/data/hls-list-append.m3u8 2>/dev/null -FATE_AFILTER-$(call ALLYES, HLS_DEMUXER MPEGTS_MUXER MPEGTS_DEMUXER AEVALSRC_FILTER ARESAMPLE_FILTER LAVFI_INDEV MP2FIXED_ENCODER) += fate-filter-hls-append +FATE_AFILTER-$(call FILTERDEMDECENCMUX, ARESAMPLE AEVALSRC ASETPTS, HLS MPEGTS, PCM_F64LE MP2, MP2FIXED, SEGMENT HLS MPEGTS, LAVFI_INDEV) += fate-filter-hls-append fate-filter-hls-append: tests/data/hls-list-append.m3u8 fate-filter-hls-append: CMD = framecrc -flags +bitexact -i $(TARGET_PATH)/tests/data/hls-list-append.m3u8 -af asetpts=N*23,aresample @@ -249,7 +249,7 @@ $(FATE_AMIX): SRC1 = $(TARGET_PATH)/tests/data/asynth-44100-2-2.wav $(FATE_AMIX): CMP = oneoff $(FATE_AMIX): CMP_UNIT = f32 -FATE_AFILTER_SAMPLES-$(CONFIG_ARESAMPLE_FILTER) += fate-filter-aresample +FATE_AFILTER_SAMPLES-$(call DEMDEC, FLV, NELLYMOSER, PCM_S16LE_MUXER ARESAMPLE_FILTER) += fate-filter-aresample fate-filter-aresample: SRC = $(TARGET_SAMPLES)/nellymoser/nellymoser-discont.flv fate-filter-aresample: CMD = pcm -analyzeduration 10000000 -i $(SRC) -af aresample=min_comp=0.001:min_hard_comp=0.1:first_pts=0 fate-filter-aresample: CMP = oneoff @@ -412,7 +412,7 @@ fate-filter-hdcd-s32p: CMD = md5 -i $(SRC) -af hdcd -f s32le fate-filter-hdcd-s32p: CMP = oneline fate-filter-hdcd-s32p: REF = 0c5513e83eedaa10ab6fac9ddc173cf5 -FATE_AFILTER_SAMPLES-$(call FILTERDEMDECENCMUX, ATEMPO, WAV, PCM_S16LE, PCM_S16LE, WAV) += fate-filter-atempo +FATE_AFILTER_SAMPLES-$(call FILTERDEMDECENCMUX, ATEMPO, WAV, PCM_S16LE, PCM_S16LE, PCM_S16LE WAV) += fate-filter-atempo fate-filter-atempo: tests/data/asynth-44100-1.wav fate-filter-atempo: CMD = pcm -i $(TARGET_PATH)/tests/data/asynth-44100-1.wav -af "atempo=2.0" fate-filter-atempo: CMP = oneoff diff --git a/tests/fate/filter-video.mak b/tests/fate/filter-video.mak index df8a932750..86f4511478 100644 --- a/tests/fate/filter-video.mak +++ b/tests/fate/filter-video.mak @@ -720,7 +720,7 @@ CROPDETECT_DEPS = LAVFI_INDEV FILE_PROTOCOL MOVIE_FILTER MOVIE_FILTER MESTIMATE_ FATE_METADATA_FILTER-$(call ALLYES, $(CROPDETECT_DEPS)) += fate-filter-metadata-cropdetect fate-filter-metadata-cropdetect: SRC = $(TARGET_SAMPLES)/filter/cropdetect.mp4 fate-filter-metadata-cropdetect: CMD = run $(FILTER_METADATA_COMMAND) "sws_flags=+accurate_rnd+bitexact;movie='$(SRC)',cropdetect=max_outliers=3" -FATE_METADATA_FILTER-$(call ALLYES, $(CROPDETECT_DEPS)) += fate-filter-metadata-cropdetect1 +FATE_METADATA_FILTER-$(call ALLYES, $(CROPDETECT_DEPS) MPEG4_DECODER) += fate-filter-metadata-cropdetect1 fate-filter-metadata-cropdetect1: SRC = $(TARGET_SAMPLES)/filter/cropdetect1.mp4 fate-filter-metadata-cropdetect1: CMD = run $(FILTER_METADATA_COMMAND) "sws_flags=+accurate_rnd+bitexact;movie='$(SRC)',mestimate,cropdetect=mode=mvedges,metadata=mode=print" FATE_METADATA_FILTER-$(call ALLYES, $(CROPDETECT_DEPS)) += fate-filter-metadata-cropdetect2 diff --git a/tests/fate/fits.mak b/tests/fate/fits.mak index b83900aaee..408a0cf23d 100644 --- a/tests/fate/fits.mak +++ b/tests/fate/fits.mak @@ -23,7 +23,7 @@ fate-fitsdec-bitpix-32: CMD = framecrc -i $(TARGET_SAMPLES)/fits/tst0005.fits -p FATE_FITS_DEC-$(call FRAMECRC, FITS, FITS, SCALE_FILTER) += fate-fitsdec-bitpix-64 fate-fitsdec-bitpix-64: CMD = framecrc -i $(TARGET_SAMPLES)/fits/tst0006.fits -pix_fmt gray16le -vf scale -FATE_FITS_DEC-$(call TRANSCODE, FITS, FITS, GIF_DEMUXER GIF_DECODER SCALE_FILTER) += fate-fitsdec-multi +FATE_FITS_DEC-$(call TRANSCODE, FITS, FITS, GIF_DEMUXER GIF_DECODER GIF_PARSER SCALE_FILTER) += fate-fitsdec-multi fate-fitsdec-multi: tests/data/fits-multi.fits fate-fitsdec-multi: CMD = framecrc -i $(TARGET_PATH)/tests/data/fits-multi.fits -pix_fmt gbrap @@ -42,7 +42,7 @@ fate-fitsenc%: CMD = framecrc -auto_conversion_filters -i $(SRC) -c:v fits -pix_ FATE_FITS_ENC_PIXFMT = gray gray16be gbrp gbrap gbrp16be gbrap16be $(FATE_FITS_ENC_PIXFMT:%=fate-fitsenc-%): tests/data/fits-multi.fits -FATE_FITS_ENC-$(call TRANSCODE, FITS, FITS, GIF_DEMUXER GIF_DECODER SCALE_FILTER) += $(FATE_FITS_ENC_PIXFMT:%=fate-fitsenc-%) +FATE_FITS_ENC-$(call TRANSCODE, FITS, FITS, GIF_DEMUXER GIF_DECODER GIF_PARSER SCALE_FILTER) += $(FATE_FITS_ENC_PIXFMT:%=fate-fitsenc-%) FATE_FITS += $(FATE_FITS_ENC-yes) fate-fitsenc: $(FATE_FITS_ENC-yes) diff --git a/tests/fate/gif.mak b/tests/fate/gif.mak index fc5a73218d..ab556a45d9 100644 --- a/tests/fate/gif.mak +++ b/tests/fate/gif.mak @@ -13,7 +13,7 @@ fate-gif-gray: CMD = framecrc -i $(TARGET_SAMPLES)/gif/Newtons_cradle_animation_ FATE_GIF += fate-gif-deal fate-gif-deal: CMD = framecrc -i $(TARGET_SAMPLES)/gif/deal.gif -fps_mode cfr -pix_fmt bgra -auto_conversion_filters -FATE_GIF-$(call FRAMECRC, GIF, GIF, SCALE_FILTER) += $(FATE_GIF) +FATE_GIF-$(call FRAMECRC, GIF, GIF, GIF_PARSER SCALE_FILTER) += $(FATE_GIF) fate-gifenc%: PIXFMT = $(word 3, $(subst -, ,$(@))) fate-gifenc%: SRC = $(TARGET_SAMPLES)/gif/tc217.gif diff --git a/tests/fate/h264.mak b/tests/fate/h264.mak index a4aa9668c0..291e88c149 100644 --- a/tests/fate/h264.mak +++ b/tests/fate/h264.mak @@ -225,15 +225,15 @@ 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 FRAMECRC, MOV, H264) += fate-h264-twofields-packet -FATE_H264-$(call DEMMUX, MOV, H264, H264_MP4TOANNEXB_BSF H264_METADATA_BSF SCALE_FILTER) += fate-h264-bsf-mp4toannexb-new-extradata +FATE_H264-$(call DEMDEC, MOV H264, H264, H264_PARSER H264_MUXER H264_MP4TOANNEXB_BSF H264_METADATA_BSF SCALE_FILTER) += fate-h264-bsf-mp4toannexb-new-extradata FATE_H264-$(call DEMMUX, MOV, H264, H264_MP4TOANNEXB_BSF) += fate-h264-bsf-mp4toannexb \ fate-h264-bsf-mp4toannexb-2 \ -FATE_H264-$(call DEMMUX, MOV, H264, H264_MP4TOANNEXB_BSF EXTRACT_EXTRADATA_BSF) += fate-h264_mp4toannexb_ticket5927 \ +FATE_H264-$(call DEMDEC, MOV H264, H264, H264_PARSER H264_MUXER H264_MP4TOANNEXB_BSF EXTRACT_EXTRADATA_BSF) += fate-h264_mp4toannexb_ticket5927 \ fate-h264_mp4toannexb_ticket5927_2 -FATE_H264-$(call DEMMUX, H264, MOV, DTS2PTS_BSF) += fate-h264-bsf-dts2pts +FATE_H264-$(call DEMMUX, H264, MOV, H264_PARSER DTS2PTS_BSF) += fate-h264-bsf-dts2pts FATE_H264-$(call FRAMECRC, MATROSKA, H264) += fate-h264-direct-bff FATE_H264-$(call FRAMECRC, FLV, H264, SCALE_FILTER) += fate-h264-brokensps-2580 diff --git a/tests/fate/image.mak b/tests/fate/image.mak index 042cf6438f..e9fe8ea3c1 100644 --- a/tests/fate/image.mak +++ b/tests/fate/image.mak @@ -331,7 +331,7 @@ FATE_EXR-$(call DEMDEC, IMAGE2, EXR, SCALE_FILTER) += $(FATE_EXR) FATE_IMAGE_FRAMECRC += $(FATE_EXR-yes) fate-exr: $(FATE_EXR-yes) -FATE_JPG-$(call DEMDEC, IMAGE2, MJPEG, SCALE_FILTER) += fate-jpg-12bpp +FATE_JPG-$(call DEMDEC, IMAGE2, MJPEG, SCALE_FILTER SETSAR_FILTER) += fate-jpg-12bpp fate-jpg-12bpp: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/jpg/12bpp.jpg -f rawvideo -pix_fmt gray16le -vf setsar=sar=sar,scale FATE_JPG += fate-jpg-jfif diff --git a/tests/fate/libavformat.mak b/tests/fate/libavformat.mak index d2acb4c9e0..3b3a8a1177 100644 --- a/tests/fate/libavformat.mak +++ b/tests/fate/libavformat.mak @@ -18,7 +18,7 @@ FATE_LIBAVFORMAT-yes += fate-url fate-url: libavformat/tests/url$(EXESUF) fate-url: CMD = run libavformat/tests/url$(EXESUF) -FATE_LIBAVFORMAT-$(CONFIG_MOV_MUXER) += fate-movenc +FATE_LIBAVFORMAT-$(call ALLYES, MP4_MUXER ISMV_MUXER) += fate-movenc fate-movenc: libavformat/tests/movenc$(EXESUF) fate-movenc: CMD = run libavformat/tests/movenc$(EXESUF) diff --git a/tests/fate/matroska.mak b/tests/fate/matroska.mak index b00d19942d..08e9614a67 100644 --- a/tests/fate/matroska.mak +++ b/tests/fate/matroska.mak @@ -9,7 +9,7 @@ fate-matroska-prores-header-insertion-bz2: CMD = framecrc -i $(TARGET_SAMPLES)/m # This tests that the matroska demuxer supports modifying the colorspace # properties in remuxing (-c:v copy) # It also tests automatic insertion of the vp9_superframe bitstream filter -FATE_MATROSKA-$(call DEMMUX, MATROSKA, MATROSKA) += fate-matroska-remux +FATE_MATROSKA-$(call DEMMUX, MATROSKA, MATROSKA, VP9_DECODER VP9_PARSER MD5_PROTOCOL) += fate-matroska-remux fate-matroska-remux: CMD = md5pipe -i $(TARGET_SAMPLES)/vp9-test-vectors/vp90-2-2pass-akiyo.webm -color_trc 4 -c:v copy -fflags +bitexact -strict -2 -f matroska fate-matroska-remux: CMP = oneline fate-matroska-remux: REF = b9c7b650349972c9dce42ab79b472917 @@ -213,6 +213,7 @@ fate-matroska-ogg-opus-remux: CMD = transcode ogg $(TARGET_SAMPLES)/ogg/intro-pa FATE_MATROSKA_FFMPEG_FFPROBE-$(call REMUX, MATROSKA, MXF_DEMUXER PCM_S16LE_DECODER \ MP2FIXED_ENCODER ARESAMPLE_FILTER \ MPEG2VIDEO_DECODER MPEGVIDEO_PARSER \ + MPEGAUDIO_PARSER \ EXTRACT_EXTRADATA_BSF) += fate-matroska-encoding-delay fate-matroska-encoding-delay: CMD = transcode mxf $(TARGET_SAMPLES)/mxf/Sony-00001.mxf matroska "-c:v copy -af aresample -c:a mp2fixed" "-copyts -c copy" "-show_packets -show_entries stream=codec_name,initial_padding -read_intervals %0.05" @@ -234,7 +235,7 @@ fate-matroska-pgs-remux-durations: CMD = transcode sup $(TARGET_SAMPLES)/sub/pgs FATE_MATROSKA-$(call REMUX, MATROSKA, MPEGTS_DEMUXER DVBSUB_PARSER SETTS_BSF) += fate-matroska-dvbsub-remux fate-matroska-dvbsub-remux: CMD = transcode mpegts $(TARGET_SAMPLES)/sub/dvbsubtest_filter.ts matroska "-map 0:s -map 0:s -t 20 -c copy -bsf:0 setts=duration=if(gt(DURATION\,0)\,DURATION\,if(eq(PTS\,NOPTS)\,0\,if(eq(NEXT_PTS\,NOPTS)\,0\,NEXT_PTS-PTS))):pts=PTS" "-map 0 -c copy" -FATE_MATROSKA_FFPROBE-$(call ALLYES, MATROSKA_DEMUXER) += fate-matroska-spherical-mono +FATE_MATROSKA_FFPROBE-$(call DEMDEC, MATROSKA, H264) += fate-matroska-spherical-mono fate-matroska-spherical-mono: CMD = run ffprobe$(PROGSSUF)$(EXESUF) -show_entries stream_side_data_list -select_streams v -v 0 $(TARGET_SAMPLES)/mkv/spherical.mkv # This test tests the handling of AVStereo3D information, in particular @@ -272,7 +273,7 @@ FATE_MATROSKA_FFMPEG_FFPROBE-$(call REMUX, WEBM MATROSKA, VP9_PARSER) \ += fate-webm-hdr10-plus-remux fate-webm-hdr10-plus-remux: CMD = transcode webm $(TARGET_SAMPLES)/mkv/hdr10_plus_vp9_sample.webm webm "-map 0 -c:v copy" "-map 0 -c:v copy" "-show_packets" -FATE_MATROSKA_FFMPEG_FFPROBE-$(call REMUX, MATROSKA, VP9_PARSER) \ +FATE_MATROSKA_FFMPEG_FFPROBE-$(call REMUX, MATROSKA, VP9_DECODER VP9_PARSER) \ += fate-matroska-hdr10-plus-remux fate-matroska-hdr10-plus-remux: CMD = transcode webm $(TARGET_SAMPLES)/mkv/hdr10_plus_vp9_sample.webm matroska "-map 0 -c:v copy" "-map 0 -c:v copy" "-show_packets" diff --git a/tests/fate/ogg-flac.mak b/tests/fate/ogg-flac.mak index 0d6a015161..07bdb232cb 100644 --- a/tests/fate/ogg-flac.mak +++ b/tests/fate/ogg-flac.mak @@ -2,7 +2,7 @@ FATE_OGG_FLAC += fate-ogg-flac-chained-meta fate-ogg-flac-chained-meta: REF = $(SRC_PATH)/tests/ref/fate/ogg-flac-chained-meta.txt fate-ogg-flac-chained-meta: CMD = run $(APITESTSDIR)/api-dump-stream-meta-test$(EXESUF) $(TARGET_SAMPLES)/ogg-flac/chained-meta.ogg -FATE_OGG_FLAC-$(call DEMDEC, OGG, FLAC) += $(FATE_OGG_FLAC) +FATE_OGG_FLAC-$(call DEMDEC, OGG, FLAC, FLAC_PARSER) += $(FATE_OGG_FLAC) FATE_SAMPLES_DUMP_STREAM_META += $(FATE_OGG_FLAC-yes) diff --git a/tests/fate/pixfmt.mak b/tests/fate/pixfmt.mak index 5f8e343fdc..6c518a5000 100644 --- a/tests/fate/pixfmt.mak +++ b/tests/fate/pixfmt.mak @@ -33,6 +33,7 @@ $(FATE_PIXFMT): CMD = pixfmt_conversion $(FATE_PIXFMT): REF = $(SRC_PATH)/tests/ref/pixfmt/$(@:fate-pixfmt-%=%) $(FATE_PIXFMT): $(VREF) +FATE_PIXFMT := $(if $(call DEMDEC, IMAGE2, PGMYUV RAWVIDEO, RAWVIDEO_DEMUXER RAWVIDEO_MUXER RAWVIDEO_ENCODER FILE_PROTOCOL), $(FATE_PIXFMT)) PIXFMT_16_LIST = gray16le \ gray16be \ yuv420p16le \ diff --git a/tests/fate/segment.mak b/tests/fate/segment.mak index b2f61681a4..cd906ad57a 100644 --- a/tests/fate/segment.mak +++ b/tests/fate/segment.mak @@ -35,20 +35,20 @@ tests/data/adts-to-mkv-cated-%.mkv: tests/data/adts-to-mkv-header.mkv tests/data FATE_SEGMENT += fate-segment-mp4-to-ts fate-segment-mp4-to-ts: tests/data/mp4-to-ts.m3u8 fate-segment-mp4-to-ts: CMD = framecrc -flags +bitexact -i $(TARGET_PATH)/tests/data/mp4-to-ts.m3u8 -c copy -FATE_SEGMENT-$(call ALLYES, MOV_DEMUXER H264_MP4TOANNEXB_BSF MPEGTS_MUXER MATROSKA_DEMUXER SEGMENT_MUXER HLS_DEMUXER EXTRACT_EXTRADATA_BSF) += fate-segment-mp4-to-ts +FATE_SEGMENT-$(call DEMDEC, MOV HLS MATROSKA, H264, H264_PARSER H264_MP4TOANNEXB_BSF MPEGTS_MUXER STREAM_SEGMENT_MUXER EXTRACT_EXTRADATA_BSF) += fate-segment-mp4-to-ts FATE_SEGMENT += fate-segment-adts-to-mkv fate-segment-adts-to-mkv: tests/data/adts-to-mkv.m3u8 fate-segment-adts-to-mkv: CMD = framecrc -flags +bitexact -i $(TARGET_PATH)/tests/data/adts-to-mkv.m3u8 -c copy fate-segment-adts-to-mkv: REF = $(SRC_PATH)/tests/ref/fate/segment-adts-to-mkv-header-all -FATE_SEGMENT-$(call ALLYES, AAC_DEMUXER AAC_ADTSTOASC_BSF MATROSKA_MUXER MATROSKA_DEMUXER SEGMENT_MUXER HLS_DEMUXER) += fate-segment-adts-to-mkv +FATE_SEGMENT-$(call DEMDEC, AAC HLS MATROSKA, AAC, AAC_ADTSTOASC_BSF MATROSKA_MUXER SEGMENT_MUXER) += fate-segment-adts-to-mkv FATE_SEGMENT_ALLPARTS = $(FATE_SEGMENT_PARTS) FATE_SEGMENT_ALLPARTS += all FATE_SEGMENT_SPLIT += $(FATE_SEGMENT_ALLPARTS:%=fate-segment-adts-to-mkv-header-%) $(foreach N,$(FATE_SEGMENT_ALLPARTS),$(eval $(N:%=fate-segment-adts-to-mkv-header-%): tests/data/adts-to-mkv-cated-$(N).mkv)) fate-segment-adts-to-mkv-header-%: CMD = framecrc -flags +bitexact -i $(TARGET_PATH)/tests/data/$(@:fate-segment-adts-to-mkv-header-%=adts-to-mkv-cated-%).mkv -c copy -FATE_SEGMENT-$(call ALLYES, AAC_DEMUXER AAC_ADTSTOASC_BSF MATROSKA_MUXER MATROSKA_DEMUXER SEGMENT_MUXER HLS_DEMUXER) += $(FATE_SEGMENT_SPLIT) +FATE_SEGMENT-$(call DEMDEC, AAC HLS MATROSKA, AAC, AAC_ADTSTOASC_BSF MATROSKA_MUXER SEGMENT_MUXER) += $(FATE_SEGMENT_SPLIT) FATE_SAMPLES_FFMPEG += $(FATE_SEGMENT-yes) diff --git a/tests/fate/vcodec.mak b/tests/fate/vcodec.mak index b579389b7a..008d5ef98e 100644 --- a/tests/fate/vcodec.mak +++ b/tests/fate/vcodec.mak @@ -207,9 +207,11 @@ FATE_VCODEC-$(call ENCDEC, H261, AVI) += h261 h261-trellis fate-vsynth%-h261: ENCOPTS = -qscale 11 -flags +loop fate-vsynth%-h261-trellis: ENCOPTS = -qscale 12 -trellis 1 -mbd rd -FATE_VCODEC-$(call ENCDEC, H263, AVI) += h263 h263-obmc h263p +FATE_VCODEC-$(call ENCDEC, H263, AVI) += h263 h263-obmc fate-vsynth%-h263: ENCOPTS = -qscale 10 fate-vsynth%-h263-obmc: ENCOPTS = -qscale 10 -obmc 1 + +FATE_VCODEC-$(call ENCDEC, H263P, AVI) += h263p fate-vsynth%-h263p: ENCOPTS = -qscale 2 -flags +aic -umv 1 -aiv 1 -ps 300 FATE_VCODEC_SCALE-$(call ENCDEC, HUFFYUV, AVI) += huffyuv huffyuvbgr24 huffyuvbgra diff --git a/tests/fate/video.mak b/tests/fate/video.mak index cd7008dcd0..450416d7b4 100644 --- a/tests/fate/video.mak +++ b/tests/fate/video.mak @@ -267,7 +267,7 @@ fate-mjpeg-ticket3229: CMD = framecrc -idct simple -fflags +bitexact -i $(TARGET FATE_VIDEO-$(call FRAMECRC, MVI, MOTIONPIXELS, SCALE_FILTER) += fate-motionpixels fate-motionpixels: CMD = framecrc -i $(TARGET_SAMPLES)/motion-pixels/INTRO-partial.MVI -an -pix_fmt rgb24 -frames:v 111 -vf scale -FATE_VIDEO-$(call FRAMECRC, MPEGTS, MPEG2VIDEO) += fate-mpeg2-field-enc fate-mpeg2-ticket186 +FATE_VIDEO-$(call FRAMECRC, MPEGTS, MPEG2VIDEO, MPEGVIDEO_PARSER) += fate-mpeg2-field-enc fate-mpeg2-ticket186 fate-mpeg2-field-enc: CMD = framecrc -flags +bitexact -idct simple -i $(TARGET_SAMPLES)/mpeg2/mpeg2_field_encoding.ts -an -frames:v 30 fate-mpeg2-ticket186: CMD = framecrc -flags +bitexact -idct simple -i $(TARGET_SAMPLES)/mpeg2/t.mpg -an diff --git a/tests/fate/voice.mak b/tests/fate/voice.mak index ab34e353f7..84eb83e07f 100644 --- a/tests/fate/voice.mak +++ b/tests/fate/voice.mak @@ -1,7 +1,7 @@ FATE_G722-$(call DEMDEC, G722, ADPCM_G722) += fate-g722dec-1 fate-g722dec-1: CMD = framecrc -i $(TARGET_SAMPLES)/g722/conf-adminmenu-162.g722 -FATE_G722-$(call ENCMUX, ADPCM_G722, WAV) += fate-g722-encode +FATE_G722-$(call TRANSCODE, ADPCM_G722, WAV, PCM_S16LE_DECODER) += fate-g722-encode fate-g722-encode: tests/data/asynth-16000-1.wav fate-g722-encode: SRC = tests/data/asynth-16000-1.wav fate-g722-encode: CMD = enc_dec_pcm wav framemd5 s16le $(SRC) -c:a g722 @@ -51,7 +51,7 @@ fate-g726-encode-5bit: CMD = enc_dec_pcm wav framemd5 s16le $(SRC) -c:a g726 -b: $(FATE_G726): tests/data/asynth-8000-1.wav $(FATE_G726): SRC = tests/data/asynth-8000-1.wav -FATE_VOICE-$(call ENCMUX, ADPCM_G726, WAV) += $(FATE_G726) +FATE_VOICE-$(call TRANSCODE, ADPCM_G726, WAV, PCM_S16LE_DECODER) += $(FATE_G726) fate-g726: $(FATE_G726) FATE_GSM-$(call DEMDEC, WAV, GSM) += fate-gsm-ms diff --git a/tests/fate/xvid.mak b/tests/fate/xvid.mak index 877b2a100b..68e75b1139 100644 --- a/tests/fate/xvid.mak +++ b/tests/fate/xvid.mak @@ -1,7 +1,7 @@ fate-xvid-custom-matrix: CMD = framemd5 -flags +bitexact -idct simple -i $(TARGET_SAMPLES)/mpeg4/xvid_vlc_trac7411.h263 fate-xvid-idct: CMD = framemd5 -flags +bitexact -cpuflags all -i $(TARGET_SAMPLES)/mpeg4/xvid_vlc_trac7411.h263 -FATE_XVID-$(call DEMDEC, M4V, MPEG4) += fate-xvid-custom-matrix fate-xvid-idct +FATE_XVID-$(call DEMDEC, M4V, MPEG4, MPEG4VIDEO_PARSER) += fate-xvid-custom-matrix fate-xvid-idct FATE_SAMPLES_AVCONV += $(FATE_XVID-yes) -- 2.47.2 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".