From patchwork Mon Feb 19 21:42:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Oneric X-Patchwork-Id: 46368 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:dda5:b0:19e:cdac:8cce with SMTP id kw37csp1510662pzb; Mon, 19 Feb 2024 13:42:52 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCUJjof30wginnIU06Y97/7d8QOQUtMe3DGzoej5m92B+o8KfQoL+O4FM+22QJCV8mXKz8ANsTi/D7P8rh/Vbqj4rzv1BRKOr5mgWw== X-Google-Smtp-Source: AGHT+IGXaKmvkZ9/xHzIM3ZV56tF14G1rpwJi8wXaHI/5TCQxjuWI9e7Ik+XkAkxS341K8u4r5v3 X-Received: by 2002:aa7:d354:0:b0:560:463:8cd7 with SMTP id m20-20020aa7d354000000b0056004638cd7mr8734698edr.34.1708378972485; Mon, 19 Feb 2024 13:42:52 -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 r16-20020a056402235000b005643d68473fsi2047579eda.206.2024.02.19.13.42.52; Mon, 19 Feb 2024 13:42:52 -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=HCsXXfwC; 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 CCBF468D40C; Mon, 19 Feb 2024 23:42:48 +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.161]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F1D7C68D2F9 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=j+gEQf0ob9vvodcVn2dXqSv4ZfzdeweOBLHwuBucAkNJY8ffkwml3lR3SA4VHPC4RR maRxPrLFym8XWly+OWL/zcQ5pEBHgCSH88meylQMP44jTwpKWabME7dG0iUJhvGJ5mSn MSg6VMNNMiRNgEJvJKWT8y24BwkU/J85A519/bUKzQ+61el/ClFIypDMH8OwqgEYCCfH f3/gWscF5ly+7a2JnYloX4yI0K/1uVgG5GtYysr+hM/ySmJA6LhHuGz5vZMMrzxw6y40 WgQ+b3hKeKWKnAY8cJ2QhFEvzmdwYoRXE2xbVqHd7bvAyl2UuDQTgTO6vOgdppCupDrI FQAw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; t=1708378961; s=strato-dkim-0002; d=strato.com; h=References:In-Reply-To:Message-Id:Date:Subject:To:From:Cc:Date:From: Subject:Sender; bh=SATYHbMwLqmo4j4F6LNPK4Wl2bcck3lrz72ZPz+DLzw=; b=DwjupuJUqpTTnXmkw9WEa3r8SJ0jcXXL2ZiTIhjCPA8AiWF6x5xmHoVLnvzLdMTILE PUwCI0c2ABxvkUsD4ymmdY6H9yTnh0HTIYuIT8LNuy6OoJezAzUFTNUhyydZDiTTJlBQ ZmOCRwzbCxbZO5shTlGJFMNZE6qJh39szA2aKhwTIx4nnbJTmagbh6YRzVr6QS6OlLws Ljs8jbD+u6Xbab7/Gk41MReCNikGxEJv8203hMLNncpVVAbAyg5RzBdz9OEqqzNXZrBH o+oTCKnP0TyjaMwXHUImeHrxi6woXD+m8oUdHMbKIMA6WgIfgzlS+vOqsQHdt/6X89mC Hsjg== 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=References:In-Reply-To:Message-Id:Date:Subject:To:From:Cc:Date:From: Subject:Sender; bh=SATYHbMwLqmo4j4F6LNPK4Wl2bcck3lrz72ZPz+DLzw=; b=HCsXXfwCF/jykAlMRnY9b3PnPc2YnIvxjXsLliU4PFXkfGWyjYQw7S+3zhf6VJSsj1 3xHuZvYA0S0UEx8zFO/eEkgTCEugHuelwvedkR7CXF9ZdACDu7VsNzcSKxgy/8nQKlQo Qsxizg7/tWGkdU6OyVNz1mWDjwaMy4I7DofZmFyH8Cpzg6ZWyLhvSyQ7/Bxa0OIfrk6N /79VhLbh8x9hMLA7RSzayx6u0gxgazmmBzXZtwtec+pi/Vgxw4135Wg3Ufbcwh/VcmlN sw0c13npKsQCTVE7KBy94jxPWryuxuJeVeipnV05nWXZ2LASRf7w0AuNbdldQcZXZjSB 31tA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; t=1708378961; s=strato-dkim-0003; d=oneric.de; h=References:In-Reply-To:Message-Id:Date:Subject:To:From:Cc:Date:From: Subject:Sender; bh=SATYHbMwLqmo4j4F6LNPK4Wl2bcck3lrz72ZPz+DLzw=; b=0Z4LnICLVb1Oi4LPDIcqaZELK9XiIj0nhtlQiyg6dwVHeshYxeqU7eMrhHCVIx7Xsi 8ARJg4AzGWf2vMuN65CQ== X-RZG-AUTH: ":I2IBZ0mrW/AWQXwgB4oxKM1YsW1lFUznrLvi/XReWqAAlWwZ8wlvfXmGs4jUQ0oz8ZbhHexs8fhgUyUBddsh74Htfavbxf07Su2y8qQ=" Received: from abhoth.workgroup by smtp.strato.de (RZmta 49.11.2 AUTH) with ESMTPSA id x7ec2e01JLgfXQl (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:24 +0100 Message-Id: <20240219214227.19814-2-oneric@oneric.de> In-Reply-To: <20240219214227.19814-1-oneric@oneric.de> References: <20240219214227.19814-1-oneric@oneric.de> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v4 1/4] avcodec/webvttdec: honour bidi marks 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: PuOdSbypY2w4 --- libavcodec/webvttdec.c | 2 +- tests/ref/fate/sub-webvtt2 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/webvttdec.c b/libavcodec/webvttdec.c index 690f00dc47..990d150f16 100644 --- a/libavcodec/webvttdec.c +++ b/libavcodec/webvttdec.c @@ -39,7 +39,7 @@ static const struct { {"", "{\\u1}"}, {"", "{\\u0}"}, {"{", "\\{"}, {"}", "\\}"}, // escape to avoid ASS markup conflicts {">", ">"}, {"<", "<"}, - {"‎", ""}, {"‏", ""}, // FIXME: properly honor bidi marks + {"‎", "\xe2\x80\x8e"}, {"‏", "\xe2\x80\x8f"}, {"&", "&"}, {" ", "\\h"}, }; diff --git a/tests/ref/fate/sub-webvtt2 b/tests/ref/fate/sub-webvtt2 index 90f78d904b..2925d892a0 100644 --- a/tests/ref/fate/sub-webvtt2 +++ b/tests/ref/fate/sub-webvtt2 @@ -21,6 +21,6 @@ Dialogue: 0,0:00:12.50,0:00:32.50,Default,,0,0,0,,OK, let’s go. Dialogue: 0,0:00:38.00,0:00:43.00,Default,,0,0,0,,I want to 愛あい love you\NThat's not proper English! Dialogue: 0,0:00:43.00,0:00:46.00,Default,,0,0,0,,{\i1}キツネ{\i0}じゃない　キツネじゃない\N乙女おとめは Dialogue: 0,0:00:50.00,0:00:55.00,Default,,0,0,0,,Some time ago in a rather distant place.... -Dialogue: 0,0:00:55.00,0:01:00.00,Default,,0,0,0,,Descending: 123456\NAscending: 123456 +Dialogue: 0,0:00:55.00,0:01:00.00,Default,,0,0,0,,Descending: ‏123456‎\NAscending: 123456 Dialogue: 0,0:01:00.00,0:01:05.00,Default,,0,0,0,,>> Never gonna give you up Never gonna let you down\NNever\hgonna\hrun\haround & desert\hyou Dialogue: 0,0:55:00.00,1:00:00.00,Default,,0,0,0,,Transcrit par Célestes™