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 433644F924 for ; Mon, 23 Jun 2025 17:43:55 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id B2E8468DF08; Mon, 23 Jun 2025 20:43:10 +0300 (EEST) Received: from PR0P264CU014.outbound.protection.outlook.com (mail-francecentralazon11022102.outbound.protection.outlook.com [40.107.161.102]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id B58C568DEF4 for ; Mon, 23 Jun 2025 20:43:06 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=fw6BOHv29FoWgyglQVi54OuiFZN1XuCdxxS3Rq0AgHpVrzYuMRtsAAaHK3RVZbJms+nirLNOXjcJV/uhOcPtyUmFL5NaeKv91CAXPUIauno2LML0zFchzrxJE/TpvNoiG/8Yw7a4FNuqaPkjnFThFCKCp8rNli3vIpSqFoDKhyFMNQviDpCIGFuUqo5vsX/d37Djx7tFIY5dBDRc2MX67XoUw0hBattKQ6Mz1Ii5p06+GbTcDKOlSENhcTu+8YZd4EK0SrGG45gdlBJlFynUe4Y9w2t61fNK7ibDVRB0puEoOOrWwVtaH8Dn1x8NV7UYRyPK4q2vICVCIEPDJYNTIQ== 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=e6vvwNVaKAN+bYoGB3NP3w2tLL7fbyjRpal26z6A1aE=; b=AsNk7AsjogkLFBoqDzKnxxSnWbwruejAdLrmoHFzo2z2z19IplEuLFWkWzrMHN1IEfJyYDRTsfBdltdthkMlFVAuR9adwCnl5uDdO4+6VViQDy8UXflso8lz0ONAZ5hPmPXYG5c9GWpXtTIQCXRGpIZJrccdhrCJfBSF0hRwLUwcYcUas0gSvmlKY0+IKVoH1hsSqgQ1uTnqkNExxCiZpUPvcPFBwOTj73zum2EUKfZD226Ba4BOeDJarc/jXQAMnC21OHyy5JCMEsyH43FCl9TPmxxCkKYgjlzde/ra0GikyfKRKCIXC/luAnrnEe+KbObtm4/Xhc64VE5bQ03Nfg== 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=e6vvwNVaKAN+bYoGB3NP3w2tLL7fbyjRpal26z6A1aE=; b=ricKU85K8bfc55Z8ywEYCmt17RFifFW7x6Sy8IubhD5iSPJVNS+uoNbdsjmm2fPm4yqDjuWDjdbRVyMxD078dCtmBAy33naGcwn8X+VHt0MKlKazA7UEZ63OQJW3zo31DpGikWUCGGMi/P7OQLycYPNUtgDpQBRt/15Tnzb/JAMjNC6yx8TV0FnHdPwqSSrRjiSXJbY47lKfTxLShcIDryb+1EcVk8axwunv6eNytGQKzDg6KF6G4/WNI6Hl8sLRlkI3jfutZJLZFhbpF7Tp6HSN4AA1WuC05+P99+zmT4TzjvgxyB/2tMqejOaaxZer/iac2otyoK0A4u+L5tFwjA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=cji.paris; Received: from MR1P264MB2483.FRAP264.PROD.OUTLOOK.COM (2603:10a6:501:34::23) by PAZP264MB3022.FRAP264.PROD.OUTLOOK.COM (2603:10a6:102:1f2::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8857.30; Mon, 23 Jun 2025 17:42:53 +0000 Received: from MR1P264MB2483.FRAP264.PROD.OUTLOOK.COM ([fe80::a9db:c8aa:ffcb:e463]) by MR1P264MB2483.FRAP264.PROD.OUTLOOK.COM ([fe80::a9db:c8aa:ffcb:e463%5]) with mapi id 15.20.8857.026; Mon, 23 Jun 2025 17:42:53 +0000 From: Nicolas Gaullier To: ffmpeg-devel@ffmpeg.org Date: Mon, 23 Jun 2025 19:41:36 +0200 Message-ID: <20250623174239.624027-5-nicolas.gaullier@cji.paris> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250623174239.624027-1-nicolas.gaullier@cji.paris> References: <20250623174239.624027-1-nicolas.gaullier@cji.paris> X-ClientProxiedBy: PA7P264CA0455.FRAP264.PROD.OUTLOOK.COM (2603:10a6:102:398::7) To MR1P264MB2483.FRAP264.PROD.OUTLOOK.COM (2603:10a6:501:34::23) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MR1P264MB2483:EE_|PAZP264MB3022:EE_ X-MS-Office365-Filtering-Correlation-Id: 56e84850-3411-45ab-7748-08ddb27d5c62 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|366016|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?DgzmL+rFzQCbc9KUalmb9wZE3+lnN2tojCOlNwUbFgC1SwItvSatM0ODag9x?= =?us-ascii?Q?hjng55z58gQAMGhFC7BqwdpzKr4zQ25p3TiJSZazo40FkD+geXYcd9y6hXMW?= =?us-ascii?Q?6wPRd1GjGNXJn9/JCaxtnrmuoTJqXz6yAg1/q2C5GYVkGrxXWvxQR2tCmlj7?= =?us-ascii?Q?gjR3vN1OVAGHCKfVAuwgzSTDEsX9oaWIA7+CW9/tD95e8bT+IuhAj6vgT+Ma?= =?us-ascii?Q?Z3aGQ5p+9Cfbj6+ipcwAeCNu+kiAeEYJ6DMzvtYIjM3JFpVhPZusPb/tEqXm?= =?us-ascii?Q?QilTm4ymfLLjC5F4Mnx9iwViV5RXl0h/LhZa+KYDzfR6QX8LlNaplTbuSDrn?= =?us-ascii?Q?BnM+JQMQ4cc+zU/2z1g8WYwwPSmHIgA4Al//Ng8GxNRFjT1pxsFxVGMvmNHV?= =?us-ascii?Q?e6jl59fkIWjTcByYADH2vhi6c1FZ6oO0NISveE5j/T2OxYVhl17p0ob/ociw?= =?us-ascii?Q?XIikTYnCrPOy5k1xPd5D54sgWcvNjoheuMVKDCNjk39UUImETWx7c6IdAjdn?= =?us-ascii?Q?Ijbb98faUX3d5YtLj8vXPs+yoHN/KZWX2hKzXh9Uw56UeLY8ek3tNeXCMRQC?= =?us-ascii?Q?if/ActDa40+hT8kiSw2kvdVnannWfkqH9hAKz3hV7SHhNvPbBzgVH5G8orOd?= =?us-ascii?Q?njRjrhfFLEW3DfFgacai+SDNee9jgQ1dMEOhvzJ0b8WQrmiAGObXQULPlkFI?= =?us-ascii?Q?9vb1eWw3Dl7l5hvm8UldNKKPd88tR7/7WE6cv0GMs/Wl2h8qAEutNQ1Rf+1e?= =?us-ascii?Q?8KBkeNS5CW5/q1dUlEHt2OD+354kc6MjCL+FGcgvHEis4yX74Uxu9fzsn0Bu?= =?us-ascii?Q?Dg5r+3efT+iqf4SgtzeYqjdgvRa42fiSrj/ttj0UHDqOAj0QIrkVMPXnz0dN?= =?us-ascii?Q?7bFRzQjHQnKObTfAhx/+26AMpPgMFxYnYQ+2/6f3tI1wPLTLrpJbcCn1jF/Z?= =?us-ascii?Q?Rxe5N5DKUcpOkXAxtBgv7RZAjx+LfXpI756QZGJ2Jveeo5rPxc6PaHwHTtLo?= =?us-ascii?Q?HLe0ItomM/pnyqJRm+l5lAWIzZi/LHbkgUfx+4e9hlkF6WLcfXE8Yk9DtpaG?= =?us-ascii?Q?64HOQhv7sOdXd+qn3ZohDn+eBqrl3aUxlAL7BrTyWwRMImJfC8lZJ9z90C9J?= =?us-ascii?Q?T8KiTCm6xAGSO/anjkkuTuYhbuDM1zNnQqFYgzIlZC1/rWRQLC2TkkdiO2ag?= =?us-ascii?Q?enlfK5AyOKKtsfmAHpw7Jk9giLYt7fAI51kthWNfVD7hyRcuyXBjhS7b0ren?= =?us-ascii?Q?6sX2MVV5t/REcM1NCWZOes1zgoB620sWaL8NBP94fZTX992SA/qwgDiXi3Oz?= =?us-ascii?Q?BJkDG5PTTVAeTIYndjazNb2oXPaKobNSaL+QePaQHice3pugM9RplGYErzTk?= =?us-ascii?Q?EoVIXa+TIV3KV2eNbPcWlVqzIro6ko48ypTf957HJ2CGPmodCTKioEvdikaV?= =?us-ascii?Q?o0zpS6d4Wzg=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:MR1P264MB2483.FRAP264.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(13230040)(376014)(366016)(1800799024); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?SggxT8jMIUCbIV8E+YuGBDxIMxIYb7Vzu5sTZmoIZEgU/T+TRqKGzCPqt+29?= =?us-ascii?Q?Doh4ImVJEvdvOpSUr373oPZvBPUimb2EYGKaIW+7QUdTV2JFJTN55EAhn73I?= =?us-ascii?Q?UBO7ZaK7AvGTpsfHbRNq3ZoL1bjCr/ICJgP8kTioc+3u6jCJposs0rGPAlhH?= =?us-ascii?Q?XYAjZ4d7xjKHBNdqzCwDBr/Uq0yHBbn/vc7Arm6ffh7QKQpbbYq+rkilroFB?= =?us-ascii?Q?PSGDbX+G39870tYlELcJxGG8Ll2nJdSlzk/ItAbUoESmjhL9qEXDI3ir7CHt?= =?us-ascii?Q?cGGKehG2ImoiwxZAM0E4BBmYuasNuNzCxnJG0UrJjEcpO8mNeOOcA+Pp1xzl?= =?us-ascii?Q?LGidE0ol+oQDA7POrlP13DXKK0mAjrLtyNBxT3Aj7i+/kxr8mSSripuSAyuT?= =?us-ascii?Q?zzdwbB8M1KiX5MVm0f1sOZThBxlloETqeDmqlId9ICrtx9VuXm2LXCQWEaTX?= =?us-ascii?Q?77ELuDhFnMTMHH8oFToVb8S2r9Elf+cSzOvl68l+wAvbcBzWeobeOwb85JqP?= =?us-ascii?Q?7SEGAKCgEue/0IkJXreKI+9dBWSUgJQk9x+PZZnCd+BThZgVOoIWqeAif6Y5?= =?us-ascii?Q?KPc8XHIIjQ1lfsO1ZoDaYj1K/iD7lxUS9PixtczXZaAQY2vsbXjlf5912kXm?= =?us-ascii?Q?jmhUMHSHo7sMjt4iy1QmzPBLK45/G5dcUnL22FNFyYWp1H1/etKFOZkaH9Lw?= =?us-ascii?Q?OnSkOqYmmrF4ErlGZwW16H923okaCAdy2bWd57sfk+RmdmmagknCkj2QDY9b?= =?us-ascii?Q?M7U0xVfoHUhzEDLuCyfiYCuhdY8NdgSOezzL9E5jG571hRqY5AJk4zWnosh+?= =?us-ascii?Q?ZGX07RQw/iA8Akz1YMXzmB7BkwC/iyzNrrEqbz+3D3GRKnNaSe2Lbq1ZNjf+?= =?us-ascii?Q?pl95SMKx5l7qGu6dg949p7sz3DeVhJu/rhQ/wsN8C50ESQC+vrHC7h1KWxKP?= =?us-ascii?Q?u6MoFSKnROqHQpx0jZDZR1RZP4E4FfVddO0Wk6mCQGElhn3pNA61N3XH2Z4b?= =?us-ascii?Q?aVNNcyMPolo9KSG+o1/EF4LTorE+m4UP4wwci3ct2HzBHPzQCX4BM9Capxhp?= =?us-ascii?Q?a0dFGis9eyAXZ+RI0udPEDlQkYjDp2WX1FJCdT7mVOYlUo/iZwV/DJgzsmNU?= =?us-ascii?Q?U7KxWG1dhYv+3rjx3CCQCxkgotH0zUeUnOwQJyKDkL0F0fxARbCdDG/37ZB6?= =?us-ascii?Q?uXcvG8rv/VOAPw8EFz/KhXsyoEQs+MWMy7O+vmhSl2aB+vwTlROhadqIU3j4?= =?us-ascii?Q?v0e7EEbxW3t8BhqKrFyOkDHKYjII9OYgglFs+2vhK4ewto6D+SfZ3hHTWbzz?= =?us-ascii?Q?Zwp/7liGUILw5sH9Vfp73pO5kXVBNsXyrnesogBtios/myxceim1D2ga6xvo?= =?us-ascii?Q?V1J6IcKqNHtQ9J8VVQRxdcCsX5RildNgBi4vjjJTXD5fdRYG6QGh16Fsvoob?= =?us-ascii?Q?1i5JjCpTDUhRVmrS5FIBgDmsNgwJ60vCn+LFhXSZnf7lQP7eJIR2g2l0bCaf?= =?us-ascii?Q?WH5a89zwrk+k0HTII7gX/FwDCQHgRwZMLRCD+ve+snL1HzoSWKOQn1zX1rfq?= =?us-ascii?Q?gplyqfZV0HYjlFkNc2mvBGlAnZh7vaHsqGG5oEWI3Na//3iDJo4ajUtbVgHV?= =?us-ascii?Q?Kw=3D=3D?= X-OriginatorOrg: cji.paris X-MS-Exchange-CrossTenant-Network-Message-Id: 56e84850-3411-45ab-7748-08ddb27d5c62 X-MS-Exchange-CrossTenant-AuthSource: MR1P264MB2483.FRAP264.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Jun 2025 17:42:44.9634 (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: 1itafsmMFRJWyRxV7g/c4R0gjnUBBaP0ciMiCHy736CAdNz/gYlSdFoAmU36+JRugzTrhLABV7aXmResgmJf7+V9kIDIze8q2Oj6iCqfa6Y= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAZP264MB3022 Subject: [FFmpeg-devel] [PATCH v2 04/20] 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 71796879c3..a21b024015 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".