From patchwork Mon Feb 19 21:42:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Oneric X-Patchwork-Id: 35062 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:dda5:b0:19e:cdac:8cce with SMTP id kw37csp1510773pzb; Mon, 19 Feb 2024 13:43:09 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCXSLPn/cOU4V7CW8U2oSC+8as7RwPT35DI/6lThpINJEMo/Hn9djgIUZSjIbVHDAhjYQWi22RnYxQAKYYodyILwHXRAcRn5Ikm+bg== X-Google-Smtp-Source: AGHT+IHZU+x9hrEND1OndUOOTTIBBLURz7mxJEeyCAbasAUMvOyRdjD4RkpqL5SFAu53two04uP7 X-Received: by 2002:aa7:d44c:0:b0:55f:4bd7:6a6f with SMTP id q12-20020aa7d44c000000b0055f4bd76a6fmr8489385edr.29.1708378988939; Mon, 19 Feb 2024 13:43:08 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id q15-20020aa7cc0f000000b00561ba9c6137si2870394edt.679.2024.02.19.13.43.08; Mon, 19 Feb 2024 13:43:08 -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; dkim=neutral (body hash did not verify) header.i=@oneric.de header.s=strato-dkim-0002 header.b=Hpj97zxr; dkim=neutral (no key) header.i=@oneric.de header.s=strato-dkim-0003; arc=fail (body hash mismatch); 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 10FCA68D2F9; Mon, 19 Feb 2024 23:42:51 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mo4-p00-ob.smtp.rzone.de (mo4-p00-ob.smtp.rzone.de [81.169.146.160]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 01CC068D3F0 for ; Mon, 19 Feb 2024 23:42:41 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; t=1708378961; cv=none; d=strato.com; s=strato-dkim-0002; b=Z81tQGnZ+hWMz/5ptA07oftp8AwN2Joa4e1IrCHjMEYfhfxUmG3bDEagTzReFMxK98 Rcw47csvhP1WVGYjjOyZPNPqV0oOlMaWcX8ZnXJFSnEdR7Ctuk3hcC+fU7TaeEgYFOTe IR3OKQcb/ofuPHXlBNnkA8c27ylfTAlpjdkvurfYwieWP/wiGrEtY6MLEClhHErbKKM2 fiwnpwKPEJBhesEwtlbap2meoJ3FCmCM/HFMz0OlIjn4nr5ajCprlhzJCL7A4KadN1cC 3bHnC9SucBo2p43GU4kFhxC45Zs8lew+LKr0Lgr1IuVNyv+Wcr7KwLN9Ptkc9kgDNh0+ bEAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; t=1708378961; s=strato-dkim-0002; d=strato.com; h=Message-Id:Date:Subject:To:From:Cc:Date:From:Subject:Sender; bh=0iShcMMJ9zjl0El/ldN/Car3fK0CqH+JRcQcUDH/7LM=; b=AsBiTdiSWAvd0FI46KHc/sg8ZzQjQieSFbu2S0n0hcegSOdo1YWqbcFGNET8/ojBuX hUyvQ8JOM5ve1PUjHq7TjjLhcoOMb7XqWU4MDzoOo7tehkpCz1Bqknuj/rLV4WIffHNv SCmMO2+b0sVJI78nJjVwqCrsvWSyMl6ZJ1uzzDceUaA2rNlBdvGGNaZqDZclRGfba4QV B0NnhIIseg3AZAkd4Y/ydcnN8OFRkxLoXIO5XxN/eto203msbUDxhdKh8CC4jgDMbSTN q7wqzYolK7wXtf2fVpQGdec3EfkQ8oEvx9xaztLVAywGURdd9VtYqT7CbsWvYbN61Y+a UgdQ== ARC-Authentication-Results: i=1; strato.com; arc=none; dkim=none X-RZG-CLASS-ID: mo00 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1708378961; s=strato-dkim-0002; d=oneric.de; h=Message-Id:Date:Subject:To:From:Cc:Date:From:Subject:Sender; bh=0iShcMMJ9zjl0El/ldN/Car3fK0CqH+JRcQcUDH/7LM=; b=Hpj97zxrEQy0NTLCaZLfVCPLo8wxjjWqHhuReq9vvEIhed+1Ib9q6boA5UsTjTdCYM 5MbhhOnyZ9EESSrBnXS9rw+yJxV8MvMBz+sNet8Vuhose0FYAqU1xshSwbPeMcOaOD5O iA9edXjhpy3R4ofsRQ4PmndROpK5PsFw6LF4ClMR0cn89XvygNa8pbT2UiDHUaTgl5SW GYKDfKvYVqeA6EEpj52jmOVwhgq8OZTqvB90xVAocbORP4SmK2YOWMB29uN+K13psRyU PnFAPFDpGoYHhll1U9qOTWTvwMVfpdFJHA7bT9v0C5WSbaGMYLpZBl6qq61OfgJVhfha 36Fg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; t=1708378961; s=strato-dkim-0003; d=oneric.de; h=Message-Id:Date:Subject:To:From:Cc:Date:From:Subject:Sender; bh=0iShcMMJ9zjl0El/ldN/Car3fK0CqH+JRcQcUDH/7LM=; b=4w9iyW1svp5GbZJpKRKsc7lvHwz/EPGeL/b9HuHmYVTua+lVFU+GGA+sbJJn4ToETz CHApYZqDdvJPLvOkDlDA== X-RZG-AUTH: ":I2IBZ0mrW/AWQXwgB4oxKM1YsW1lFUznrLvi/XReWqAAlWwZ8wlvfXmGs4jUQ0oz8ZbhHexs8fhgUyUBddsh74Htfavbxf07Su2y8qQ=" Received: from abhoth.workgroup by smtp.strato.de (RZmta 49.11.2 AUTH) with ESMTPSA id x7ec2e01JLgfXQk (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits)) (Client did not present a certificate) for ; Mon, 19 Feb 2024 22:42:41 +0100 (CET) From: Oneric To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Feb 2024 22:42:23 +0100 Message-Id: <20240219214227.19814-1-oneric@oneric.de> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v4 0/4] Fix some active sequences in subtitles 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: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 4mVKrQMH3RiZ Changes from v3: - None. Just rebased ontop of master to allow Patchwork to properly process the series now that 99d33cc661fbd04e8657831 was merged. Changes from v2: - rebased ontop of the recently pushed eol normalisation. As a result no more CRLFs in here and Patchwork should be happy - added a fourth cosmetic commit adjusting explicit linebreaks to the new normalisation Changes from v1: - ff_ass_bprint_text_event now only inserts a word-joiner if there isn’t already one anyway - added a third commit improving the handling of curly brackets for standard ASS renderers Oneric (4): avcodec/webvttdec: honour bidi marks avcodec/{ass,webvttdec}: fix handling of backslashes avcodec/{ass,webvttdec}: more portable curly brace escapes avocdec/ass: simplify linebreaks libavcodec/ass.c | 47 +++++++++++++++++++++++--------------- libavcodec/webvttdec.c | 4 ++-- tests/ref/fate/sub-webvtt | 2 +- tests/ref/fate/sub-webvtt2 | 2 +- 4 files changed, 33 insertions(+), 22 deletions(-)