[FFmpeg-cvslog] avcodec/webvttdec: honour bidi marks

Oneric git at videolan.org
Sat Apr 6 10:56:18 EEST 2024


ffmpeg | branch: master | Oneric <oneric at oneric.de> | Mon Feb 19 22:42:24 2024 +0100| [7b8b4cdd9654ead881bc61a0b62e1586b473f843] | committer: Stefano Sabatini

avcodec/webvttdec: honour bidi marks

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7b8b4cdd9654ead881bc61a0b62e1586b473f843
---

 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 {
     {"<u>", "{\\u1}"}, {"</u>", "{\\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™



More information about the ffmpeg-cvslog mailing list