From patchwork Mon Mar 11 23:35:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carl Eugen Hoyos X-Patchwork-Id: 12294 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 384DB446096 for ; Tue, 12 Mar 2019 01:35:56 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id ED6B6680724; Tue, 12 Mar 2019 01:35:55 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-io1-f44.google.com (mail-io1-f44.google.com [209.85.166.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id ECACE680646 for ; Tue, 12 Mar 2019 01:35:49 +0200 (EET) Received: by mail-io1-f44.google.com with SMTP id u12so410356iop.11 for ; Mon, 11 Mar 2019 16:35:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=b2SwoWnAu3UvwIMu9GcAK7SkbAfoWPx/dp3WU+FXD9g=; b=SxsECOUr8uVHpcsCQQjIvdcuWK8Pju2PsFcGdUJ3CJytaMlfBb3kAg+/wugr/1XAd1 W/luFDV7fU04XBqbDeaxlmY4rLQnbrbTTdPzMp5ADHDheRt+rlXQeRTy1Gz9Rx7d0cqr ChakVavEcdvht/0yhNCEvVo4xmCjeQQIKIr8EZ8qAU7KV/9buCDG90sg6/C5+0EWoMXn oq38KnJGywRreg28TLEDOxfJzMBQ8i1SP1A1eheoFmv722K7NJ2/tp01XQG6BfDLkcdz lX0byUBNfmrfgWNOrWRlczYZtlfpVv9fHKnlv5rAxguS2xoaNavJyvnbvDHh6uJTZ8q6 CKYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=b2SwoWnAu3UvwIMu9GcAK7SkbAfoWPx/dp3WU+FXD9g=; b=n2z9pKb0sFKLgfV9t28UUHapCDOagEh8EXjB3Eod/V+1Qci74januTFdwo1RJvddZt bKtYlvbDWLIvYbfnvjxdAjNhUaLtgfFNTnb6oJbc70p7d4HjQx6SuB8QV7Ozi1vdxf9i dR2+3AWfuqK4vvnrC57C0YassFjfEFlTKHzMulXLaDVqf1QT7V3a0YvjKLKrGLycCm2O 2NRBkihpxEhIpCWV8s86HNcgGnMAJl0GwtmYs7wP5LpHDEuJ6R+Q4I8I7DfEKhZKwudC GkPffHI3BYt8WH7/F/5757ZIrYEBQTDgrF3yPS0B0UE9Gzbggt41nCEiGqpS4Bxexzzr PHsQ== X-Gm-Message-State: APjAAAU44FfNwtx66puCw+cFGT8dG33pqBJuYfUI9Ljp435KxP49Zi7E U7O07OahTvuakWj7nK0cD6i36BAwM1Gd9MsX5RJWDg== X-Google-Smtp-Source: APXvYqxWT1DaBq//IiZuOwO0HXsoCB+LkzAH7iNsVwEn6Bc2Zqkih2bTijXgqeciuL/VSY4ojvfLK24pfNhG/3BPZ6A= X-Received: by 2002:a5d:9685:: with SMTP id m5mr19974156ion.55.1552347348307; Mon, 11 Mar 2019 16:35:48 -0700 (PDT) MIME-Version: 1.0 Received: by 2002:a02:fca:0:0:0:0:0 with HTTP; Mon, 11 Mar 2019 16:35:47 -0700 (PDT) From: Carl Eugen Hoyos Date: Tue, 12 Mar 2019 00:35:47 +0100 Message-ID: To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH]lavf/matroska: Also support WebVTT in Matroska 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Hi! Attached patch is supposed to fix HandBrake issue 1964, FFmpeg currently fails to identify WebVTT in Matroska (only webm is supported as container). I don't have the original sample to test though. Please comment, Carl Eugen From d4cdbc94e4adf8ee4b1f576b60c0e743f9f8928f Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Tue, 12 Mar 2019 00:32:59 +0100 Subject: [PATCH] lavf/matroska: Also support WebVTT in Matroska. Fixes HandBrake issue #1964. --- libavformat/matroska.c | 1 + libavformat/matroskadec.c | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/libavformat/matroska.c b/libavformat/matroska.c index 4d18d14..adcd67c 100644 --- a/libavformat/matroska.c +++ b/libavformat/matroska.c @@ -68,6 +68,7 @@ const CodecTags ff_mkv_codec_tags[]={ {"S_TEXT/UTF8" , AV_CODEC_ID_SUBRIP}, {"S_TEXT/UTF8" , AV_CODEC_ID_TEXT}, {"S_TEXT/ASCII" , AV_CODEC_ID_TEXT}, + {"S_TEXT/WEBVTT" , AV_CODEC_ID_WEBVTT}, {"S_TEXT/ASS" , AV_CODEC_ID_ASS}, {"S_TEXT/SSA" , AV_CODEC_ID_ASS}, {"S_ASS" , AV_CODEC_ID_ASS}, diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 0e3a689..0d7b0bd 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -3428,7 +3428,8 @@ static int matroska_parse_block(MatroskaDemuxContext *matroska, AVBufferRef *buf if (res) goto end; - } else if (st->codecpar->codec_id == AV_CODEC_ID_WEBVTT) { + } else if ( st->codecpar->codec_id == AV_CODEC_ID_WEBVTT + && strcmp(track->codec_id, "S_TEXT/WEBVTT")) { res = matroska_parse_webvtt(matroska, track, st, data, lace_size[n], timecode, lace_duration, -- 1.7.10.4