From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 34AA945A1F for ; Fri, 8 Sep 2023 13:02:03 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 053AA68C808; Fri, 8 Sep 2023 16:02:00 +0300 (EEST) Received: from dmta1006.nifty.com (mta-snd01001.nifty.com [106.153.227.33]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5FF7A68C49B for ; Fri, 8 Sep 2023 16:01:51 +0300 (EEST) Received: from osamu-pc.kimura.local by dmta1006.nifty.com with ESMTP id <20230908130147056.UBND.19085.osamu-pc.kimura.local@nifty.com>; Fri, 8 Sep 2023 22:01:47 +0900 From: TADANO Tokumei To: ffmpeg-devel@ffmpeg.org Date: Fri, 8 Sep 2023 22:00:50 +0900 Message-Id: <20230908130050.85688-1-aimingoff@pc.nifty.jp> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] lavc/libaribcaption.c: add -replace_fullwidth_japanese option 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: 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 --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]", -- 2.39.2 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".