From patchwork Sun Feb 7 03:55:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Walter X-Patchwork-Id: 25476 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 77F1544A8BE for ; Sun, 7 Feb 2021 05:55:40 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 55447688162; Sun, 7 Feb 2021 05:55:40 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f172.google.com (mail-qk1-f172.google.com [209.85.222.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 47DE9688162 for ; Sun, 7 Feb 2021 05:55:33 +0200 (EET) Received: by mail-qk1-f172.google.com with SMTP id t63so11234410qkc.1 for ; Sat, 06 Feb 2021 19:55:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=PiA58rcxXqUp6odDlkPkhDZGKexp6TXofGVt3g2pyjc=; b=nFMcGvaQmqhi8yTq4AFicW+uO7f6kWYgM5QMy3JUnl6Pqq1YF8nlV0xFJPxWQOYspC g8yaswqMYJGR1PR9FJwyHitO+b+Yqnqn0k7frU0KtWaJFP4fbgnHNb7nHitk3XMPlsy5 yPWs6sMFUORfaQtYC/ayIw+XetZ4YQqAChlOugZj2ho8sJ5T3SQAfKti98FoqZga7zqE ksls9n1JCoNZ5jHKTl9LO84g15qWyceXmQslRecchMPIVDzmXi2DP3Gij70AGQTH18z7 gbQLU/OraBHt8QP23JdO56JB866mPCVziiGvjKzckVkv3GI03lF63TarOFszywl7oJTw EtKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=PiA58rcxXqUp6odDlkPkhDZGKexp6TXofGVt3g2pyjc=; b=jv7U8U8DNeo4vxpZiXI6yZamGzAgx44EAQ/1SXQ3RWR7p41vrMxHP9BA4nN2kaN62+ TXpYixXFgLXphuBik/rKjgtjPp1L86PKIB/itrkQ0jI0BIkUOc8nSpQ5tk+05oYUf6WY i5MHfhyIbwFhyUSsuhCSyXq/knxAjifvwGYt2bntAEXOCcKCPQ0qzMH6bMbLgYxbVtWr myi4bwJhGihGIVDPFz7rwM8xR/dea0ZBafS1fPobOtpyI4a8BhdWrWfabcW6TbAIoQLe YMUki/+YfbhH0lTeH13i4+2z+uj4YnJUqVhlGTxTCR8FyLlH4w5XkFD3dMp8S7romDs8 2DgQ== X-Gm-Message-State: AOAM530s6LFHn6BUBQMcYgKJf0Re+hstkgeJdaZNsvQXrsEKUaLRge81 Apgd523hOr0Xi6Lg0fZYldLQEW+ZMvQ= X-Google-Smtp-Source: ABdhPJzpIZGAyR/jy42ChThv0RAVr7vUvB4+9MfmtcxaZh8bFerJIt5h/yyOOrdGeNBFh2sII3MWoQ== X-Received: by 2002:a05:620a:113a:: with SMTP id p26mr11055615qkk.154.1612670131792; Sat, 06 Feb 2021 19:55:31 -0800 (PST) Received: from localhost.localdomain (bras-vprn-okvlon0102w-lp130-43-142-112-130-210.dsl.bell.ca. [142.112.130.210]) by smtp.gmail.com with ESMTPSA id t6sm8857183qkd.127.2021.02.06.19.55.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 06 Feb 2021 19:55:31 -0800 (PST) From: Walter Wong To: ffmpeg-devel@ffmpeg.org Date: Sat, 6 Feb 2021 22:55:18 -0500 Message-Id: <20210207035518.404429-2-wwong5545@gmail.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210207035518.404429-1-wwong5545@gmail.com> References: <20210207035518.404429-1-wwong5545@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] Add matroska codec id S_TEXT/WEBVTT for WebVTT streams. 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: Walter Wong Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Added the codec id S_TEXT/WEBVTT in order to bring ffmpeg generated files closer to the matroska spec. The list of matroska codec ids was also rearranged to push the old codec id (D_WEBVTT/SUBTITLES) to the bottom of the list so that S_TEXT/WEBVTT is the default codec id for new mkv files with webvtt subtitles. Fixes ticket #5641: http://trac.ffmpeg.org/ticket/5641 --- libavformat/matroska.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/libavformat/matroska.c b/libavformat/matroska.c index 7c56aba403..1128c96451 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}, @@ -100,6 +96,14 @@ const CodecTags ff_mkv_codec_tags[]={ {"V_VP8" , AV_CODEC_ID_VP8}, {"V_VP9" , AV_CODEC_ID_VP9}, + /* These codec strings for webvtt seem to be depreciated from the Matroska + spec, but it might be useful to keep them for compatibility for older + files. These are at the bottom so they get matched after S_TEXT/WEBVTT. */ + {"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}, + {"" , AV_CODEC_ID_NONE} };