From patchwork Tue Mar 14 03:25:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gwyneth Morgan X-Patchwork-Id: 40674 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:d046:b0:cd:afd7:272c with SMTP id hv6csp2259221pzb; Mon, 13 Mar 2023 20:28:44 -0700 (PDT) X-Google-Smtp-Source: AK7set9ENI7SQPQ/qAi+Aso0+ZyZl9i2JecFhoJCyx42jJ6jm4+gjpkUxbiqcBf8Oqxoqww/3GQD X-Received: by 2002:a17:906:fa15:b0:92b:a3fe:53ca with SMTP id lo21-20020a170906fa1500b0092ba3fe53camr665728ejb.30.1678764523858; Mon, 13 Mar 2023 20:28:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678764523; cv=none; d=google.com; s=arc-20160816; b=HBPLXyYOMDpyBehgQQ6HjPtGBdw9aw15zc3jY13lpsm74YB0zkNP9u+/CTEcML3PFA qY1yGQJa0caNUvVvsUP55l75o1HAoaSEZs+Q8XjfROycEbW5L6+YKPjBzjmDbyP2kQ8R kxOs0FoilCTnwb0DYyA5z0XLysZq/X2jwsRyPKKBL2dLeifvSAlCGgaHkASsqpRUBqGb gaDmJ+ADSIGfa0WtoXKwB1KIw79FWtThzfqWPYEwweDYyIg+fxdeSePbHpFrbXBC3k7y LTLfbmD9mfoQI7g5ezEjBoISCbCiEiTw/ZPHhZYkD6tx9WAUVWYxk5c8Gk85MSDCmOf1 Hfbg== 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:references:in-reply-to :message-id:date:to:from:dkim-signature:dkim-filter:delivered-to; bh=bDlm0Ka+txtWVLPr+RbFSStHK1ZTl9vwOEzBjMxeNb8=; b=o1B3W0n998PMZd3lVRXiCIMM0cGh3vD/oIW2ol19+yqfcaO6500HQzhhSaDy20Y8ug 89WVYS/SFpsMne8z1QtYBcTf5k5Z+Ux4N8mu+xARP37f2GMCDlJBXe/A4wpVfsm4kQ73 Tsd0+rDaEBm9lk+fjWN7YBVw9IkZZtNYfTwidvqeDO0sO7NmGKO6/mX/rHvnRKYjjPUC gYKbTUGo0W39nWaQjSaIySu5UoBRqzysoRtMHlV0LxvsQ542/LnpGOTi4pGk8kdljNho 1BYY3X6nOWjR+PsnxTFDdXTVlK8wU4rTOhZf0yke+2Fxm1zIjgj2GxFmTqUNqsGOT5IH ctYg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@tilde.club header.s=mail header.b=UJKZbnDg; 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 i8-20020a17090671c800b008da4db3518csi1543770ejk.868.2023.03.13.20.28.43; Mon, 13 Mar 2023 20:28:43 -0700 (PDT) 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=UJKZbnDg; 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 C70A268BE09; Tue, 14 Mar 2023 05:28:37 +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 0E91068AD89 for ; Tue, 14 Mar 2023 05:28:31 +0200 (EET) Received: from tilde.club (unknown [185.220.101.82]) by tilde.club (Postfix) with ESMTPSA id 89F902213BF84; Tue, 14 Mar 2023 03:28:26 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 tilde.club 89F902213BF84 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tilde.club; s=mail; t=1678764508; bh=sv6pKYBBwtHX0oJHEr+JHKUyYDPAbKkkVza8h9L3G9Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UJKZbnDgdN1X+oCn9RxOV8ry2ZKQy8yecoo/aRznc1cbGcCs3oR/QYzdjVe7s1YrO L6XsrnPKEGQ0FCIwyeTCmzUuJebSy9652isxOhdIHbZfMPPzoeelf3KxakiB6+6iAS x673OCqoC6MKjKYO/ICRPE2cOj3MNA3TzZmAmRdc= From: Gwyneth Morgan To: ffmpeg-devel@ffmpeg.org Date: Tue, 14 Mar 2023 03:25:58 +0000 Message-Id: <20230314032557.945590-1-gwymor@tilde.club> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230308202431.608732-1-gwymor@tilde.club> References: <20230308202431.608732-1-gwymor@tilde.club> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2] 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: myGcKJJy3qXz 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 --- v2: Rebase as later changes in ffmpeg.git conflicted with this patch. libavformat/matroska.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/libavformat/matroska.c b/libavformat/matroska.c index 79b2d09..d9e5ff9 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}, @@ -78,6 +74,11 @@ const CodecTags ff_mkv_codec_tags[]={ {"S_HDMV/TEXTST" , AV_CODEC_ID_HDMV_TEXT_SUBTITLE}, {"S_ARIBSUB" , AV_CODEC_ID_ARIB_CAPTION}, + {"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},