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 269B74FCCD for ; Mon, 30 Jun 2025 16:10:30 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id F26D668E48E; Mon, 30 Jun 2025 19:09:46 +0300 (EEST) Received: from PR0P264CU014.outbound.protection.outlook.com (mail-francecentralazon11022139.outbound.protection.outlook.com [40.107.161.139]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 7454668E3F9 for ; Mon, 30 Jun 2025 19:09:41 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=tDsw2UeeUgBIGPfTpThJYLqtxA+pNcdh5dAhkeGaP23jZYbyO5b9pMxY3hP7NaRNFm/dGx4Ikcrvey5gUV9bFrChBvtAWiWEKjtP1Bus5iEVOxxwoSwGIjOegDrtZZRF91x8SkS7n2vGUB27UHX58C1z4UtIfVvh1hmlX0c0nDbSclG/tqYwQ5caMFKvqLOqx8nI9FoUr/m4o8QfbYNVzoBFTBv+m8cDTefI3h/ddtGSW4ItTHTPa9YYOT8p5btBZ9EfJqomRuMlP+q913Dx9iJquScoPvpLvKmWyCFc4IgXNHeBmVp4fqyX/MbRRHmPimAoyXqIKeV5W+kwxITGJg== 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=PVmcCYF4A32BYfRLpt338sos+SRGsmrefVkzTHO4vr0=; b=alm41TCT3kDFvcnuglx6cW5JLGaHogwB+PC36WN4xtE8IY3nTIzUGRnGoUGjnQh6xoH3rEICulhKlUKcyJfR/IDkhbGZPRCcxUOPUwtRazAyvBXwzURIfxssOCu6uFTvMS30QcGWPOSY4iCOOeXPt45+o0rWiGESUVkMwgtU7S/KGERT2eodDXPQGIlZsUUELANXM1JBk0KUZYo+16UJnwTkb8xX9ZCocV8ZOrHEkxs8xKKS/Kq++YawTRtJ4/dco0hyF99FpLal5kQnh0aMzCSYIgwH9hi0T1y4ZuD6eb4jQRx/83F9QeVmZt40OJ3V/adC+mYWmhHsNebSQ9yovw== 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=PVmcCYF4A32BYfRLpt338sos+SRGsmrefVkzTHO4vr0=; b=HRg3I1U82H5+72Oe5pCaOJgN49pjOUYON6xAMLLGLjQaZO9kLZpGQUsGHiW0RZkO2rA0Oat0vuso2FabubknCbQFFG6O+ZSMclF2LA2/CL92To4Elcj0xYiFrbrTd/wrBAcksmPCvmX9BhL3K7PeuxiG3zi2DnytE1BdfnMU7i248VoZAqmXJcRoIPHvo2QCFKSlk+FHE7kyDaVGqcFWFtfnY8HI8jldZ+s7u5YppJBC3RfB5W9VYB+g/3/xllHw1xvBv1Hya/eIi2z1l2qLER6zMhQBlts17rcoUurf1wUfTgM/GlwoWuYLPJCHd7xOtKSJ6dEQIf9DuQ5XDtYfAA== 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 MR1P264MB2449.FRAP264.PROD.OUTLOOK.COM (2603:10a6:501:32::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8880.29; Mon, 30 Jun 2025 16:09:31 +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:31 +0000 From: Nicolas Gaullier To: ffmpeg-devel@ffmpeg.org Date: Mon, 30 Jun 2025 18:08:57 +0200 Message-ID: <20250630160923.3678492-5-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: PA7P264CA0343.FRAP264.PROD.OUTLOOK.COM (2603:10a6:102:39a::25) To MRZP264MB2492.FRAP264.PROD.OUTLOOK.COM (2603:10a6:501:1d::24) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MRZP264MB2492:EE_|MR1P264MB2449:EE_ X-MS-Office365-Filtering-Correlation-Id: cf3fe470-ed7c-472a-9bcd-08ddb7f07f1c 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?np/brwLrNztU3M5lJh52PFIf23ExUYiqW1O4G0QxAYGVu99h+StWOSVdYimS?= =?us-ascii?Q?aGfsQ9MQHM+LcZWsZmHhKNRMJngt7C7qbJZ44V765+kLIvKvzhryffNrjoZ3?= =?us-ascii?Q?3Z0bI6fo45otTnPXzAt0KuYmymXg9lEA6+FclvKR6lcz0FGR9QEg+FH7N4Iw?= =?us-ascii?Q?UVfxgxKnHD8bkC7wgd9wJay/dAR3QUICskGU1kxf1lwcIvkKa9w5waRIyMTT?= =?us-ascii?Q?b7My9p+X3rCkCDSWCanq247YqEvL3g9ljlULVVmdSxFVCMPO+LnaB1GXmect?= =?us-ascii?Q?IyXvVTLp6jDBb6NS5ZxoxPjKlN4FXFjO9mZRgbBi5fRsY/OiihYrG3UKWvjD?= =?us-ascii?Q?FhZKafE2kXIqU5esRwdi+K6frm3PtK5e8O66zRcHYufPftXbqpT+wJh57dio?= =?us-ascii?Q?D3nJJQEjyDtMO5nhCIP/u6UJUKYOsUE4D35YdZi4R1sWtywZtzv8GQFKpUJC?= =?us-ascii?Q?Wm1Lr+NuF4y7ErYOD+lWGqEdXce/ZP1C53ogajBMaW/QQrxiTJl77co4xaDy?= =?us-ascii?Q?H/izwEGY8FxBj83eTZ2sMxKewpJABJqBsk38atcSXiy7nI8w6MeFZJ5Emoh9?= =?us-ascii?Q?gygS3BnB+H45OPYnoGgb6w65AC5pgC0ZoLgqml29jHuQGlKiKGhXSVSn30CS?= =?us-ascii?Q?6S1h4Z/wFvr1WM51R8ybogBOAPgw01mQX9rRoQiXGOSrz948nkEifdJWU1wa?= =?us-ascii?Q?acafMWZnF2uQZWTxk3BvHTZsSposZBGGIjnrm71yFd5ecQw5Zg+8lKFzsyp8?= =?us-ascii?Q?U42H49TvD8OJ99+E/vtUA51fxehvrP/kHOcW3wIkoOBxYC/zwJpaRUbEknhm?= =?us-ascii?Q?6ZVYPYRDX2M+crRM0FuDf7hEqt+oZIpXP5i5dYnmfk+iT8xw9PxUX4X0orRs?= =?us-ascii?Q?FPg9+Y80Dwa8vqMUBixcot5+jG1IVxzfG+mev1VI6PbI+CfgdqV2DKK0TRbM?= =?us-ascii?Q?8ux3xe8dDooWQo/WxAUJoNOCd6uvz9/qBQTStlO9WdHhQDJb1wIylP5x7rd6?= =?us-ascii?Q?dAqp/JRgZQbCKrVZ8EKAMABavmLPRTfbjs18ULZKy6zwumjkbAuHScxQZKLg?= =?us-ascii?Q?+DLmO5tqD335Y70oHBlrlwK+BsNgRHtKKOb6LtCHwXp/IgZ+dHAM9i4zbN99?= =?us-ascii?Q?1CRicQS5Mf4bFVY8jhCi8T96bntzSrhzCGKavhhjPSVQy7gKk+GwO+ANBcHH?= =?us-ascii?Q?xK6kFc1dDflRzjZ9neH5JNggGB/M1e8S9Uf4JT35+Jxbr9a8tytnpcL2S3ML?= =?us-ascii?Q?6xX0z+qE1DYfvGxPe0C+NkvT2XsAcPnxAsqFctogvkZ6UhZZ4f4jkA75DI8r?= =?us-ascii?Q?Y0nuAGD+a2aWBnwza2Vr3LM28ta/kPL/YFgijVr6KhQfrppqbRBcF44Q8UyB?= =?us-ascii?Q?bxqx/pkJ9ft2zCMh81N8Ng29jxxkTywXkIvmaUQ0jS4fk8QIqG/R8efZiRcz?= =?us-ascii?Q?ThgHWycuEgQ=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?LYfrUcl76rO0GvMCbTAkstkkV5FDfcva3yDBzP++evbBV8okE47+zdupE7wN?= =?us-ascii?Q?66hUxwbK3xQrVECUyn6is/2jEOu205jR084i7LH1Eyzbs6VH4HRyhyUgv3Fx?= =?us-ascii?Q?vl4DxYDNAZHh3oIm5ttVkwGn+Pzi1feYZe6+AJnCIiaNtVkLI+/1RCJqf5/T?= =?us-ascii?Q?wm8zyTKWTgjTgxbuGkQHJHG2NLbTdCXoT+GtDw2/ksUFST+b0os4Xene+pAr?= =?us-ascii?Q?k5a0Z7ocTlf+RaJPQCNRtFSLH2THDEubop2CDaULKUGKSTXdio+DxZHgr9yc?= =?us-ascii?Q?pfi1vPxVPNWZ5xxT6tAVIeWuLL9l6xEonBcDHPUYpnJUqHLIMXVApQAsvYKr?= =?us-ascii?Q?lVviyAwFLwvynaWdkG8QHKcHp7uhT8q9ZgtgCYeUQN4hda0zUxKyrNYeam5J?= =?us-ascii?Q?biiPXAKa8/S0xNeK/CrrPSg8hV7gWfH803bwTFuWL+Wj/F9jW4qNsXzJyBuW?= =?us-ascii?Q?Ujub6rbSFz4nKPxNIWPUpUY9cozCKZp9BszuVNT+Hg/4nPix9YiLBemTmhP8?= =?us-ascii?Q?alRlbE291z2kl9O5taGz5PyUyWpuLsAxU9bEuYTgx7z4vtnFmQz1vDmYiBv5?= =?us-ascii?Q?vy9n8Pbe0keGKr0oVbAfdzDuD0VU8axfp7vgINXGbJRZCmYs09LYlI2vUmFH?= =?us-ascii?Q?hBDJ+U8bbZ4wQAigL5StjcVGjpKVPdsJ+X83+sg78tL9hN9Bdlmt5AaS3NbV?= =?us-ascii?Q?0EGzivjBi0WEG+IMBG0RP72oKzLqhDA4cbaxjkRJ1B7qn4KzVQQvNiCHPzRg?= =?us-ascii?Q?1GaeNm8icAuBc4x+Q1pGjnuvNist4G+ANd7TNMCeuIn7xFdSVbptRk6wcKeT?= =?us-ascii?Q?rKDs8oe5VKAy4UI6nrp0m3edaHh5YlVYlJXduk1dJV9E5Xdexx2LCkEIZiv1?= =?us-ascii?Q?YQN0WRMySJvVyDPGSmMkmx2z4vMDrIn5SWANXTlhABd234DRFTodt4fVscjo?= =?us-ascii?Q?a5yU+3MV58Y8wew6EqBdIJUQ3hScJpCliDXxvSeZYhYheeAN8TMDbpfen6D3?= =?us-ascii?Q?gy+b5aBl8oXzSqRCGbHjeK5HPs5H7QPrXvz4w1EcnDeylpAT7EefrBzxS35F?= =?us-ascii?Q?v0OdR2r0v3bywIITvV1k/I0TH/j8IE/ZTYk9GTkCWwOsg1KxytMQIbANKDx6?= =?us-ascii?Q?xDW8E0uNwXimlDOK1/4Ob/v0PDUcFiQ03Qm759gX//+BN5TVxndCzaKCtpnx?= =?us-ascii?Q?hVGO1SlkaUFLATzpom96VsI+f+RnLSatZeeoLXXbJEngU/SjOQFu9tX3wxWg?= =?us-ascii?Q?w8km+1pcQcW6nqY9svryFACeqqWkGXAAGP25Q3FYuTSsjGeu+VMeZ8GUHnPT?= =?us-ascii?Q?i6w/7Flj0FCq5bVAQQazu5zQrEeDijEVnmO9SwIRNaEfXLyDX1EPCSIs/pRc?= =?us-ascii?Q?hrbjzwt2albQZZl7OqQnwM3rFWVextsmd0K7Wb/MWXEHpWqq3UnoLRlytZlj?= =?us-ascii?Q?mAypIQebEx85LJPvhMZXtw26zmS9bdjBs9rZOtLaZF09/FlTMr5oNXu+z68v?= =?us-ascii?Q?cRjAryzFAz9NK7ylS5CPUeK4g5mInmhF/TVbnZKu4uvfNPaVq3PIPLO3ObfK?= =?us-ascii?Q?x99zDIgSBZzY+1JV+a3i125qNK1Fw3r/4kZaoN4YQj7HbPbNL9LHZqoaEEPl?= =?us-ascii?Q?HA=3D=3D?= X-OriginatorOrg: cji.paris X-MS-Exchange-CrossTenant-Network-Message-Id: cf3fe470-ed7c-472a-9bcd-08ddb7f07f1c 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:31.0861 (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: 1Gw7dtwk6KwNVpoOjg0Pe0EkrCfUDv8CJ9rsZOO3MdI5N6Iw78atrJcrS30b0iJsP0qNuBT5y6XA2X9NlzOk0KhAhBQqANvNfOWaS4gGkZc= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MR1P264MB2449 Subject: [FFmpeg-devel] [PATCH v3 04/21] fate/all: switch-fix mov muxer dependency to mp4 muxer dependency 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/enc_external.mak | 6 +++--- tests/fate/lavf-container.mak | 2 +- tests/fate/mov.mak | 14 +++++++------- tests/fate/subtitles.mak | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/tests/fate/enc_external.mak b/tests/fate/enc_external.mak index 4095a4b51a..705f733db7 100644 --- a/tests/fate/enc_external.mak +++ b/tests/fate/enc_external.mak @@ -1,14 +1,14 @@ -FATE_ENC_EXTERNAL-$(call ENCDEC, LIBX264 H264, MOV, H264_DEMUXER) += fate-libx264-simple +FATE_ENC_EXTERNAL-$(call ENCDEC, LIBX264 H264, MP4 MOV, H264_DEMUXER) += fate-libx264-simple fate-libx264-simple: CMD = enc_external $(TARGET_SAMPLES)/h264-conformance/BA1_Sony_D.jsv \ mp4 "-c:v libx264" "-show_entries frame=width,height,pix_fmt,pts,pkt_dts -of flat" # test for SVT-AV1 MDCV and CLL passthrough during encoding -FATE_ENC_EXTERNAL-$(call ENCDEC, LIBSVTAV1 HEVC, MOV, HEVC_DEMUXER LIBDAV1D_DECODER) += fate-libsvtav1-hdr10 +FATE_ENC_EXTERNAL-$(call ENCDEC, LIBSVTAV1 HEVC, MP4 MOV, HEVC_DEMUXER LIBDAV1D_DECODER) += fate-libsvtav1-hdr10 fate-libsvtav1-hdr10: CMD = enc_external $(TARGET_SAMPLES)/hevc/hdr10_plus_h265_sample.hevc \ mp4 "-c:v libsvtav1" "-show_frames -show_entries frame=side_data_list -of flat" # test for x264 MDCV and CLL passthrough during encoding -FATE_ENC_EXTERNAL-$(call ENCDEC, LIBX264 HEVC, MOV, LIBX264_HDR10 HEVC_DEMUXER H264_DECODER) += fate-libx264-hdr10 +FATE_ENC_EXTERNAL-$(call ENCDEC, LIBX264 HEVC, MP4 MOV, LIBX264_HDR10 HEVC_DEMUXER H264_DECODER) += fate-libx264-hdr10 fate-libx264-hdr10: CMD = enc_external $(TARGET_SAMPLES)/hevc/hdr10_plus_h265_sample.hevc \ mp4 "-c:v libx264" "-show_frames -show_entries frame=side_data_list -of flat" diff --git a/tests/fate/lavf-container.mak b/tests/fate/lavf-container.mak index 6f8136f5df..6a46f98b5d 100644 --- a/tests/fate/lavf-container.mak +++ b/tests/fate/lavf-container.mak @@ -6,7 +6,7 @@ FATE_LAVF_CONTAINER-$(call ENCDEC, RAWVIDEO, FILMSTRIP) + FATE_LAVF_CONTAINER-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, GXF) += gxf gxf_pal gxf_ntsc FATE_LAVF_CONTAINER-$(call ENCDEC2, MPEG4, MP2, MATROSKA) += mkv mkv_attachment FATE_LAVF_CONTAINER-$(call ENCDEC2, MPEG4, PCM_ALAW, MOV) += mov mov_rtphint mov_hybrid_frag ismv -FATE_LAVF_CONTAINER-$(call ENCDEC, MPEG4, MOV) += mp4 +FATE_LAVF_CONTAINER-$(call ENCDEC, MPEG4, MP4 MOV) += mp4 FATE_LAVF_CONTAINER-$(call ENCDEC2, MPEG1VIDEO, MP2, MPEG1SYSTEM MPEGPS) += mpg FATE_LAVF_CONTAINER-$(call ENCDEC , FFV1, MXF) += mxf_ffv1 FATE_LAVF_CONTAINER-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, MXF) += mxf diff --git a/tests/fate/mov.mak b/tests/fate/mov.mak index 95440347f6..73deb210cd 100644 --- a/tests/fate/mov.mak +++ b/tests/fate/mov.mak @@ -216,13 +216,13 @@ fate-mov-channel-description: tests/data/asynth-44100-1.wav tests/data/filtergra fate-mov-channel-description: CMD = transcode wav $(TARGET_PATH)/tests/data/asynth-44100-1.wav mov "-/filter_complex $(TARGET_PATH)/tests/data/filtergraphs/mov-channel-description -map [outFL] -map [outFR] -map [outFC] -map [outLFE] -map [outBL] -map [outBR] -map [outDL] -map [outDR] -c:a pcm_s16le" "-map 0 -c copy -frames:a 0" # Test PCM in mp4 and channel layout -FATE_MOV_FFMPEG-$(call TRANSCODE, PCM_S16LE, MOV, WAV_DEMUXER PAN_FILTER) \ +FATE_MOV_FFMPEG-$(call TRANSCODE, PCM_S16LE, MP4 WAV, PAN_FILTER) \ += fate-mov-mp4-pcm fate-mov-mp4-pcm: tests/data/asynth-44100-1.wav tests/data/filtergraphs/mov-mp4-pcm fate-mov-mp4-pcm: CMD = transcode wav $(TARGET_PATH)/tests/data/asynth-44100-1.wav mp4 "-/filter_complex $(TARGET_PATH)/tests/data/filtergraphs/mov-mp4-pcm -map [mono] -map [stereo] -map [2.1] -map [5.1] -map [7.1] -c:a pcm_s16le" "-map 0 -c copy -frames:a 0" # Test floating sample format PCM in mp4 and unusual channel layout -FATE_MOV_FFMPEG-$(call TRANSCODE, PCM_S16LE, MOV, WAV_DEMUXER PAN_FILTER) \ +FATE_MOV_FFMPEG-$(call TRANSCODE, PCM_S16LE, MP4 WAV, PAN_FILTER) \ += fate-mov-mp4-pcm-float fate-mov-mp4-pcm-float: tests/data/asynth-44100-1.wav fate-mov-mp4-pcm-float: CMD = transcode wav $(TARGET_PATH)/tests/data/asynth-44100-1.wav mp4 "-af aresample,pan=FR+FL+FR|c0=c0|c1=c0|c2=c0 -c:a pcm_f32le" "-map 0 -c copy -frames:a 0" @@ -237,7 +237,7 @@ fate-mov-vfr: CMD = md5 -filter_complex testsrc=size=2x2:duration=1,setpts=N*N:s fate-mov-vfr: CMP = oneline fate-mov-vfr: REF = 1558b4a9398d8635783c93f84eb5a60d -FATE_MOV_FFMPEG_FFPROBE-$(call TRANSCODE, FLAC, MOV, WAV_DEMUXER PCM_S16LE_DECODER) += fate-mov-mp4-iamf-stereo +FATE_MOV_FFMPEG_FFPROBE-$(call TRANSCODE, FLAC, MP4 WAV, PCM_S16LE_DECODER) += fate-mov-mp4-iamf-stereo fate-mov-mp4-iamf-stereo: tests/data/asynth-44100-2.wav tests/data/streamgroups/audio_element-stereo tests/data/streamgroups/mix_presentation-stereo fate-mov-mp4-iamf-stereo: SRC = $(TARGET_PATH)/tests/data/asynth-44100-2.wav fate-mov-mp4-iamf-stereo: CMD = transcode wav $(SRC) mp4 " \ @@ -246,7 +246,7 @@ fate-mov-mp4-iamf-stereo: CMD = transcode wav $(SRC) mp4 " \ -streamid 0:0 -c:a flac -t 1" "-c:a copy -map 0" \ "-show_entries stream_group=index,id,nb_streams,type:stream_group_components:stream_group_disposition:stream_group_tags:stream_group_stream=index,id:stream_group_stream_disposition" -FATE_MOV_FFMPEG_FFPROBE-$(call TRANSCODE, FLAC, MOV, WAV_DEMUXER PCM_S16LE_DECODER ARESAMPLE_FILTER) += fate-mov-mp4-iamf-5_1_4 +FATE_MOV_FFMPEG_FFPROBE-$(call TRANSCODE, FLAC, MP4 WAV, PCM_S16LE_DECODER ARESAMPLE_FILTER) += fate-mov-mp4-iamf-5_1_4 fate-mov-mp4-iamf-5_1_4: tests/data/asynth-44100-10.wav tests/data/filtergraphs/iamf_5_1_4 tests/data/streamgroups/audio_element-5_1_4 tests/data/streamgroups/mix_presentation-5_1_4 fate-mov-mp4-iamf-5_1_4: SRC = $(TARGET_PATH)/tests/data/asynth-44100-10.wav fate-mov-mp4-iamf-5_1_4: CMD = transcode wav $(SRC) mp4 "-auto_conversion_filters \ @@ -257,7 +257,7 @@ fate-mov-mp4-iamf-5_1_4: CMD = transcode wav $(SRC) mp4 "-auto_conversion_filter "-show_entries stream_group=index,id,nb_streams,type:stream_group_components:stream_group_disposition:stream_group_tags:stream_group_stream=index,id:stream_group_stream_disposition" # Test muxing an IAMF track alongside a video one, with video as the first track. -FATE_MOV_FFMPEG_FFPROBE-$(call TRANSCODE, MPEG4 FLAC, MOV, WAV_DEMUXER RAWVIDEO_DEMUXER PCM_S16LE_DECODER ARESAMPLE_FILTER) += fate-mov-mp4-iamf-7_1_4-video-first +FATE_MOV_FFMPEG_FFPROBE-$(call TRANSCODE, MPEG4 FLAC, MP4 WAV, RAWVIDEO_DEMUXER PCM_S16LE_DECODER ARESAMPLE_FILTER) += fate-mov-mp4-iamf-7_1_4-video-first fate-mov-mp4-iamf-7_1_4-video-first: tests/data/asynth-44100-12.wav tests/data/vsynth1.yuv tests/data/filtergraphs/iamf_7_1_4 tests/data/streamgroups/audio_element-7_1_4-2 tests/data/streamgroups/mix_presentation-7_1_4 fate-mov-mp4-iamf-7_1_4-video-first: SRC = $(TARGET_PATH)/tests/data/asynth-44100-12.wav fate-mov-mp4-iamf-7_1_4-video-first: SRC2 = $(TARGET_PATH)/tests/data/vsynth1.yuv @@ -270,7 +270,7 @@ fate-mov-mp4-iamf-7_1_4-video-first: CMD = transcode wav $(SRC) mp4 "-auto_conve "-f rawvideo -s 352x288 -pix_fmt yuv420p -i $(SRC2)" # Test muxing an IAMF track alongside a video one, with video as the last track. Also, use stream ids as track ids. -FATE_MOV_FFMPEG_FFPROBE-$(call TRANSCODE, MPEG4 FLAC, MOV, WAV_DEMUXER RAWVIDEO_DEMUXER PCM_S16LE_DECODER ARESAMPLE_FILTER) += fate-mov-mp4-iamf-7_1_4-video-last +FATE_MOV_FFMPEG_FFPROBE-$(call TRANSCODE, MPEG4 FLAC, MP4 WAV, RAWVIDEO_DEMUXER PCM_S16LE_DECODER ARESAMPLE_FILTER) += fate-mov-mp4-iamf-7_1_4-video-last fate-mov-mp4-iamf-7_1_4-video-last: tests/data/asynth-44100-12.wav tests/data/vsynth1.yuv tests/data/filtergraphs/iamf_7_1_4 tests/data/streamgroups/audio_element-7_1_4 tests/data/streamgroups/mix_presentation-7_1_4 fate-mov-mp4-iamf-7_1_4-video-last: SRC = $(TARGET_PATH)/tests/data/asynth-44100-12.wav fate-mov-mp4-iamf-7_1_4-video-last: SRC2 = $(TARGET_PATH)/tests/data/vsynth1.yuv @@ -282,7 +282,7 @@ fate-mov-mp4-iamf-7_1_4-video-last: CMD = transcode wav $(SRC) mp4 "-auto_conver "-show_entries stream_group=index,id,nb_streams,type:stream_group_components:stream_group_disposition:stream_group_tags:stream_group_stream=index,id:stream_group_stream_disposition:stream=index,id" \ "-f rawvideo -s 352x288 -pix_fmt yuv420p -i $(SRC2)" -FATE_MOV_FFMPEG_FFPROBE-$(call TRANSCODE, FLAC, MOV, WAV_DEMUXER PCM_S16LE_DECODER ARESAMPLE_FILTER) += fate-mov-mp4-iamf-ambisonic_1 +FATE_MOV_FFMPEG_FFPROBE-$(call TRANSCODE, FLAC, MP4 WAV, PCM_S16LE_DECODER ARESAMPLE_FILTER) += fate-mov-mp4-iamf-ambisonic_1 fate-mov-mp4-iamf-ambisonic_1: tests/data/asynth-44100-4.wav tests/data/filtergraphs/iamf_ambisonic_1 tests/data/streamgroups/audio_element-ambisonic_1 tests/data/streamgroups/mix_presentation-ambisonic_1 fate-mov-mp4-iamf-ambisonic_1: SRC = $(TARGET_PATH)/tests/data/asynth-44100-4.wav fate-mov-mp4-iamf-ambisonic_1: CMD = transcode wav $(SRC) mp4 "-auto_conversion_filters \ diff --git a/tests/fate/subtitles.mak b/tests/fate/subtitles.mak index 90412e9ac1..06c8ecdc92 100644 --- a/tests/fate/subtitles.mak +++ b/tests/fate/subtitles.mak @@ -38,7 +38,7 @@ fate-sub-microdvd-remux: CMD = fmtstdout microdvd -i $(TARGET_SAMPLES)/sub/Micro FATE_SUBTITLES_ASS-$(call DEMDEC, MOV, MOVTEXT) += fate-sub-movtext fate-sub-movtext: CMD = fmtstdout ass -i $(TARGET_SAMPLES)/sub/MovText_capability_tester.mp4 -FATE_SUBTITLES-$(call ENCDEC, MOVTEXT, MOV) += fate-binsub-movtextenc +FATE_SUBTITLES-$(call ENCDEC, MOVTEXT, MP4 MOV) += fate-binsub-movtextenc fate-binsub-movtextenc: CMD = md5 -i $(TARGET_SAMPLES)/sub/MovText_capability_tester.mp4 -map 0 -scodec mov_text -f mp4 -flags +bitexact -fflags +bitexact -movflags +frag_keyframe+empty_moov FATE_SUBTITLES_ASS-$(call DEMDEC, MPL2, MPL2) += fate-sub-mpl2 -- 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".