From patchwork Sun Feb 7 02:49:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Walter X-Patchwork-Id: 25475 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 E58DF44A3E7 for ; Sun, 7 Feb 2021 04:50:10 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BBC22688298; Sun, 7 Feb 2021 04:50:10 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f173.google.com (mail-qt1-f173.google.com [209.85.160.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 91E8568828E for ; Sun, 7 Feb 2021 04:50:03 +0200 (EET) Received: by mail-qt1-f173.google.com with SMTP id r20so8066318qtm.3 for ; Sat, 06 Feb 2021 18:50:03 -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:mime-version :content-transfer-encoding; bh=xUaOkDK5u8W/CZHPLuwSqLNnCczaNBIIdDR0B5h23xU=; b=vb0ecX3DZn/lOPBnJZMI0eCf0aYTX/wuV/C7eveHYO3HNx9vT/bi////ukxI7vS4DO FrWzywQBViIyJygJLbcii6Zg5zKhpVm+kjSG1kWdyRNHB4W+o6/94yxfv4mO+Wl3DoQ/ d5GWC36aegyUQRU+UIcvz4xOcsqGktbOF8vvIcKHMu0Ez6/Cg4cUl5PA+E9OMNA/mDhw CM+QSAnQciRgbaMQHO4VdcrPQLZIjLs+Y239+w2bKLAj0+PKG73k7MypwUhrjAdYTbVf JzD8t+b3KEMx4/Ad0lxvRyQzW0DTDXih18DR9f579dqlCFDEfRGBBU7p9HxDdUyZpv17 V9LA== 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:mime-version :content-transfer-encoding; bh=xUaOkDK5u8W/CZHPLuwSqLNnCczaNBIIdDR0B5h23xU=; b=E3O2KGSSFKuUYwsTd8q98C3j8KJv2aj2iJWAD4qDTlRUAiCIcsLKFmYdQy74BoXM9N wctsVVumiw+bpdsGwvIsdsUdf3kpsGFo8/SjgLzWiqxolboyYq4oxEWU3f8K2TKE87oQ jaBu62yl8d20Qk+xNH78Htv54+uu+5/uqP+i6tlUPRH6Bc80OtKPfCwF/SOw0eA5znKq JgwfkC7xcZ5Wm76eKB8QdmsS2CJieKzT14vKQGTg/HJxn6LMEBBjSiqtG2SJAcdJbje4 nIhufAjhUVNM1EBHLRybvyJiRw1E7WR8tokaYP8CzPAqtw6s6/z0MJhXWkuUrXTX+XVH fOeA== X-Gm-Message-State: AOAM532RmqGf37GElw5KDcDclaKi8avwA3H1AS2oFwvYIC70KIUqUmM1 u/gXyZNielUxOOWKI1oT9nB7fUERA8w= X-Google-Smtp-Source: ABdhPJxX2AQ7C6RkFEFgReg8ad5uzu+qYl0G3Evc7ryq9NNh5DcJWZPASzxDGWRtcJz85mSr+mmPYw== X-Received: by 2002:ac8:6999:: with SMTP id o25mr10214920qtq.373.1612666202040; Sat, 06 Feb 2021 18:50:02 -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 j7sm12034824qtd.36.2021.02.06.18.50.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 06 Feb 2021 18:50:01 -0800 (PST) From: Walter Wong To: ffmpeg-devel@ffmpeg.org Date: Sat, 6 Feb 2021 21:49:54 -0500 Message-Id: <20210207024954.380875-1-wwong5545@gmail.com> X-Mailer: git-send-email 2.30.0 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. --- 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} };