From patchwork Mon Feb 26 18:36:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Kristoffer_Br=C3=A5nemyr?= X-Patchwork-Id: 46549 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c51b:b0:19e:cdac:8cce with SMTP id gm27csp1547404pzb; Mon, 26 Feb 2024 10:36:50 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCVHErXwR6zueOwUQQgT9pFE6JBmT6vLeXQPsOfS9qzQaV6hCag++c3HfvvTH9y+GmCK8BJ1zGN6PDOTV6HC9PbOaN3B/5EGVbiPpw== X-Google-Smtp-Source: AGHT+IFaKtlJVnASbmsDI/dY6xdMToxv1JGieO74rFmcYHzxNqAY2cZexYkR85nPkyTP4nuhS8Tp X-Received: by 2002:a50:a40f:0:b0:565:c4d0:8fee with SMTP id u15-20020a50a40f000000b00565c4d08feemr3642250edb.0.1708972610201; Mon, 26 Feb 2024 10:36:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1708972610; cv=none; d=google.com; s=arc-20160816; b=Qf88JAFTXOwEIdc8Brt+u9RjCJuz1DmkTzpkV50uxyWKa88HvmVQ2GObPa2ehsegGh 90zw7IFxPMuHPZw5PqlY5PXgIV6Id9zasiqgbeWebYlPqRbdXqiXx3sb4FSkzRaxUXH/ ENASljnp1S43PNoT+lOp/qz1Qopoq5KsZu+3Mg+SV/NjixBCn5gUrwReeQx0ri6g8wDE D5uID0l8w06m93IrkLYl9JQQBOHI+rZZ1h5idj5Qiu0+LDF0oOg3DOxw9SWnjnOT+dTj sRDb3DIbDzNS+zDsemQHO/nVMfSLaA76R7E3l6d4kTfQrM6N5r43GyplsuSStXVRm52v Enzg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:reply-to:from:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :references:mime-version:message-id:to:date:delivered-to; bh=KsbDCb929+NyUi508zuGPlC4J9MdExrKaqfx22LjcBY=; fh=L0j8bW4po6iSyIfbvUcHxsukEt5JLv0/6Lq3x9l38y0=; b=KczKaq2+sIRP+h1fwewVYjenH9r4AkCOnNcKlELurh94zOAgSGNPho/aAD44RPMVaY RzbZvD/3Mm6Cc81q4T69nKaT/8YNpUGd+LNCIjmKa+gw91Kfnt1PT18NryxGErck1+UI uglas5Qy4t+fDpyv/xyewG67HwviLskih/lz7JcTdKf2KkUWbQL9WMiwFA4U/pgjvjKI dbT4EyMX33gMhWIHlGoHK8DQsY2+mJW3KNCtDuR9INmX9JEEA6Hqg/LtfNfBxhHgmRkL 6CHfPky9FTIrtLivticN5fn3/CXcb0AJWvcagvkB5MquLhCdSM5YfbKMZLugIQLRO8Sl PzPg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id d14-20020a50f68e000000b00564952b2a22si6261edn.265.2024.02.26.10.36.49; Mon, 26 Feb 2024 10:36:50 -0800 (PST) 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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1633C68C846; Mon, 26 Feb 2024 20:36:46 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from sonic309-25.consmr.mail.ir2.yahoo.com (sonic309-25.consmr.mail.ir2.yahoo.com [77.238.179.83]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3920668A9C7 for ; Mon, 26 Feb 2024 20:36:38 +0200 (EET) X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1708972597; bh=TiFG5+O1F0KMiGPw2g/WHzhwUFQ063entxJ8SPZxPUG=; h=X-Sonic-MF:Date:From:To:Subject:From:Subject; b=nkW7D8DLOt+W55Sw0i7BLhyM0AfNf4qVkedsTEIZ5hnNsZaBIvMr0iyfJfBB8JQ0cm/egdjsW+Si6P85TI+6O19OiPuQgj+cYjsg1A0baGx18D4pVmVel9h5q2heyEEAuBZ/W1EsJ/iU2n3lKLbUJ/OpMwYOwoE+2z+203iIfKFWleSKciYF6lTiDmRfTYJ9u8g2rVDWjV+aypf6rk9wtPn7f4jV4imjhv9TIhX/b3+4oEyIYYVUMbtaSJbdoEFrmE/byJTAaK+qQZ//Lt1Rqe2+gl6d2FxpB5USclJ6ps9Aik8Cw/I3lf0bm61Wbz/4KzzrwHifOU/d/41g3VRvnw== X-YMail-OSG: 4UAZR04VM1keq.cpiB_VDrulpZVSpmRtrIUJ_Ve_e_a8vy3PWaRyyYxc_6gr8kM n_V5gDNk8ScKIIC2cjebR6k4bMw9leNRKN6wM8wGO8K11Rzn1_HCeVppD22j09KjR8eOHGQyBtc8 bN0T5IigsSUEprwH.qoKXZdM1MgOJO3torapVIqWwjhHWDujUZGNGsRfH2TA3jQBpVDaDllxVIpS M734QytqgbpBLGhfXZqonkVIKxY6Ulwsxr6kcZJjxJ1kp0Nq3K3o43dQE15KGeV2gKQiYjKDFppE 7jrNa036Z7OYxUP3u4xMEmZWkv1_r.dPFnMJ4UxxW89JMf9HmcXhXchbeqm2WBQomafTL1LV8z8u pCQt5_ZohQCD2Yi1hP3I2mrCLcp5qcVe0qEy6ZxCjPkwPA_l.NEyuHsF5V2Bnwubt7XHa9yZUed1 WjPq4OXJhAawkIneoMa2zaXZGZpZGP8QZBQK.B4uAwTFsbg2bCYpHSbErTxcLEHeA9G0yVc2sYNk 39__hb_Eg.rxfq4TAUz.nOG70HFv4_s1D6M4f9SKzim5ESV1q6CtQE_SNHNhkzpKmlCKH9gIzQKc m4lbyghkZ.ilcUePDV6kaw6F1pRQn6LHZbNrZcTIBchJn7CPO48dAcxTtrimGw2eGVIileye1Rkl QeRemhMy3_m_IeOEvsAKFQIR9Rmv0RsSI0f39aWt0OOOwWNPGwzE2XTio_ouObMSey33jjP_jSht JM7wALrJWN27T4qFu6WhEQT8.cbw1jzVflaJl.PcW2NTg3gdrGg1tpuaB654.9DNQ6NE.vFF.d6M 0bbK2wCppqPgJbMsRYvO3zfG0acJkikzNX8QDMgchurPgdS.Fodq_j7tBUCRn0maDh86Evs.LXuZ 5D1e.cGKEvb_2nxTrkK4niCMaRkO40SYpWp3oPd8T7EvdXkJ1BvLw7e2T0fdGh.FaUEd.SQuIz_1 SwEDiWywkn7adR1SPkjFLv62uznaNIp2IZsQtW2JWyJ00Av.Gfb46uy0zamgSiO0GtdZAOIbmYSY 4RJTgLE3IFyEG0xbt9sGhmi._ZKegi9zS7DPb78jjXt5y3SIx1wZ_zOtci6raLOlVQ9Scc_Cqxqo eufiHx9u4cwwFD8rT.pU7FYPpTmJLemjERSLlFOPuQVp3_DVZkOnWR4uNuN84yr4H2FEYN_I8_tN g3L6DMUCoaiT9rLNmlzcyhjVjX_QyPPPnQ5PJ4OeE377OlXPWiO36s4I91OfkS2d925uikE3_Dsk X.hAw0o1zcJAx6Ps42vb3_kGXfS2Gvy7qz8YAnbfXuvhC9fJxavYOCfICkmL9nTYsPDiQFa6Cofn iLIEMyQivov5E98u31_.85pGgZ3.9XjncPpWx3Sw8E4OuavSLtDjPNhtaEyaTJv5FP7pzcTs4CNj nt2zK0MVSAq0dxZhuAyid1DoiUSg3TfFKbmR31oQ3izEKYMNhVOhYtdYo1UrvPY8y1P5MtcxlcTf QNjN5T3wHL_giJwpuuHFbuETi_slUfZ9sGknpwAC4cpjWGfHJYbzugZgHDL0VEfoCz0P2SjK9uzP OzaBBTk499gBugwohIggEuCIMftFiqo2f_fZUT0m.txU8Qg9daPNDR9KGUF1xOuxVf83QyKYT5RC G4TIyHaNCAgbHbWxr9.TorYJ9aaukPax04eAVb_.3Vc10resk3SuwQBNeMeZfp.rscUQEBszCsbz nEiRgn52V23t6FDJlf4kyy6gknL.ja3gRl6QUHsooYX9zKrfmBeEJ1L1WdO8ETN9XOhvzFO0EdcF pUtwZf5..aCOlZmRuXRX3RDSq5NTBnuC_G3MsAGd1iQlOY.nhNOV_.EyUAj9TPrfG0WDDwZkMrzE 8Ke1mBOCeZNlkwmSLh0rlsYn0vR.eY02rgZcYUHljUbwVlRYULKg.EnLA7JakplgTpXmfCMrinAd ighmuFMXoT1cDI3T.zjN08KvAy4sbz7mGlj2gKWdtvvsbpUUHT6R9wtX7kE_izf8upO2Add_wAmo rcninBGqf_a13Nw7dRSvFVOr9mRywHeT9JxJ5AH.sRc03ZwWG8tFrxf0mZPJzzx0t9kZaAJ5ybgo AGWJii7OoIDihi6FW55TdTboAzaj..MFxdizlJ1e2ydI_fYuL3XdUvA.6Lg2nRacSNoJ4WqPcxAP cgzqN7b49QdrQ7wsF7NPAWPmKdOTiV8sQuILMv.sQQ.71AOiQ5vSbVZexezYEyAL30UUYEJY0 X-Sonic-MF: X-Sonic-ID: 0f234a32-3ef3-4c0e-9be3-58a09494288a Received: from sonic.gate.mail.ne1.yahoo.com by sonic309.consmr.mail.ir2.yahoo.com with HTTP; Mon, 26 Feb 2024 18:36:37 +0000 Date: Mon, 26 Feb 2024 18:36:32 +0000 (UTC) To: "ffmpeg-devel@ffmpeg.org" Message-ID: <411082922.1517806.1708972592599@mail.yahoo.com> MIME-Version: 1.0 References: <411082922.1517806.1708972592599.ref@mail.yahoo.com> X-Mailer: WebService/1.1.22103 YMailNorrin X-Content-Filtered-By: Mailman/MimeDel 2.1.29 Subject: [FFmpeg-devel] [PATCH] avformat/webvttdec: Skip more parts of header to let parsing continue 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: , X-Patchwork-Original-From: =?utf-8?q?Kristoffer_Br=C3=A5nemyr_via_ffmpeg-devel?= From: =?utf-8?q?Kristoffer_Br=C3=A5nemyr?= Reply-To: FFmpeg development discussions and patches Cc: =?utf-8?q?Kristoffer_Br=C3=A5nemyr?= Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: GKacI4nPIz4n Hi, Here is a short patch to skip more parts of the header for the WebVTT subtitle format. Without this the parser seems to stop and no subtitles are produced for the user.You can find the WebVTT specification here: WebVTT: The Web Video Text Tracks Format | | | | | | | | | | | WebVTT: The Web Video Text Tracks Format | | | I attach an example file using the STYLE header part. I verified that with this change, I can see the subtitles using mpv. I tried to run fate, but even without my changes it seems to fail? -- /Kristoffer Brånemyr From 416d9ae6a57887de0641b9b7ef6a353d95ae7e61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristoffer=20Br=C3=A5nemyr?= Date: Mon, 26 Feb 2024 18:05:38 +0100 Subject: [PATCH] avformat/webvttdec: Skip more parts of header to let parsing continue MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Kristoffer Brånemyr --- libavformat/webvttdec.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavformat/webvttdec.c b/libavformat/webvttdec.c index fbe7ce316c..3665c9086b 100644 --- a/libavformat/webvttdec.c +++ b/libavformat/webvttdec.c @@ -94,6 +94,8 @@ static int webvtt_read_header(AVFormatContext *s) /* ignore header chunk */ if (!strncmp(p, "\xEF\xBB\xBFWEBVTT", 9) || !strncmp(p, "WEBVTT", 6) || + !strncmp(p, "STYLE", 5) || + !strncmp(p, "REGION", 6) || !strncmp(p, "NOTE", 4)) continue; -- 2.36.1