From patchwork Mon Feb 12 02:01:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Oneric X-Patchwork-Id: 46217 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9002:b0:19e:cdac:8cce with SMTP id d2csp436264pzc; Sun, 11 Feb 2024 18:02:40 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCUpf9EYxmOSMnvIq8rmG8tMy4rc84UlHodZDNlr1k8keaXl8hnYUnO35RtvrLORhHBqlwqRJweHF6iDKoGDc8ctSsWCyagVJhD1mw== X-Google-Smtp-Source: AGHT+IGVfm23ksRXnXJ3s13SBT0DQI1P2Zq60JTJI3dPPIFEyvwG2MzHHnBhJT9mUK2zvoGU/Kfe X-Received: by 2002:a17:906:bf47:b0:a38:54ab:992b with SMTP id ps7-20020a170906bf4700b00a3854ab992bmr4295051ejb.3.1707703359895; Sun, 11 Feb 2024 18:02:39 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCVRGmrzxKhjKYYKLQ+I5cugjE9Nd4qe23A5YSfaP6b8xfM/bZbLEbaBVCZPNc5Y/t2q3/t5qAimJa2l7p3vczsIR/FtVqF05uGZtpPq3goWpPkeKKSAludcZe1zkYeTpI6hov/JvFj91VBcydstnANPNHIDAniwB9WjkREi7cMUW1znc7218fOB1v7509fj4udeCzBLL7up5fbhXSwRCSKxot+FPjkxC0axwccAnelUYs+NwNyjUrMhfhQnzWhFWFkQ64njsIuUTF79H59/qVCLdA2R90nZV8j+Nm+CB7nMRBMazG/0nUtGt36fQcSNBfo955WPQE65RUH8CVibK1KL4eBR4Wwl71HlCauMUyOkCYIOquNgl1vMQzpDKZNpAVVafEW2c5hA6vzVXs1aSalsKrvWuA+j5+4azr+FpJyy+42kmCghbPOpMiBpQjExLpHbpyb8rGLWV04mRV/6c1ChWWSYIi7mMtZBkYN57W+nfCr4mZZ94A8WtRKCJsKbViEelJ6hQkFyAEiA/SqaA07Y2mOis9qYbJ0jQgZzWPKXujTx5GLJgPpvivp2eFP18/HU5ZWAe0uNTgmcsavliPGDGFNn8TKLcS4Hdu75MRZC6wAWXPnKNfvr1dESXzhgOfzJkVs8ejMTNv+T92wDnu4okDNd98Yjs2Fn79RJTphNLz0956kLJ4MFNH6fl8GrvtGe/rHCbCdhZlVkuGFzIwM0Yn5WIs7mrvHFCajtRXxrxqK8+qnDDg79nyhRzuPEnnUufqcCTrUs8/i/TZxRqeR5MuTzVWCPWn0TffXDouI/aQvU3rP0K1DoZ6PfRFJrdp3zK3Drwf3/hSj6yLvq9K2sNJns/qkFsIFxreRDLPymMelsN56EzqiNbtDeha++69BNbTBGskel67SX9TZBfYZjVdx52soFZ8ffjODLrz9kaAwhh0zx7K5Sgh6dGHsRMNXnKm JF41yj9NlnuSGnkxCpKlic/VGeH1wXakk1MVhxhWUg1dQCUTJq2WUVr11bFvn0zi4wE73EH2QuZGdZBz5XUekyyTi7i2uAGmkGGnipbypYYkON7oP6LRGQ8aqpHCKpXCglYgKr6EduVMNs/s6LvwUYY/4dPkS8fcE/IQfqJ9+QZXqPi2Bqdr/oaC/wp3nPvl9YwDrqUFjQ/iZDMYkHscbI+0xJlL9wa/ccH5BkF6Ai5P38p97eLEsrA2RLXnNv97dqszJD+xoP9UIQA5aFZ7kHYUoYgNpPUbrZwMmNHElRshmF2fEwh4qVMWw1apIdxBMOkJIv7i3p8uJQD0aQM1bMJFrzYdF+XJqlRLJX0t7VZNQV7uq0SwA2qNzta5Fn43phLP1KLm0+1/uf/AkhNenSmvdJ4IC4fASIBCgKz/7RDr1sBUvajZ9gbQlyr5WrfEv1V0SXYPi8POtuQoFAsT6Inb45UiglWF6raxm4Y3wOG7928NSiAUPt7GM0gT5szirjmnCV0yPif+YcusdOqYjWd4IRyx19Gn5an95QVu9h0F7hnE8rbzBw+iTZaViY/rpoI9ZVUFplxy0fbluGMSNdGUcN1uptjg== Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id hz6-20020a1709072ce600b00a3be8889f52si3467770ejc.274.2024.02.11.18.02.39; Sun, 11 Feb 2024 18:02:39 -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=X8o+QUPM; dkim=neutral (no key) header.i=@oneric.de header.s=strato-dkim-0003 header.b=9EWOTvsH; 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 0265E68D145; Mon, 12 Feb 2024 04:02:27 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mo4-p00-ob.smtp.rzone.de (unknown [85.215.255.22]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8B0B168D089 for ; Mon, 12 Feb 2024 04:02:18 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; t=1707703337; cv=none; d=strato.com; s=strato-dkim-0002; b=Gwwigqsl8fawD69o50erXxJuGs62TXq/vuIhg1MLQMfujsKhrBYDEtxKUguWQejrTS QFByixDwSlGc/d/9wEv1d/bFdLrIfdxW7ysndMxW2AwIE8XJvYNhukm2CjbWofMeD2CU wydCOhbSOIPKkO+Y49gI0PbkCm0FVEY+QGjamwhuEsneB8KbMEQ2Z/K/8n0b5whb29JA f34zfqV7xCWxatg8OH3e6aL3AHrSPLrhu42IDXkO81r9mJq6B2WvyrfvgEBtF74UcKKS FDW1Eype4iy7YnC19rksGYq48t9GzVhCLUiPXBj8tZlN1E4Tv1MHiV72ZKlbSmDbKRI9 iYkg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; t=1707703337; 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=eiFQk7F9vLQIe4VT172ZaQf9575VIY55h1IjPKKRxh1yxGQ+wRcUeaqNPmxL/WEi35 Z/xp3lcy7QhXOnqWjfjpbfeuRREPrLEBoyHUzMFQjVqRpkI/GEs0OjSoVJXJv4XaZXFv AwuWMs3HV28sHrA5EZUn+SGbW7qYeeCiq65E+l1ndVeE2sVDWfIi6NMrkI/GsLxa2kX6 7EdopJjqIVPVTre02tu79LUxpdFr+xVkv4mrkwYET8DiasekWFVDKgVAQ9qpwvwMHtgB 9H/1HlPQH5/lU7825nUBb2vKirmD0XJL/cTGCgaY3hcR+ZeXiNHfYRCUD0zwz40G4oPM /0aw== 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=1707703337; 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=X8o+QUPMsKLBgzCtAIrTw0/SoPwZrgtwqS0E+6NJxJojeD/YBdlPTXyuENchJFQLn/ XQa/7T4NFimEwHgKT3xrUC76WsLS10JLqkk6G0C6QjgbwffTzDzorXi3KrCYhB7DDcaQ ncAteTc/2s3q9MG8FpeqSG4uXY3VDo0VHNqsX/s9HX1Ue4WD0Lbs5pClza0+2R0BGWC8 9fOldoGD15uxlqOYIRGlibOyg3D38hzPWIxP3VuSW53fZbNZ19nxFMe5EReGj4iNFClc okDbQ3vPeyDv3ZJqHn1E+t14ZbBNTrTG858PnsNjZVtUChTX5hSEPYmCz9TTIWpVECAa zB4A== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; t=1707703337; 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=9EWOTvsHv5fX+miH3ljZcajM8FBsxRlpKdd2uKJXP9/b+3EqDMkCAnTFeb55dLNf4b GDJNMFXy+54lBZiP9JBA== X-RZG-AUTH: ":I2IBZ0mrW/AWQXwgB4oxKM1YsW1lFUznrLvi/XReWqAAlWwZ8wlvfXmGs4jUQ0oz8ZbhHexs8fhgUyJVddUhvSMyyTdkfRqedioxw5M6" Received: from abhoth.workgroup by smtp.strato.de (RZmta 49.11.2 AUTH) with ESMTPSA id x7ec2e01C22HBx2 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits)) (Client did not present a certificate) for ; Mon, 12 Feb 2024 03:02:17 +0100 (CET) From: Oneric To: ffmpeg-devel@ffmpeg.org Date: Mon, 12 Feb 2024 03:01:56 +0100 Message-Id: <20240212020159.6806-2-oneric@oneric.de> In-Reply-To: <20240212020159.6806-1-oneric@oneric.de> References: <20240212020159.6806-1-oneric@oneric.de> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 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: ifwmyA8zr/Ra --- 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™