From patchwork Sat Sep 23 02:00:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: TADANO Tokumei X-Patchwork-Id: 43876 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:38a7:b0:15d:8365:d4b8 with SMTP id n39csp1188617pzf; Fri, 22 Sep 2023 19:00:55 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHo9nVfsoqEML/09pKZ9f2uxKE5rqhhfNN2nMLgl+LzcKwshPPwXwCWlU4aequaWSftaCHW X-Received: by 2002:a17:907:62a6:b0:9a9:fa4a:5a4e with SMTP id nd38-20020a17090762a600b009a9fa4a5a4emr5499203ejc.13.1695434454836; Fri, 22 Sep 2023 19:00:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695434454; cv=none; d=google.com; s=arc-20160816; b=P7t2LNRznY6zQZ1ZdRyQQriFYA3chejtRUmIi0ZpJE9erdvat5ahExVHs6ouQ+Ua+V Nu5VcYr6LvfD2qz0xaRmG1XtskMxO7PlBXdv4xRuJJcTvxp3aiLFsLG68gIpihC1xi5U T2YhIZw29ccxmC0K/XZrDM31iP23Rco6d4Iah3KEDeQDD+N7j3+qWe9CXMaN8A0fqww1 xrc8Q5UOMxj4zNl+IL9rgK1NIjwq9ixrIRrVF9XvKjehSKu54Z0EnU1b5N5La+9zXzap AK0TVsQ7wnaIa1+9r8qoLTl4pZfjOxhX80mpUmLpmDXwpUrDzHp3s9cY8Dpk+1r+VFBt +QdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:date:to:from :delivered-to; bh=L041YMPsb3MAkPgS6g2AGlLoV52yzCWhSvl75pgNIm4=; fh=ssXC39eKeah6YcPRlt8jBK+nQIpHohGaLsoJm2kZFpQ=; b=s+JHnDSuXy0AKz/L+2IepocAnW1qNdM+dYTtIO0/JCHIIfLtfQBJN/bQURCkKVenT/ gfhWfKGg33e7SGe71NqQ9KWnC3/HlSrXgMUlfIqYeiIdmMvuqJjQlGeuOjypRVF74TDR gC511uNwdeKB3/SsFru6Ta4fNpl1waY9DikW5L0VsSfIaaOJRniNnLRKJ9U9xrPJPgpI TAq/Bt9EZl/PdV8vOeMMqogirkT7vEIIEwoAttkP6J9ozwYrLO9KSqjSg3JAn+MDLzKz H3XqiQSN5dWm5VD5xDRaBA9aWR0IRBh77pznZvMCmCzPQDRt6zpf8SvD0954OBk5N7Sj s5Bw== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id bf25-20020a0564021a5900b00533392321b1si4215661edb.440.2023.09.22.19.00.54; Fri, 22 Sep 2023 19:00:54 -0700 (PDT) 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; 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 6D54168C807; Sat, 23 Sep 2023 05:00:50 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from dmta1006.nifty.com (mta-snd01010.nifty.com [106.153.227.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 990C968C807 for ; Sat, 23 Sep 2023 05:00:40 +0300 (EEST) Received: from osamu-pc.kimura.local by dmta1006.nifty.com with ESMTP id <20230923020036339.RXRI.58378.osamu-pc.kimura.local@nifty.com>; Sat, 23 Sep 2023 11:00:36 +0900 From: TADANO Tokumei To: ffmpeg-devel@ffmpeg.org Date: Sat, 23 Sep 2023 11:00:23 +0900 Message-Id: <20230923020023.9288-1-aimingoff@pc.nifty.jp> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2] lavc/libaribcaption.c: add MSZ characters related options 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 Cc: TADANO Tokumei Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: egIKzLP3byTM This patch add MSZ (Middle Size; half width) characters related options. * add `-replace_msz_japanese` option introduced in version 1.0.1 of libaribcaption. * add `-replace_msz_glyph` option introduced in version 1.1.0 of libaribcaption. * rename `-replace_fullwidth_ascii` option to `-replace_msz_ascii` to clarify option meaning. * FIX: change all the `bool` option variables in `ARIBCaptionContext` to `int`. On some environments, a `bool` variable is small space than `int`. If a `bool` option was specified by command line, following variables would be filled and destroyed. --- doc/decoders.texi | 28 ++++++++++++++++++++------ libavcodec/libaribcaption.c | 40 ++++++++++++++++++++++++++++--------- 2 files changed, 53 insertions(+), 15 deletions(-) diff --git a/doc/decoders.texi b/doc/decoders.texi index 09b8314dd2..27b981b267 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,28 @@ 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. + +The default is @var{true}. + +@item -replace_msz_glyph @var{boolean} +Specify whether to replace MSZ (Middle Size, half width) characters +with halfwidth glyphs if the fonts supports it. +This option works under FreeType or DirectWrite renderer +with Adobe-Japan1 compliant fonts. +e.g., IBM Plex Sans JP, Morisawa BIZ UDGothic, Morisawa BIZ UDMincho, +Yu Gothic, Yu Mincho, and Meiryo. + +The default is @var{true}. + @item -canvas_size @var{image_size} Specify the resolution of the canvas to render subtitles to; usually, this should be frame size of input video. diff --git a/libavcodec/libaribcaption.c b/libavcodec/libaribcaption.c index 8a8c8f8cfd..ddff47633a 100644 --- a/libavcodec/libaribcaption.c +++ b/libavcodec/libaribcaption.c @@ -68,14 +68,20 @@ typedef struct ARIBCaptionContext { int subtitle_type; int encoding_scheme; - bool ass_single_rect; + int ass_single_rect; char *font; - bool replace_fullwidth_ascii; - bool force_stroke_text; - bool ignore_background; - bool ignore_ruby; + int force_stroke_text; + int ignore_background; + int ignore_ruby; float stroke_width; - bool replace_drcs; + int replace_drcs; + int replace_msz_ascii; +#if defined(ARIBCC_VERSION) + int replace_msz_japanese; +# if AV_VERSION_INT(ARIBCC_VERSION_MAJOR, ARIBCC_VERSION_MINOR, ARIBCC_VERSION_PATCH) >= AV_VERSION_INT(1, 1, 0) + int replace_msz_glyph; +# endif +#endif int64_t pts; AVRational time_base; @@ -1004,7 +1010,11 @@ 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); +#if defined(ARIBCC_VERSION) + aribcc_decoder_set_replace_msz_fullwidth_japanese(ctx->decoder, + ctx->replace_msz_japanese); +#endif /* Similar behavior as ffmpeg tool to set canvas size */ if (ctx->canvas_width > 0 && ctx->canvas_height > 0 && @@ -1057,6 +1067,10 @@ static int aribcaption_init(AVCodecContext *avctx) aribcc_renderer_set_force_no_background(ctx->renderer, ctx->ignore_background); aribcc_renderer_set_force_no_ruby(ctx->renderer, ctx->ignore_ruby); aribcc_renderer_set_stroke_width(ctx->renderer, ctx->stroke_width); +#if defined(ARIBCC_VERSION) && AV_VERSION_INT(ARIBCC_VERSION_MAJOR, ARIBCC_VERSION_MINOR, ARIBCC_VERSION_PATCH) >= AV_VERSION_INT(1, 1, 0) + aribcc_renderer_set_replace_msz_halfwidth_glyph(ctx->renderer, + ctx->replace_msz_glyph); +#endif if (ctx->font) { int is_nomem = 0; size_t count = 0; @@ -1132,8 +1146,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]", @@ -1144,6 +1156,16 @@ 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 }, +#if defined(ARIBCC_VERSION) + { "replace_msz_japanese", "replace MSZ fullwidth Japanese with halfwidth [ass, bitmap]", + OFFSET(replace_msz_japanese), AV_OPT_TYPE_BOOL, { .i64 = 1 }, 0, 1, SD }, +# if AV_VERSION_INT(ARIBCC_VERSION_MAJOR, ARIBCC_VERSION_MINOR, ARIBCC_VERSION_PATCH) >= AV_VERSION_INT(1, 1, 0) + { "replace_msz_glyph", "replace MSZ characters with halfwidth glyphs [bitmap]", + OFFSET(replace_msz_glyph), AV_OPT_TYPE_BOOL, { .i64 = 1 }, 0, 1, SD }, +# endif +#endif {"canvas_size", "set input video size (WxH or abbreviation) [bitmap]", OFFSET(canvas_width), AV_OPT_TYPE_IMAGE_SIZE, { .str = NULL }, 0, INT_MAX, SD }, { NULL }