From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id DBF2342558 for ; Sun, 24 Apr 2022 03:35:03 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A07DF68B2F7; Sun, 24 Apr 2022 06:34:52 +0300 (EEST) Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-oln040092075104.outbound.protection.outlook.com [40.92.75.104]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2EAF368B2C7 for ; Sun, 24 Apr 2022 06:34:46 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=oX2dQdZfvrk1WRsV6eyo6q6CLX+oe8EsI7gak1zFKGPxQxtawEgxxg3Sx94FO5LiTOBIg1dPgAI2gZhzOUm6AXI7rzV5xnIY7Pbjg9rEZanw0UyryA7wkQph2zNbd0v7dPFSMbNUKr8hpS70VOLHmqaVa0V2I5sTQSLgHh//SuVaXnAZAGGltY5chUmtZAgJwBpnEo7L7t6ZONt0qFSPA1tLauTQccZybQafMVWfDg+j+uMPjQpuc67NzL29aAW0nKBR2+nBZWQkk2UAa3Y7au0/QYewSoCWqaS6DlDBDC5mTXgO0HdBdu4lNItXJeBQ3QrggrIaULPdsl32CktBkg== 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=ZUWCr3rPz+h3Z1V4gOzlwiC5Jjn7vFInGeXuOpwmR0E=; b=N3/Dsz6LoeSOgrwpWi8KxnjO0oYHaR/nFY7YVvfralA0jpAASJczjfbjWUESFR19IadzdhqBhmEuwBPWFSw604OJEpGRJlCwlclGYVb9CQYqxfUwtC0HtnRo15Xm9QxNOX5WLgf37sXVtDFtiwF+iRfJJ+H/QxGk8oyX+v8NugU6OLN0970xUQWLAxerlg65aCJFD3uQy8tHUTXSnRZcyhMmfCeRnOJiFy8HqpCAC8hOdGrHXZVoUddilBsJFGUtASGMYYiv8/iWeczDeNsByHMBoVqjhQ04kRT/Z3MOKtLq7R/SvTo0FFCIuvCohnJkUlY1oDCQDzZBpRSqDR1tbw== 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=ZUWCr3rPz+h3Z1V4gOzlwiC5Jjn7vFInGeXuOpwmR0E=; b=UgE3X8IkySPF02kur8OqyRP1T3ybC0zaNJ3ZFtwLsXmh3N7v7l+qXWJGgNa05dJZjcRczFp2381Bn1nzQ4panguSemArw+qfl5xidVkpu5AVJJAIHJtOjDhjlvO6NGJj1g/+LRVJB8RRBxpjlrw4mJ1NKW+wXqeuBnGxg1PaeDW8w5Vkm4D0KphnuVy9jqxiO97rlcfCX4rl0wGEtM17AyFZkmvCsbfuFw8euuvYnTKvzDD8Odpx+xF+gfrYm6YYRXdIyW8UTgWku10vr3cVreH6x90N6e4OeW84Ju7VtPLnQ6mzc/izAxi3i1MNBgqmbcEtKuUaiWKQ4PdBhRSquQ== Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) by AM6PR0102MB3062.eurprd01.prod.exchangelabs.com (2603:10a6:209:b::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5186.15; Sun, 24 Apr 2022 03:34:40 +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.020; Sun, 24 Apr 2022 03:34:40 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 24 Apr 2022 05:33:50 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [nvYReY+0EVJXxWfZTH+CWNvW0yQZrlHp] X-ClientProxiedBy: ZR0P278CA0118.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:20::15) To AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) X-Microsoft-Original-Message-ID: <20220424033417.797645-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2bd94745-f07a-4229-ee44-08da25a35d88 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiT4+P6zBac8z1eXEhCqSjjDIKVxbk2rCGz91fykY+emSEagARiGTAvzZn95Dd9Ckdwse4NYGJj2iXTPIm9S9M6EtBrB4p0GJNPEfVEHXTWnUOOaA6/XPKQOuUazR5ycdOCEvS5l45FxrY3xnAcRn75PWZ+gOrrSNfkKq9VX2tjhQM2EXFNPUOiHMAYn+M+cdA9ziZ81Wgj3nOYuE4YrNC/wMWSdSyK+U7DODX0lvR6lTbGByo9LylJsPVFAKKRdPK+WK+P8uE66oS1KqOaT+C/DgOJyHY9A93ElUSXkpQSCNcBxj12IsOfjplHgk0+U2JqiY62rYG7yXChX1/PgqFE5DevBv+qA5OMNe5qVx6rjIZecIWYzTnExIGrpp27B0t93E9OBHL/w1x9avkpWEdATHOsEoiB9ZLx+WYxM9qRfdN1Wu8X79RJDkhdmMYx8Nv99xZ7sTWENVa8ByvoOsqr7z83uVzAtWpzSvgrD1cTFptJHaXa+OVxyFBbXdh8rE6YScv6/wCJorwfwYaq0ZMP0ORSoOruUKmOPJeSiRGgkdjR9mLG2UISH+CH46VgTwSzjjHsbu9DQ6pLG40Ft5GO83nOZqOU3k0JZv+sKzHrNiOAy+B7SkIWWL91AYV83UkZjotvFlbeXDOeqhbGk9AxymMA8QM6hTv0wR/zojEAo7grdMyNiKqlCZSoreIVISj4eeKbR6RBnEn0u3fIq3D6ANVgw2kbHkjNd0iDMEl/FWPmBmgcuOVRnIuPhTAyJqCs= X-MS-TrafficTypeDiagnostic: AM6PR0102MB3062:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ru+mcEwZXkwGvL8s5PDBQiZKtLHXlmBOSRZWxN6Y7oAams0S6SMCnF3GpvgR3ycupJKbuWXe9mdGWBbwf3sOPO/tbhDCg2UvYYv+NW/VU/DZRbo/VgOSn08CsFSLlMupcba9yxiI7gisxA5C6fEnIXabBvbyTKmKOm+21XwzldBqNJIjCoWaT8sgtX4F1n49HpuSFiRK9RtfDEUsiJWPCNMGqbl31bM0hH4VERLePq3CbvfOuOD5rc/n+dpOfKUROlZavD0S+0r+55FTXJMb6OnLkmu9Sx80hFHemzRLIER/HoJGZLROzH1Ryo9PP8wfMounGzB9Y7qNdvI1p2tnd0pfLIRhdgoY2XHC+2SAwysEMOfdeiaktApWkPqnEoOhBvHTQdJLB29tntM0HsPaNqn8+SOPTz+b1XOQ0adE5oM2x/jrpYS2YeZy/ypbOSJH7hI6b86LdkwCWNJS5Sbt/WmteD89FJZ2SnE610Muihxqo7ZCfeD9fca1KMjv56OLNVPhN4gQMcSPp6Gz0tiqWvR4nHyUAn5nt8KH0hSZcRo0X8ENTwbklCOj9Fnq+nW0cwqxkVB+vZ6AYsMag+Zomw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?31vr1XCjG+BppEs6ksw2EUjPBmY1ASAvHg97Xw/iiOHe1MtiGyVuWtPtjS7Y?= =?us-ascii?Q?nZ+NyhXNW4Ly1OhqJEUtWZZ/wgHI4EF9acuJCpO0pxFA9p5Eww+576INOnzj?= =?us-ascii?Q?2+wCxSXUG+9Z0mx4StEZd/yGsphttX3Fh/tLShOnFWQ69QTugl2/Mz/yTlF1?= =?us-ascii?Q?8BfzEcfs1L4NqWfZq1mlTqk1FEmxS5wYlYhH3PxFYF4HQzZZoss7Cd7Bk4zW?= =?us-ascii?Q?yHssTPWW4nnH2yWxr6dN0Gwv6lPnXYTffZxdv55B/cWyd5vW3uYpryAb686o?= =?us-ascii?Q?Rq2rJp32+FhLNZFNb1O9xXABakkZ4cRUDzkjqAku4Yxrbp4bHJR9YKtAOzWo?= =?us-ascii?Q?qBjtBhFYGhH9VLfB/pJYxcK/vuevx8XAUin4f3aexFyzruFuSy/ESHc3Dx2a?= =?us-ascii?Q?zq6EuBMsgfhfp6Of2Dlg9y28YuCjQkVxgQc/oteDkF+coCpUzdmzzxNECQcV?= =?us-ascii?Q?seFuE4u/efWzk6R/uEARvSiLGfziGPoQEaxJhn9PmDVtqpsK8odPekTB7FmM?= =?us-ascii?Q?pa2JbQ4DnT6byDZB+kaNO4F7uuKB9dOYL22TbUomgXoDKpdvm6oIVgECXO33?= =?us-ascii?Q?uSukWA3wGd37Wpt/XCFhX5yUeECpHsQBGbCP1mm8ki6Hx8eFUCJ7pWhWIZ5w?= =?us-ascii?Q?2bUyOZp2Dmx17hGF2yFElGcqNl2T5vGI/jEQJ52KHNFW+cDawcVnLRfeNXuS?= =?us-ascii?Q?CiaTplj8vlDbrjivtIH1tt/ou7uJYO+IujixPLCFcv0dLFp0wpx10UPnttL1?= =?us-ascii?Q?pkjE182HKq0/Rs6BxtffcQk33CXmoKfIegn//6TE4cEKVzGbwkenv3VFk0hT?= =?us-ascii?Q?2kB/d+9yyuqL33VKSK3jiu2fIZzPHtMjZQAoo6E9cNG6sLKKbeQvw3YtTwyv?= =?us-ascii?Q?AVhzD75sMdwkoWf3vdlLTxQb1SbW38iCXBv8dP8nnkzz8ORtcgzGPQAAyRon?= =?us-ascii?Q?0BK+zFIjaacIQRm7GYzGJqJFTtJ1pYs0hzVG1Ywvxk/2gtKhdQbMQMnxpo1M?= =?us-ascii?Q?hhGhopsMPf4yHvMgDKl0rkcEpN1FHUVighnsBVVMDtyJxBgvVMxgHKk6SA5Q?= =?us-ascii?Q?KteGzw8ZMOWqIpwP4v8d35dQk6g8B6szgoaxmI5v75BGHCwfRQ4sZ4aTVGxy?= =?us-ascii?Q?RINKL8k8odbgq7O4a6hpEjMKEcYNHet3+QbMNHTqt53eo+mATV6rEQCWXQGQ?= =?us-ascii?Q?T7K93mmfGm7VhMqm0fse1RfGicAs9aks7SuQkhoUAh9f7agaFyMq+iGKKmXJ?= =?us-ascii?Q?cfX6X9o76DpCb3/oS4Xus93pKOTDZuXDXx5hHlMZAFw8+YocdQHCRSRfejJe?= =?us-ascii?Q?dB9Jt/Olkn9GmsbJs8uumzjIVwuRljTV7btC43JjG8YdADjILz5g7JGLNKnZ?= =?us-ascii?Q?mSiaoJPEhKU/UJEW5UXfAeoiOPn3DahU0JFAGOhnQXzVBug8UEoAbDXJaC1y?= =?us-ascii?Q?c+/y9p353xFMr6+/uhgZze/Vtx8Twvwv1DpAI287JE5tTC7eA5pKeg=3D=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2bd94745-f07a-4229-ee44-08da25a35d88 X-MS-Exchange-CrossTenant-AuthSource: AS8PR01MB7944.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Apr 2022 03:34:40.7529 (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: AM6PR0102MB3062 Subject: [FFmpeg-devel] [PATCH 05/32] fate/mov: Use REMUX and TRANSCODE where appropriate 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 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: Also fix the requirements of fate-mov-channel-description: It needs the pcm_s16le decoder and the mov demuxer. Signed-off-by: Andreas Rheinhardt --- tests/fate/mov.mak | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/tests/fate/mov.mak b/tests/fate/mov.mak index 675c34a07d..a33f3694af 100644 --- a/tests/fate/mov.mak +++ b/tests/fate/mov.mak @@ -126,36 +126,28 @@ fate-mov-mp4-with-mov-in24-ver: CMD = run ffprobe$(PROGSSUF)$(EXESUF) -show_entr fate-mov-mp4-extended-atom: CMD = run ffprobe$(PROGSSUF)$(EXESUF) -show_packets -print_format compact -select_streams v $(TARGET_SAMPLES)/mov/extended_atom_size_probe -FATE_MOV_FFMPEG_FFPROBE-$(call ALLYES, FILE_PROTOCOL OGG_DEMUXER \ - VORBIS_DECODER MP4_MUXER MOV_DEMUXER \ - FRAMECRC_MUXER PIPE_PROTOCOL) \ +FATE_MOV_FFMPEG_FFPROBE-$(call REMUX, MP4 MOV, OGG_DEMUXER VORBIS_DECODER) \ += fate-mov-mp4-chapters fate-mov-mp4-chapters: CMD = transcode ogg $(TARGET_SAMPLES)/vorbis/vorbis_chapter_extension_demo.ogg mp4 "-c copy" "-c copy -t 0.1" "" "-show_chapters" -FATE_MOV_FFMPEG_FFPROBE-$(call ALLYES, FILE_PROTOCOL MOV_DEMUXER MJPEG_DECODER \ - SCALE_FILTER PNG_ENCODER PNG_DECODER \ - MP4_MUXER FRAMECRC_MUXER PIPE_PROTOCOL) \ +FATE_MOV_FFMPEG_FFPROBE-$(call TRANSCODE, PNG, MP4 MOV, MJPEG_DECODER SCALE_FILTER) \ += fate-mov-cover-image fate-mov-cover-image: CMD = transcode mov $(TARGET_SAMPLES)/cover_art/Owner-iTunes_9.0.3.15.m4a mp4 "-map 0 -map 0:v -c:a copy -c:v:0 copy -filter:v:1 scale -c:v:1 png" "-map 0 -t 0.1 -c copy" "" "-show_entries stream_disposition=attached_pic:stream=index,codec_name" -FATE_MOV_FFMPEG_FFPROBE-$(call ALLYES, FILE_PROTOCOL SRT_DEMUXER MOV_DEMUXER SUBRIP_DECODER TTML_ENCODER TTML_MUXER MOV_MUXER) += fate-mov-mp4-ttml-stpp fate-mov-mp4-ttml-dfxp +FATE_MOV_FFMPEG_FFPROBE-$(call TRANSCODE, TTML SUBRIP, MP4 MOV, SRT_DEMUXER TTML_MUXER) += fate-mov-mp4-ttml-stpp fate-mov-mp4-ttml-dfxp fate-mov-mp4-ttml-stpp: CMD = transcode srt $(TARGET_SAMPLES)/sub/SubRip_capability_tester.srt mp4 "-map 0:s -c:s ttml -time_base:s 1:1000" "-map 0 -c copy" "" "-of json -show_entries packet:stream=index,codec_type,codec_tag_string,codec_tag,codec_name,time_base,start_time,duration_ts,duration,nb_frames,nb_read_packets:stream_tags" fate-mov-mp4-ttml-dfxp: CMD = transcode srt $(TARGET_SAMPLES)/sub/SubRip_capability_tester.srt mp4 "-map 0:s -c:s ttml -time_base:s 1:1000 -tag:s dfxp -strict unofficial" "-map 0 -c copy" "" "-of json -show_entries packet:stream=index,codec_type,codec_tag_string,codec_tag,codec_name,time_base,start_time,duration_ts,duration,nb_frames,nb_read_packets:stream_tags" # Resulting remux should have: # 1. first audio stream with AV_DISPOSITION_HEARING_IMPAIRED # 2. second audio stream with AV_DISPOSITION_VISUAL_IMPAIRED | DESCRIPTIONS -FATE_MOV_FFMPEG_FFPROBE-$(call ALLYES, FILE_PROTOCOL PIPE_PROTOCOL \ - MPEGTS_DEMUXER MOV_DEMUXER AC3_DECODER \ - MP4_MUXER FRAMECRC_MUXER ) \ +FATE_MOV_FFMPEG_FFPROBE-$(call REMUX, MP4 MOV, MPEGTS_DEMUXER AC3_DECODER) \ += fate-mov-mp4-disposition-mpegts-remux fate-mov-mp4-disposition-mpegts-remux: CMD = transcode mpegts $(TARGET_SAMPLES)/mpegts/pmtchange.ts mp4 "-map 0:1 -map 0:2 -c copy -disposition:a:0 +hearing_impaired" "-map 0 -c copy" "" "-of json -show_entries stream_disposition:stream=index" FATE_SAMPLES_FFMPEG_FFPROBE += $(FATE_MOV_FFMPEG_FFPROBE-yes) -FATE_MOV_FFMPEG-$(call ALLYES, FILE_PROTOCOL PIPE_PROTOCOL \ - WAV_DEMUXER PAN_FILTER PCM_S16LE_ENCODER \ - MOV_MUXER FRAMECRC_MUXER ) \ +FATE_MOV_FFMPEG-$(call TRANSCODE, PCM_S16LE, MOV, WAV_DEMUXER PAN_FILTER) \ += fate-mov-channel-description fate-mov-channel-description: tests/data/asynth-44100-1.wav tests/data/filtergraphs/mov-channel-description fate-mov-channel-description: CMD = transcode wav $(TARGET_PATH)/tests/data/asynth-44100-1.wav mov "-filter_complex_script $(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" -- 2.32.0 _______________________________________________ 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".