From patchwork Wed Mar 8 20:24:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gwyneth Morgan X-Patchwork-Id: 40612 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:d046:b0:cd:afd7:272c with SMTP id hv6csp725770pzb; Wed, 8 Mar 2023 12:27:43 -0800 (PST) X-Google-Smtp-Source: AK7set/qv0pqCP94n7DdoCST0045nsoXFho0MyrOYivTwVOoZZO+VwPHlLElyppMb3l2XEFG49Db X-Received: by 2002:a17:907:8a0c:b0:8b1:3002:bd6d with SMTP id sc12-20020a1709078a0c00b008b13002bd6dmr23386295ejc.31.1678307263702; Wed, 08 Mar 2023 12:27:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678307263; cv=none; d=google.com; s=arc-20160816; b=wtAw3kOJ2FP+z3u0Ceo1OTFscsPXHwXX2ZRgvaJDADOH3tlCyvagFNACJcv4Pa0tYz HxIf+NoclkuRztSp985d2pZvYHRsjJkLzlYcHGpqF246YDe+2ipgsH16HLx0CAt0NbVS Q8/rcLUSmhGuW1vEHFOKW2yPUv0QNzPWyPXjoR4MVvjxKakuUFDG8ob+CfVPXWvqxSTk OOCzk5CDxj8bFOlf1CaPw1nDS0MSyoNAedc4yNReSdtxFNoUiRuVaql+e8KMnIP/h/4a I7LcGqZ1fkJy5vXtIjOlJwVnLHum8CE+z+Wj6tKVEo5ByZ1ceC2Ge5ZNit3UH+sgXxnv h/Kw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:date:to:from :dkim-signature:dkim-filter:delivered-to; bh=wW3zPw+E6IjMR+XqJTTLjKEtORlAbAkbDSVfjmNVE7o=; b=TtWUEVuPDj4gxLzTDCyMkCYacVTNAEoiwwRPSFgyAwdQJzaAV2lDFz0nLq2vxnAuu6 5TjYk1bAhtJfMu3LttY8IWB/O7pGzSltDF5HW/77U7CiX2FEpG85KEj0GaPm5LjReRq7 aZ636HaD2ONqqCdNGse8aFstSzCH9jBt/fVUHcSAVJpaXv6eWyDGfok52vjYao2hzvB1 gROlx8JsHL/TrOhEIrPbEytX9rhjCNsx1/spUZj1qbgrlmQDMPHVzwXmxKx3suwbvhBH 617tDIsaBb8xlE2yyuKZ4uqTffDfxZC4Xi8GJ3WjhWImdMLW08nwghQhL7aV9XUaCRhJ sQOg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@tilde.club header.s=mail header.b=U7IJooiz; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=tilde.club Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id x19-20020a1709064a9300b008f486a9747asi2004172eju.781.2023.03.08.12.27.42; Wed, 08 Mar 2023 12:27:43 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@tilde.club header.s=mail header.b=U7IJooiz; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=tilde.club Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 066EB68BD43; Wed, 8 Mar 2023 22:27:38 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from tilde.club (tilde.club [142.44.150.184]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BCD6168BD05 for ; Wed, 8 Mar 2023 22:27:31 +0200 (EET) Received: from tilde.club (tor-exit-relay-3.anonymizing-proxy.digitalcourage.de [185.220.102.249]) by tilde.club (Postfix) with ESMTPSA id CD5AE2228EECA; Wed, 8 Mar 2023 20:27:26 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 tilde.club CD5AE2228EECA DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tilde.club; s=mail; t=1678307249; bh=O2rBIfDd0cB5NXi4tO0NCfXn9sMhIvgg2c/WogL8jZw=; h=From:To:Cc:Subject:Date:From; b=U7IJooizgY17F88GxrWermXH+rEA4CsMb92npibH0IgeUehxTdEK17lULe4A2A92S u2hW0MzAYZmlY4TiqVUoKThgiISknnHoZEW3UZiTUc+vz5BcPMgnB1iDCJG1e6QTqD +SDbsdAx0lqNiCEBVakMu93cAjYbIYUgfGkwih98= From: Gwyneth Morgan To: ffmpeg-devel@ffmpeg.org Date: Wed, 8 Mar 2023 20:24:33 +0000 Message-Id: <20230308202431.608732-1-gwymor@tilde.club> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/matroska: Write WebVTT subtitles according to MKV specs 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: Gwyneth Morgan Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: zdBvbPeNFnRz When writing WebMs, FFmpeg muxes WebVTT subtitles with the D_WEBVTT/* codec tags from the WebM specs [1]. However, it does the same when muxing MKV files, and the Matroska specifications instead use S_TEXT/WEBVTT tags for WebVTT subtitles [2], which FFmpeg currently doesn't understand. Support reading MKVs using either tag, write regular MKVs with S_TEXT/WEBVTT, and write WebMs with the D_WEBVTT/* tags we already use. [1]: https://www.webmproject.org/docs/container/ [2]: https://matroska.org/technical/codec_specs.html#s_textwebvtt Signed-off-by: Gwyneth Morgan Fixes: https://trac.ffmpeg.org/ticket/5641 --- libavformat/matroska.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/libavformat/matroska.c b/libavformat/matroska.c index 90d94b6..07aeed2 100644 --- a/libavformat/matroska.c +++ b/libavformat/matroska.c @@ -60,16 +60,12 @@ const CodecTags ff_mkv_codec_tags[]={ {"A_VORBIS" , AV_CODEC_ID_VORBIS}, {"A_WAVPACK4" , AV_CODEC_ID_WAVPACK}, - {"D_WEBVTT/SUBTITLES" , AV_CODEC_ID_WEBVTT}, - {"D_WEBVTT/CAPTIONS" , AV_CODEC_ID_WEBVTT}, - {"D_WEBVTT/DESCRIPTIONS", AV_CODEC_ID_WEBVTT}, - {"D_WEBVTT/METADATA" , AV_CODEC_ID_WEBVTT}, - {"S_TEXT/UTF8" , AV_CODEC_ID_SUBRIP}, {"S_TEXT/UTF8" , AV_CODEC_ID_TEXT}, {"S_TEXT/ASCII" , AV_CODEC_ID_TEXT}, {"S_TEXT/ASS" , AV_CODEC_ID_ASS}, {"S_TEXT/SSA" , AV_CODEC_ID_ASS}, + {"S_TEXT/WEBVTT" , AV_CODEC_ID_WEBVTT}, {"S_ASS" , AV_CODEC_ID_ASS}, {"S_SSA" , AV_CODEC_ID_ASS}, {"S_VOBSUB" , AV_CODEC_ID_DVD_SUBTITLE}, @@ -77,6 +73,11 @@ const CodecTags ff_mkv_codec_tags[]={ {"S_HDMV/PGS" , AV_CODEC_ID_HDMV_PGS_SUBTITLE}, {"S_HDMV/TEXTST" , AV_CODEC_ID_HDMV_TEXT_SUBTITLE}, + {"D_WEBVTT/SUBTITLES" , AV_CODEC_ID_WEBVTT}, + {"D_WEBVTT/CAPTIONS" , AV_CODEC_ID_WEBVTT}, + {"D_WEBVTT/DESCRIPTIONS", AV_CODEC_ID_WEBVTT}, + {"D_WEBVTT/METADATA" , AV_CODEC_ID_WEBVTT}, + {"V_AV1" , AV_CODEC_ID_AV1}, {"V_AVS2" , AV_CODEC_ID_AVS2}, {"V_AVS3" , AV_CODEC_ID_AVS3},