From patchwork Mon Mar 29 13:18:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 26639 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id A80D944A69B for ; Mon, 29 Mar 2021 16:19:17 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8E8546881E7; Mon, 29 Mar 2021 16:19:17 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-oln040092067054.outbound.protection.outlook.com [40.92.67.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2E70A687ED3 for ; Mon, 29 Mar 2021 16:19:11 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fnRMV0eRroA/FNo1HOa8z2f0/nb5HS675Tcqczo/5xxuFQmBY44eXsvRkGd2SgWik+EGgTwYqT1iM8X+TJ0WYNFk1A9OD4maDjFcZpxHQh/p0bYpCqA3mzYj9e5RBzs9OgoMA2PEblEQvGmZw0LQOl2O1GjEpWjXYJRNUscgi/LnjVgmE+XFkeGwDovx8BDhPtl4jBs2uuVztYmIxBgFxu72PtfRvTnN6Q5ENYePX6KIyqGxjA/IsRMaIhfl1bJAcvH8GSqgeHWoNWSPQk59FCw/6UYas8eOSDQBmF9cOgx7QUAm2oNvnQXc9fy1DrFTivTtgiugSM/ClnRWVwlfLA== 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-SenderADCheck; bh=IWqWvl+kan4CUYNbvYUC+FgLdVsN90Z0/i4Uvht5+vE=; b=d/9Zh9PbjhlGGH7QmpFyCJeeb/hQHJV1zBX/61Gh4dqF7X7AyiX++sthImMBIltgNolEOT+Vp7uSX9Zp0vY8vOgCvHHkZtYxGaXiUQ292IJOIvEXav1OdiGUthIUdje2I3W0oucTsMIO3Wz9lidgmZFBbq/7zxui8WZezl8SrvLxIy4MSU+IZeAemSsBticYut9vXITbOBZa4svzbl/O2LxSBsDdYTIXEz/BH/5cYy/PqY/Izy+UVVLdgJtvTE+cStiKjvBn/38mNSiLcDF0eNInF9+eWM3omFs3zfYUuQZD+byQONRSA5SsYwF9D6IdlzC4mp4bhnkCHpa+jN20fg== 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=IWqWvl+kan4CUYNbvYUC+FgLdVsN90Z0/i4Uvht5+vE=; b=DbyG2sPfVuuKAnKAwF7/FbW0vLR8Nfk5nSmGekAUxhIyDtMpnde0RkcALMYFTKDnJI3BdRrXj1vAAEcQYUgvHncE8ebPhpfgmAdlpn8PIXJHwkHkhkQsT10CkXLu3FnhwFoYTo0cHc8n8ce4X0PBYi2bayYbFlLeKTmQ7cc4a8DN4Iw9jVH8hZ6094bwhsCjXyW6ntvdAzqt7fSfusZ4U2/z0Oksmj1xxST3W14NXqCV/1P9y5FQNXht2fd1dbN3alKOaXKQozbueA+B03vLdKPvO7+MQ+wXQazZJhLhhZFfsJyhETfiq8iOnZFA5sUkLz7HU/s/eBdHYOIv0UOSUw== Received: from HE1EUR02FT017.eop-EUR02.prod.protection.outlook.com (2a01:111:e400:7e1d::44) by HE1EUR02HT009.eop-EUR02.prod.protection.outlook.com (2a01:111:e400:7e1d::160) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3977.29; Mon, 29 Mar 2021 13:19:09 +0000 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com (2a01:111:e400:7e1d::45) by HE1EUR02FT017.mail.protection.outlook.com (2a01:111:e400:7e1d::73) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3977.25 via Frontend Transport; Mon, 29 Mar 2021 13:19:09 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:9C0AE47D7E2BE32AD6E89B666414F0C9E22F424668451228C34E93FB1ADA58C8; UpperCasedChecksum:3B9A3D7E05FFAD856C37EC70BA8BD3C2440132CA43F180C4E0FD4180A8CFA0C9; SizeAsReceived:7551; Count:47 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::8128:5de5:4e94:9a21]) by HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::8128:5de5:4e94:9a21%3]) with mapi id 15.20.3977.033; Mon, 29 Mar 2021 13:19:09 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 29 Mar 2021 15:18:57 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [clKtJWzrcjNjLRSY0LxcxDsH4wYQKamE] X-ClientProxiedBy: AM8P190CA0011.EURP190.PROD.OUTLOOK.COM (2603:10a6:20b:219::16) To HE1PR0301MB2154.eurprd03.prod.outlook.com (2603:10a6:3:2a::22) X-Microsoft-Original-Message-ID: <20210329131857.625095-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.137.96) by AM8P190CA0011.EURP190.PROD.OUTLOOK.COM (2603:10a6:20b:219::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3977.25 via Frontend Transport; Mon, 29 Mar 2021 13:19:08 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 47 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 131c9b00-8b48-47d9-5483-08d8f2b53c7e X-MS-Exchange-SLBlob-MailProps: 7MJMDUNTCtyG7JLNmMoDcS38cZbIh1HpEtSSoSpUU0MfyQkNk7PILaATnmq+9hNm5lpumh+M0t/rdUhZLSBmKNj0H7xDdOKzgioHblbXnx9iFzFlHpFUqPG0WcI5UJV/UR+u0PF2JiVu9M3bm5lSWr0MrnBuMryXtLj8/bgpAhYaPmTfSCkchl8TBfvIfNhylBFuBPN9GBq33xv09Sz3hGw+oN+gv8Wbs1Wdr4QBySZvCWYBlid09nCXJHKILgU0jg7UfzUx9ipqpVC5bxeYS+3QwOeAoXLCEJ6UbDCFGf1mzqUfloMa/fGZDaGm6knB3DhKyRVpnX3zbi9Q0Qsn+Of2wkHayVre2qDKdUS+w7ZFjc0Ts/sphMtw7smJZMQPgV0UC9xhnpTfjy+evUwHNtGlXHeGS8bExeM9o6M6c8c2CgqyjOKRP+nDScEELmbiMN6hnBWrNDh3B6KyPrjuPSSR384V+p2n4eaOv7WJssoYtNfSZUKBnQiPRP32ndk8AJuE6/ezmiO6+seAPrVPteaSYiJNRsofa/PgF4OlPA9Wz3sdDiUzrg49NZuEkO9ahBMMFYi11F0vjlLM2ucGCCK7mP1VYcPbsY6nbmUU/MUFrEKKJG989/5YU4wfD83qCwdWr40wOJ4ML71bHv05vZj9E2AUExYP+innCZ1PaQ3g7/GkvtUyd9Pc4eWNp0rketXu9GovsxPX01DPds1MIJDjlwQoewwBhej9mDAHlu65rO9HCG5IxA== X-MS-TrafficTypeDiagnostic: HE1EUR02HT009: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 20tHHySF0+BmP6lmGv/Meby9vcVf70bhQ2JOYU99+S1m8g4FX+M7kbcRRv8aUZg8IDyZNBp9J1mNMNbzf20cFWHbkFK8ztVmjYxWVabfaa8xhdoaqV8dHZcY9BRKU1EgspeMALJYR656sIZYBoZGLhhRJQsPSJVR0YGb+UcMF0ktfdxKwE8DkjFFQHPEif623rA/HS7YNM7y78NNXH0FaSnmJAu0QE6sEaV2fK1y3eL5iqLMwHMEveFAsUaOosSZ9hMlP1ll75TEO5T9kIlGb+28dUErIAYp6hQGD7IPl048YFnUN+cBeaVi2v9uSjW/JvjKIXQI2JxUgCiaq3vV3jG4BL0GFzgRmEIsq1+EL2a2zeVcc9eTZYFGTWu017uK/q0ha13qul8uGPSfL4hP9g== X-MS-Exchange-AntiSpam-MessageData: 8VfuQjtpkFORbFJBPcRxcvk4ONM2K7rnQq2p86wOfX0lyhvFfBH06y2+B8B0876CFHUkc2Y/AJMhMXxmu9NUGt9eqHtDCKhAHIHz3gqZb5D5d6B273fQ6UtsQgh17HxTtK8C4S0iS6tO7WA+qkqdLw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 131c9b00-8b48-47d9-5483-08d8f2b53c7e X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Mar 2021 13:19:09.2319 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: HE1EUR02FT017.eop-EUR02.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1EUR02HT009 Subject: [FFmpeg-devel] [PATCH 2/2] tests/matroska: Add test for WebVTT in WebM X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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" Specifically test that the WebVTT flavour is correctly mapped to the Matroska/WebM CodecID and back; and test that dispositions unsupported by WebM are discarded even when they would be supported by Matroska. Signed-off-by: Andreas Rheinhardt --- tests/fate/matroska.mak | 10 +++ tests/ref/fate/webm-webvtt-remux | 122 +++++++++++++++++++++++++++++++ 2 files changed, 132 insertions(+) create mode 100644 tests/ref/fate/webm-webvtt-remux diff --git a/tests/fate/matroska.mak b/tests/fate/matroska.mak index 8a46b1f0cd..f6d4bd1199 100644 --- a/tests/fate/matroska.mak +++ b/tests/fate/matroska.mak @@ -111,6 +111,16 @@ fate-matroska-mpegts-remux: CMD = transcode mpegts $(TARGET_SAMPLES)/mpegts/pmtc FATE_MATROSKA_FFPROBE-$(call ALLYES, MATROSKA_DEMUXER) += 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 +# The following test tests the various flavours of WebVTT in WebM. +# It also tests that dispositions not supported by WebM are not written +# (and therefore lost). It moreover tests that the muxer writes CuePoints +# with multiple CueTrackPositions if the timestamps coincide. +FATE_MATROSKA_FFMPEG_FFPROBE-$(call ALLYES, FILE_PROTOCOL WEBVTT_DEMUXER \ + WEBM_MUXER MATROSKA_DEMUXER \ + FRAMECRC_MUXER PIPE_PROTOCOL) \ + += fate-webm-webvtt-remux +fate-webm-webvtt-remux: CMD = transcode webvtt $(TARGET_SAMPLES)/sub/WebVTT_capability_tester.vtt webm "-map 0 -map 0 -map 0 -map 0 -c:s copy -disposition:0 original+descriptions+hearing_impaired -disposition:1 lyrics+default+metadata -disposition:2 comment+forced -disposition:3 karaoke+captions+dub" "-map 0:0 -map 0:1 -c copy" "" "-show_entries stream_disposition:stream=index,codec_name" + FATE_SAMPLES_AVCONV += $(FATE_MATROSKA-yes) FATE_SAMPLES_FFPROBE += $(FATE_MATROSKA_FFPROBE-yes) FATE_SAMPLES_FFMPEG_FFPROBE += $(FATE_MATROSKA_FFMPEG_FFPROBE-yes) diff --git a/tests/ref/fate/webm-webvtt-remux b/tests/ref/fate/webm-webvtt-remux new file mode 100644 index 0000000000..0737541be5 --- /dev/null +++ b/tests/ref/fate/webm-webvtt-remux @@ -0,0 +1,122 @@ +c5625f28e6968e12d91f125edef5f16c *tests/data/fate/webm-webvtt-remux.webm +6560 tests/data/fate/webm-webvtt-remux.webm +#tb 0: 1/1000 +#media_type 0: subtitle +#codec_id 0: webvtt +#tb 1: 1/1000 +#media_type 1: subtitle +#codec_id 1: webvtt +0, 11000, 11000, 2000, 58, 0x45bb13fd +1, 11000, 11000, 2000, 58, 0x45bb13fd +0, 13000, 13000, 3000, 73, 0xb3c21a1b +1, 13000, 13000, 3000, 73, 0xb3c21a1b +0, 16000, 16000, 2000, 60, 0x89f515d4 +1, 16000, 16000, 2000, 60, 0x89f515d4 +0, 18000, 18000, 2000, 51, 0xc84211f5 +1, 18000, 18000, 2000, 51, 0xc84211f5 +0, 20000, 20000, 2000, 67, 0x3e2918c7 +1, 20000, 20000, 2000, 67, 0x3e2918c7 +0, 22000, 22000, 2000, 29, 0x93f7098d, S=1, 3, 0x012a0096 +1, 22000, 22000, 2000, 29, 0x93f7098d, S=1, 3, 0x012a0096 +0, 24000, 24000, 2000, 49, 0xb2d91196 +1, 24000, 24000, 2000, 49, 0xb2d91196 +0, 27000, 27000, 3000, 99, 0xb750231a, S=1, 14, 0x292a0588 +1, 27000, 27000, 3000, 99, 0xb750231a, S=1, 14, 0x292a0588 +0, 30000, 30000, 1500, 36, 0xe7f70d87, S=1, 18, 0x3f63061b +1, 30000, 30000, 1500, 36, 0xe7f70d87, S=1, 18, 0x3f63061b +0, 30500, 30500, 2000, 112, 0x6961267d, S=1, 20, 0x50b70712 +1, 30500, 30500, 2000, 112, 0x6961267d, S=1, 20, 0x50b70712 +0, 32000, 32000, 3500, 58, 0x32d11382, S=1, 18, 0x3f63061b +1, 32000, 32000, 3500, 58, 0x32d11382, S=1, 18, 0x3f63061b +0, 32500, 32500, 1000, 36, 0xe6650c7c, S=1, 20, 0x47000712 +1, 32500, 32500, 1000, 36, 0xe6650c7c, S=1, 20, 0x47000712 +0, 35500, 35500, 2500, 73, 0xb13f19c0 +1, 35500, 35500, 2500, 73, 0xb13f19c0 +0, 50000, 50000, 1134, 43, 0x534b0ee3 +1, 50000, 50000, 1134, 43, 0x534b0ee3 +0, 3540123, 3540123, 1485555, 13, 0x216a04d8 +1, 3540123, 3540123, 1485555, 13, 0x216a04d8 +[STREAM] +index=0 +codec_name=webvtt +DISPOSITION:default=0 +DISPOSITION:dub=0 +DISPOSITION:original=0 +DISPOSITION:comment=0 +DISPOSITION:lyrics=0 +DISPOSITION:karaoke=0 +DISPOSITION:forced=0 +DISPOSITION:hearing_impaired=0 +DISPOSITION:visual_impaired=0 +DISPOSITION:clean_effects=0 +DISPOSITION:attached_pic=0 +DISPOSITION:timed_thumbnails=0 +DISPOSITION:captions=0 +DISPOSITION:descriptions=1 +DISPOSITION:metadata=0 +DISPOSITION:dependent=0 +DISPOSITION:still_image=0 +[/STREAM] +[STREAM] +index=1 +codec_name=webvtt +DISPOSITION:default=1 +DISPOSITION:dub=0 +DISPOSITION:original=0 +DISPOSITION:comment=0 +DISPOSITION:lyrics=0 +DISPOSITION:karaoke=0 +DISPOSITION:forced=0 +DISPOSITION:hearing_impaired=0 +DISPOSITION:visual_impaired=0 +DISPOSITION:clean_effects=0 +DISPOSITION:attached_pic=0 +DISPOSITION:timed_thumbnails=0 +DISPOSITION:captions=0 +DISPOSITION:descriptions=0 +DISPOSITION:metadata=1 +DISPOSITION:dependent=0 +DISPOSITION:still_image=0 +[/STREAM] +[STREAM] +index=2 +codec_name=webvtt +DISPOSITION:default=0 +DISPOSITION:dub=0 +DISPOSITION:original=0 +DISPOSITION:comment=0 +DISPOSITION:lyrics=0 +DISPOSITION:karaoke=0 +DISPOSITION:forced=1 +DISPOSITION:hearing_impaired=0 +DISPOSITION:visual_impaired=0 +DISPOSITION:clean_effects=0 +DISPOSITION:attached_pic=0 +DISPOSITION:timed_thumbnails=0 +DISPOSITION:captions=0 +DISPOSITION:descriptions=0 +DISPOSITION:metadata=0 +DISPOSITION:dependent=0 +DISPOSITION:still_image=0 +[/STREAM] +[STREAM] +index=3 +codec_name=webvtt +DISPOSITION:default=0 +DISPOSITION:dub=0 +DISPOSITION:original=0 +DISPOSITION:comment=0 +DISPOSITION:lyrics=0 +DISPOSITION:karaoke=0 +DISPOSITION:forced=0 +DISPOSITION:hearing_impaired=0 +DISPOSITION:visual_impaired=0 +DISPOSITION:clean_effects=0 +DISPOSITION:attached_pic=0 +DISPOSITION:timed_thumbnails=0 +DISPOSITION:captions=1 +DISPOSITION:descriptions=0 +DISPOSITION:metadata=0 +DISPOSITION:dependent=0 +DISPOSITION:still_image=0 +[/STREAM]