diff mbox series

[FFmpeg-devel,v4] avfilter/vf_subtitles: add wrap_unicode option

Message ID tencent_8CA2A63B909D26FBA7F0AA99D3061C4A4B06@qq.com
State Accepted
Commit 43ace8f2bc29faf335e31b9893e6b8928ba3f541
Headers show
Series [FFmpeg-devel,v4] avfilter/vf_subtitles: add wrap_unicode option | expand

Checks

Context Check Description
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished

Commit Message

Zhao Zhili May 23, 2023, 5:22 a.m. UTC 
From: Zhao Zhili <zhilizhao@tencent.com>

So CJK can be wrapped automatically.

Signed-off-by: Zhao Zhili <zhilizhao@tencent.com>
---
v4: add doc

 doc/filters.texi           |  7 +++++++
 libavfilter/version.h      |  2 +-
 libavfilter/vf_subtitles.c | 18 ++++++++++++++++++
 3 files changed, 26 insertions(+), 1 deletion(-)
diff mbox series

Patch

diff --git a/doc/filters.texi b/doc/filters.texi
index 76d9f11edc..6c5b61d763 100644
--- a/doc/filters.texi
+++ b/doc/filters.texi
@@ -22440,6 +22440,13 @@  Set subtitles stream index. @code{subtitles} filter only.
 @item force_style
 Override default style or script info parameters of the subtitles. It accepts a
 string containing ASS style format @code{KEY=VALUE} couples separated by ",".
+
+@item wrap_unicode
+Break lines according to the Unicode Line Breaking Algorithm. Only available
+since libass version 0x01600010, and whether it's usable depends on the built
+of libass.
+
+The option is enabled by default except for native ASS.
 @end table
 
 If the first key is not specified, it is assumed that the first value
diff --git a/libavfilter/version.h b/libavfilter/version.h
index ba8a6fdab2..08779130f5 100644
--- a/libavfilter/version.h
+++ b/libavfilter/version.h
@@ -32,7 +32,7 @@ 
 #include "version_major.h"
 
 #define LIBAVFILTER_VERSION_MINOR   8
-#define LIBAVFILTER_VERSION_MICRO 100
+#define LIBAVFILTER_VERSION_MICRO 101
 
 
 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \
diff --git a/libavfilter/vf_subtitles.c b/libavfilter/vf_subtitles.c
index 82e140e986..3e5a19e715 100644
--- a/libavfilter/vf_subtitles.c
+++ b/libavfilter/vf_subtitles.c
@@ -45,6 +45,8 @@ 
 #include "formats.h"
 #include "video.h"
 
+#define FF_ASS_FEATURE_WRAP_UNICODE     (LIBASS_VERSION >= 0x01600010)
+
 typedef struct AssContext {
     const AVClass *class;
     ASS_Library  *library;
@@ -61,6 +63,7 @@  typedef struct AssContext {
     int original_w, original_h;
     int shaping;
     FFDrawContext draw;
+    int wrap_unicode;
 } AssContext;
 
 #define OFFSET(x) offsetof(AssContext, x)
@@ -271,6 +274,9 @@  static const AVOption subtitles_options[] = {
     {"stream_index", "set stream index",             OFFSET(stream_index), AV_OPT_TYPE_INT,    { .i64 = -1 }, -1,       INT_MAX,  FLAGS},
     {"si",           "set stream index",             OFFSET(stream_index), AV_OPT_TYPE_INT,    { .i64 = -1 }, -1,       INT_MAX,  FLAGS},
     {"force_style",  "force subtitle style",         OFFSET(force_style),  AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, FLAGS},
+#if FF_ASS_FEATURE_WRAP_UNICODE
+    {"wrap_unicode", "break lines according to the Unicode Line Breaking Algorithm", OFFSET(wrap_unicode), AV_OPT_TYPE_BOOL, { .i64 = -1 }, -1, 1, FLAGS },
+#endif
     {NULL},
 };
 
@@ -432,6 +438,18 @@  static av_cold int init_subtitles(AVFilterContext *ctx)
     if (ret < 0)
         goto end;
 
+#if FF_ASS_FEATURE_WRAP_UNICODE
+    /* Don't overwrite wrap automatically for native ASS */
+    if (ass->wrap_unicode == -1)
+        ass->wrap_unicode = st->codecpar->codec_id != AV_CODEC_ID_ASS;
+    if (ass->wrap_unicode) {
+        ret = ass_track_set_feature(ass->track, ASS_FEATURE_WRAP_UNICODE, 1);
+        if (ret < 0)
+            av_log(ctx, AV_LOG_WARNING,
+                   "libass wasn't built with ASS_FEATURE_WRAP_UNICODE support\n");
+    }
+#endif
+
     if (ass->force_style) {
         char **list = NULL;
         char *temp = NULL;