From patchwork Tue Jun 11 00:17:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Max E. Aubrey" X-Patchwork-Id: 13489 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 0B387446703 for ; Tue, 11 Jun 2019 03:24:45 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D0A3868A0D3; Tue, 11 Jun 2019 03:24:44 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B4CA2680BAA for ; Tue, 11 Jun 2019 03:24:38 +0300 (EEST) Received: by mail-wm1-f66.google.com with SMTP id c66so1027587wmf.0 for ; Mon, 10 Jun 2019 17:24:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=kChlvO7vWcFg8qA9dJzOLJm88TOamxBTy0fTHpOoGTA=; b=BoEIkaDlks9RNAcw6mpCIhX+3+LQcIbELjmtUJyzJQ/7ikXVYMJr2tB2dotY475HTO Xgt92cDaXRXHtShiIVwc7p9w/dfDgBoXEPuMhVDODCrFgXPjFstZMwlXWiKTy60Xo3hX g2fPEdCRa6hfTJaSTQpjZz/pFz2RvlwGc3/hLlJ32+ohhUSfvXIHP/eKaTFY34BqJGb+ ErX6zP76pKxY63JFpjv7W4YsdtisuaQVtet1b6rPoOYdDmnhn9OVvOZqktwbFflRqXss zHYT68a06UKFzcmeuJ4E6/gNgl8Ek5liBkJRA5gEOXuMBLJoWg6um1v3Ck77fSRWOn7e XpgQ== 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; bh=kChlvO7vWcFg8qA9dJzOLJm88TOamxBTy0fTHpOoGTA=; b=oE08NtsfveJGXBptnmhkGwag26Av31RhM7bGdejSmBY6nn6rW+MWeSY0t6uSWeWuKl g1nnh2nBPVCf2kVJHm51V0Kt6o1cCc1tUslax4q1yR768qRok5T0CBdmjLStkBlCT+4q 9GG5KKt0sWuaMuduikZgwqCDbYklKrH/mT3sTDZgXU988fTe8AXLGWHMf4YsWdo02/B3 Up0Jyv6K1C8MX80JsKQJvWE77/NnT541M/aJuJl0AwGWfoqIEZL4qvsIcxEVWMrYyFft +KUbcM7q1+jerQKYnCHsXiTg4rqbNBoKBEYwuJXOmO8UPrCToCYaSsYSBD67h1gb6EAY /4wQ== X-Gm-Message-State: APjAAAVn6hsNx1MA7VimSLK1N9fvM5MJw3jFg7oLlXXqY/iKACXIlpLM i+UJqLu14WRlp6mfWSuwNtQDgkwv X-Google-Smtp-Source: APXvYqyqb9/iTff0kDoBLochhRgBcVU7QDUFXq96nbuisKSRa+K1l+y0GygVpElmw/MTgR7r0IOVoA== X-Received: by 2002:a1c:f712:: with SMTP id v18mr16578772wmh.0.1560212273239; Mon, 10 Jun 2019 17:17:53 -0700 (PDT) Received: from localhost.localdomain ([2a02:8109:9f00:2c69:adc2:4b81:622b:f2f3]) by smtp.gmail.com with ESMTPSA id s10sm4610393wrw.45.2019.06.10.17.17.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 10 Jun 2019 17:17:52 -0700 (PDT) From: "Max E. Aubrey" To: ffmpeg-devel@ffmpeg.org Date: Tue, 11 Jun 2019 02:17:03 +0200 Message-Id: <20190611001703.25843-1-maxeaubrey@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH] avformat/matroska: webvtt codec ID according to specification 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: "Max E. Aubrey" MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" This preserves the old behaviour so as not to break reading "invalid" files. Signed-off-by: Max E. Aubrey --- libavformat/matroska.c | 2 ++ libavformat/matroskaenc.c | 8 ++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/libavformat/matroska.c b/libavformat/matroska.c index 4d18d147fc..ccebb031ff 100644 --- a/libavformat/matroska.c +++ b/libavformat/matroska.c @@ -60,6 +60,7 @@ const CodecTags ff_mkv_codec_tags[]={ {"A_VORBIS" , AV_CODEC_ID_VORBIS}, {"A_WAVPACK4" , AV_CODEC_ID_WAVPACK}, + // compatibility for decoding invalid files from old ffmpeg {"D_WEBVTT/SUBTITLES" , AV_CODEC_ID_WEBVTT}, {"D_WEBVTT/CAPTIONS" , AV_CODEC_ID_WEBVTT}, {"D_WEBVTT/DESCRIPTIONS", AV_CODEC_ID_WEBVTT}, @@ -70,6 +71,7 @@ const CodecTags ff_mkv_codec_tags[]={ {"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}, diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index cef504fa05..04da367a34 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -1265,9 +1265,13 @@ static int mkv_write_track(AVFormatContext *s, MatroskaMuxContext *mkv, put_ebml_string(pb, MATROSKA_ID_CODECID, codec_id); } else { - // look for a codec ID string specific to mkv to use, + // use specification webvtt codec ID string to avoid old compatiblity string + // then look for a codec ID string specific to mkv to use, // if none are found, use AVI codes - if (par->codec_id != AV_CODEC_ID_RAWVIDEO || par->codec_tag) { + if (par->codec_id == AV_CODEC_ID_WEBVTT) { + put_ebml_string(pb, MATROSKA_ID_CODECID, "S_TEXT/WEBVTT"); + native_id = MATROSKA_TRACK_TYPE_SUBTITLE; + } else if (par->codec_id != AV_CODEC_ID_RAWVIDEO || par->codec_tag) { for (j = 0; ff_mkv_codec_tags[j].id != AV_CODEC_ID_NONE; j++) { if (ff_mkv_codec_tags[j].id == par->codec_id && par->codec_id != AV_CODEC_ID_FFV1) { put_ebml_string(pb, MATROSKA_ID_CODECID, ff_mkv_codec_tags[j].str);