diff mbox series

[FFmpeg-devel,v4,3/3] lavc/libaribcaption.c: rename `-replace_fullwidth_ascii` option

Message ID 20231017131335.201277-4-aimingoff@pc.nifty.jp
State New
Headers show
Series lavc/libaribcaption.c: add MSZ characters related options | expand

Checks

Context Check Description
yinshiyou/make_loongarch64 success Make finished
yinshiyou/make_fate_loongarch64 success Make fate finished
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished

Commit Message

TADANO Tokumei Oct. 17, 2023, 1:13 p.m. UTC 
This patch renames `-replace_fullwidth_ascii` option to
`-replace_msz_ascii` to clarify option meaning.

Signed-off-by: TADANO Tokumei <aimingoff@pc.nifty.jp>
---
 doc/decoders.texi           | 12 ++++++------
 libavcodec/libaribcaption.c |  8 ++++----
 2 files changed, 10 insertions(+), 10 deletions(-)

Comments

Jan Ekström Oct. 29, 2023, 8:53 a.m. UTC | #1 
On Tue, Oct 17, 2023 at 4:14 PM TADANO Tokumei <aimingoff@pc.nifty.jp> wrote:
>
> This patch renames `-replace_fullwidth_ascii` option to
> `-replace_msz_ascii` to clarify option meaning.
>
> Signed-off-by: TADANO Tokumei <aimingoff@pc.nifty.jp>

Asked around and James seemed to be OK with just replacing this option
as this is a "niche" module and since it had not yet been in any
release. Thus LGTM change-wise.

Same things as with the rest of the set, did adjustments to the commit
message. If you're fine with it, I'll pull these in.

Jan
diff mbox series

Patch

diff --git a/doc/decoders.texi b/doc/decoders.texi
index 36c3404475..eb00e2a9e9 100644
--- a/doc/decoders.texi
+++ b/doc/decoders.texi
@@ -427,12 +427,6 @@  If your player cannot handle AVSubtitles with multiple ASS rectangles properly,
 set this option to @var{true} or define @env{ASS_SINGLE_RECT=1} to change
 default behavior at compilation.
 
-@item -replace_fullwidth_ascii @var{boolean}
-Specify whether to replace MSZ (Middle Size, half width) fullwidth
-alphanumerics with halfwidth alphanumerics.
-
-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.
@@ -459,6 +453,12 @@  Specify whether to render replaced DRCS characters as Unicode characters.
 
 The default is @var{true}.
 
+@item -replace_msz_ascii @var{boolean}
+Specify whether to replace MSZ (Middle Size; half width) fullwidth
+alphanumerics with halfwidth alphanumerics.
+
+The default is @var{true}.
+
 @item -replace_msz_japanese @var{boolean}
 Specify whether to replace some MSZ (Middle Size; half width) fullwidth
 japanese special characters with halfwidth ones.
diff --git a/libavcodec/libaribcaption.c b/libavcodec/libaribcaption.c
index 74822586dc..2a058a4992 100644
--- a/libavcodec/libaribcaption.c
+++ b/libavcodec/libaribcaption.c
@@ -70,12 +70,12 @@  typedef struct ARIBCaptionContext {
     int encoding_scheme;
     int ass_single_rect;
     char *font;
-    int replace_fullwidth_ascii;
     int force_stroke_text;
     int ignore_background;
     int ignore_ruby;
     float stroke_width;
     int replace_drcs;
+    int replace_msz_ascii;
     int replace_msz_japanese;
     int replace_msz_glyph;
 
@@ -1006,7 +1006,7 @@  static int aribcaption_init(AVCodecContext *avctx)
         return AVERROR_EXTERNAL;
     }
     aribcc_decoder_set_replace_msz_fullwidth_ascii(ctx->decoder,
-                                                   ctx->replace_fullwidth_ascii);
+                                                   ctx->replace_msz_ascii);
     aribcc_decoder_set_replace_msz_fullwidth_japanese(ctx->decoder,
                                                    ctx->replace_msz_japanese);
 
@@ -1138,8 +1138,6 @@  static const AVOption options[] = {
       OFFSET(ass_single_rect), AV_OPT_TYPE_BOOL, { .i64 = ASS_SINGLE_RECT }, 0, 1, SD },
     { "font", "comma-separated font family [ass, bitmap]",
       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 },
     { "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]",
@@ -1150,6 +1148,8 @@  static const AVOption options[] = {
       OFFSET(stroke_width), AV_OPT_TYPE_FLOAT, { .dbl = 1.5 }, 0.0, 3.0, SD },
     { "replace_drcs", "replace known DRCS [bitmap]",
       OFFSET(replace_drcs), AV_OPT_TYPE_BOOL, { .i64 = 1 }, 0, 1, SD },
+    { "replace_msz_ascii", "replace MSZ fullwidth alphanumerics with halfwidth alphanumerics [ass, bitmap]",
+      OFFSET(replace_msz_ascii), AV_OPT_TYPE_BOOL, { .i64 = 1 }, 0, 1, SD },
     { "replace_msz_japanese", "replace MSZ fullwidth Japanese with halfwidth [ass, bitmap]",
       OFFSET(replace_msz_japanese), AV_OPT_TYPE_BOOL, { .i64 = 1 }, 0, 1, SD },
     { "replace_msz_glyph", "replace MSZ characters with halfwidth glyphs [bitmap]",