diff mbox series

[FFmpeg-devel] lavc/libaribcaption.c: add -replace_fullwidth_japanese option

Message ID 20230908130050.85688-1-aimingoff@pc.nifty.jp
State New
Headers show
Series [FFmpeg-devel] lavc/libaribcaption.c: add -replace_fullwidth_japanese option | expand

Checks

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

Commit Message

TADANO Tokumei Sept. 8, 2023, 1 p.m. UTC 
This patch add `-replace_fullwidth_japanese` option
introduced in latest (1.0.1) libaribcaption.
---
 doc/decoders.texi           |  6 ++++++
 libavcodec/libaribcaption.c | 11 +++++++++++
 2 files changed, 17 insertions(+)
diff mbox series

Patch

diff --git a/doc/decoders.texi b/doc/decoders.texi
index 09b8314dd2..ee4cc6121e 100644
--- a/doc/decoders.texi
+++ b/doc/decoders.texi
@@ -433,6 +433,12 @@  alphanumerics with halfwidth alphanumerics.
 
 The default is @var{true}.
 
+@item -replace_fullwidth_japanese @var{boolean}
+Specify whether to replace some MSZ (Middle Size, half width) fullwidth
+japanese special characters with halfwidth ones.
+
+The default is @var{true}.
+
 @item -force_outline_text @var{boolean}
 Specify whether always render outline text for all characters regardless of
 the indication by charactor style.
diff --git a/libavcodec/libaribcaption.c b/libavcodec/libaribcaption.c
index 8a8c8f8cfd..3ec35b9ba1 100644
--- a/libavcodec/libaribcaption.c
+++ b/libavcodec/libaribcaption.c
@@ -71,6 +71,9 @@  typedef struct ARIBCaptionContext {
     bool ass_single_rect;
     char *font;
     bool replace_fullwidth_ascii;
+#if defined(ARIBCC_VERSION)
+    bool replace_fullwidth_japanese;
+#endif
     bool force_stroke_text;
     bool ignore_background;
     bool ignore_ruby;
@@ -1005,6 +1008,10 @@  static int aribcaption_init(AVCodecContext *avctx)
     }
     aribcc_decoder_set_replace_msz_fullwidth_ascii(ctx->decoder,
                                                    ctx->replace_fullwidth_ascii);
+#if defined(ARIBCC_VERSION)
+    aribcc_decoder_set_replace_msz_fullwidth_japanese(ctx->decoder,
+                                                   ctx->replace_fullwidth_japanese);
+#endif
 
     /* Similar behavior as ffmpeg tool to set canvas size */
     if (ctx->canvas_width > 0 && ctx->canvas_height > 0 &&
@@ -1134,6 +1141,10 @@  static const AVOption options[] = {
       OFFSET(font), AV_OPT_TYPE_STRING, { .str = NULL }, 0, 0, SD },
     { "replace_fullwidth_ascii", "replace MSZ fullwidth alphanumerics with halfwidth alphanumerics [ass, bitmap]",
       OFFSET(replace_fullwidth_ascii), AV_OPT_TYPE_BOOL, { .i64 = 1 }, 0, 1, SD },
+#if defined(ARIBCC_VERSION)
+    { "replace_fullwidth_japanese", "replace MSZ fullwidth Japanese with halfwidth [ass, bitmap]",
+      OFFSET(replace_fullwidth_japanese), AV_OPT_TYPE_BOOL, { .i64 = 1 }, 0, 1, SD },
+#endif
     { "force_outline_text", "always render characters with outline [(ass), bitmap]",
       OFFSET(force_stroke_text), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, SD },
     { "ignore_background", "ignore rendering caption background [(ass), bitmap]",