From patchwork Mon Jun 19 16:33:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Ren X-Patchwork-Id: 42230 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:be15:b0:121:b37c:e101 with SMTP id ge21csp813324pzb; Mon, 19 Jun 2023 09:34:10 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6UtjtzCSsxmqNdgkA8v4r9NFEi2zEvKO8Jh7cicrPePK+jpcC1o6WbVTvoh8Yi21kPTI6P X-Received: by 2002:a50:ee14:0:b0:51a:59d1:fb37 with SMTP id g20-20020a50ee14000000b0051a59d1fb37mr2315193eds.28.1687192449938; Mon, 19 Jun 2023 09:34:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687192449; cv=none; d=google.com; s=arc-20160816; b=sJPzYiioWTzPej6EfDc/BlFNw7bm5S3ij4DOdiByDuR/52QW84TuvtO+ahpxF/4cb+ 6ajJIPYpxpJMpx8X3cW7+MBQ47Os46XCeRvR3rNJknnvv6HoudO/M1MlxhqzHUPy7R8Q ZeuduS8ESaZ12RNCldtix2Tv+G5igBL0gDZPucCj8v4ydCkYF4Vt5uLR5s42x2BScE/l iY/Z0MEVvxWLtTy9QGi0GxqYL6z4Bgjr9hzuGpw9FvFdsq+72u0J76lK/m/s9A8l/PUX jl6nR3k49w0zx5O2WRpy8nh+7J2lWIIjCa0fCLnDQehdexINSBc9qMCv03B7tvvBzswi za+g== 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 :dkim-signature:delivered-to; bh=7cQx9JTfgElDdXgPFWhDwsBFOFODeCAttiVGfcBtO4M=; b=V1oOAsjZb5meixYA88g5f2A2/GqtCP7F3KSxPHYtYj15kVxR+SXxFZZ9X8vb1uakuy EDET5J+VBjrX/EMh/sNnRTcv3Q8hYVGRAEY0I8oVPKIr93nX9ATT/uDyU7Fjur6AXmOS wFsdC9+3OEnk61jEvzksn/NeaByB8WxNYH1JW+Tvx4F3tGLXihCvQHY3/rqZivr3mqxZ GNi9CbrikSnrRTGVl87r9p8FIyR5em7lBlrvjyr9AP0/p28c31roQWgY+9m1q6CN49Pq iZpeTCbRLs3YV8WV+F59RxZK4vaMgV0RZNhS7YFvGwGeoyIH/UZlUfaHROpeu2QKHyrV 3/LA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=kDv5b2IG; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id c11-20020aa7c74b000000b0051a20be5886si5743345eds.114.2023.06.19.09.34.09; Mon, 19 Jun 2023 09:34:09 -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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=kDv5b2IG; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4B90168BC18; Mon, 19 Jun 2023 19:34:06 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f172.google.com (mail-qk1-f172.google.com [209.85.222.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 79D7F68BEEA for ; Mon, 19 Jun 2023 19:33:59 +0300 (EEST) Received: by mail-qk1-f172.google.com with SMTP id af79cd13be357-7576b53e75eso45293585a.1 for ; Mon, 19 Jun 2023 09:33:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687192437; x=1689784437; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=CTDU2VVEwugVOxOWdDlvX32zb/0hy5fnoQf4DbCvYSE=; b=kDv5b2IGou3SC5NC5zJt3hdKfyMgAwXwkVeTT6MlyRz6iUH6DHgGvvlUdE+CmmyxgH g8htayKLG82YfWwM6fiJu/PvoGfNyo42ajzRiCcxG7QkC7qcIeGXn7CYfxeNGsFOc5Id JD6mWn/39AgEoocwWnp8zu6i4PljRRKlJLlxtWt6ChT9WGWrI37E1yqSYEU7Nd+vHUSG D6E81ptHf22bKwrGa/2ZkkXrSXWf2FhCZhom+EIeeKGks8DwdCfgu1yRT+J5jdEXZwg0 4Zq9VFEj6beRBu1i25rE1kzUDcBCLyiJQpuCqD1L0Jr5KcH0MxZYToT8zqUBSwcpWP8h /VFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687192437; x=1689784437; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=CTDU2VVEwugVOxOWdDlvX32zb/0hy5fnoQf4DbCvYSE=; b=MF3RzJ6DxlMoJqT5LcI8IFevo//E/KnfRlja3xY0H0CD9zCcCu5LkfyjXSZf0iBG3f nSE/y0roLARq/AsWFTw9ld5YTfRKtQcAHszYqpsXqxiXAwu+501TCYCROyqrc72GnFvL fyQqdF5w3eFUq/1BbLH53p9ySZATJioYfHLCu8iDIdwQW3ArGWV39OnHi6Y3kNO19+fu 0Y8TLGevSgxmKGUFhGlHHOTM9TrBWXRRsmo/Lcee9hC+pfTIpGmrtewph0zKiPNPAfI0 nSvVnLqv11PqCeFd9xlLSfeY6tPd34Kh+NSf8ozi+EYe48OHNqV7rrNZQeCrM8p4GC6p QC8Q== X-Gm-Message-State: AC+VfDzpqQi0rHzPD1XJXb2HMmMGsZ+2RZfkMnrW6gM62pc2VfadZgHq kfQGO1EduWeAk4vHrVPcWPW6q9p0Gug= X-Received: by 2002:a05:6214:4111:b0:62a:cc88:1d44 with SMTP id kc17-20020a056214411100b0062acc881d44mr12593744qvb.4.1687192437573; Mon, 19 Jun 2023 09:33:57 -0700 (PDT) Received: from localhost.localdomain (c-24-62-178-10.hsd1.ma.comcast.net. [24.62.178.10]) by smtp.gmail.com with ESMTPSA id z20-20020a0cf254000000b00626320deb0csm107916qvl.101.2023.06.19.09.33.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Jun 2023 09:33:57 -0700 (PDT) From: Mark Ren To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Jun 2023 12:33:47 -0400 Message-Id: <20230619163347.1317-1-mark.ren77@gmail.com> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] libavfilter/vf_drawtext: add letter_spacing as an evaluated parameter 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: Mark Ren Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: QhFWqNWfcSeq When enabled it will add pixels (or subtract if given a negative value) between each letters, set use_kerning to false, and add the pixels to text_w. Signed-off-by: Mark Ren --- libavfilter/vf_drawtext.c | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/libavfilter/vf_drawtext.c b/libavfilter/vf_drawtext.c index 71ab851462..ec8313820d 100644 --- a/libavfilter/vf_drawtext.c +++ b/libavfilter/vf_drawtext.c @@ -183,6 +183,7 @@ typedef struct DrawTextContext { unsigned int fontsize; ///< font size to use unsigned int default_fontsize; ///< default font size to use + int letter_spacing; ///< letter spacing in pixels int line_spacing; ///< lines spacing in pixels short int draw_box; ///< draw box around text - true or false int boxborderw; ///< box border width @@ -208,6 +209,8 @@ typedef struct DrawTextContext { char *a_expr; AVExpr *a_pexpr; int alpha; + char* letter_spacing_expr; ///< expression for letter spacing + AVExpr* letter_spacing_pexpr; ///< parsed expression for letter spacing AVLFG prng; ///< random char *tc_opt_string; ///< specified timecode option string AVRational tc_rate; ///< frame rate for timecode @@ -237,6 +240,7 @@ static const AVOption drawtext_options[]= { {"shadowcolor", "set shadow color", OFFSET(shadowcolor.rgba), AV_OPT_TYPE_COLOR, {.str="black"}, 0, 0, FLAGS}, {"box", "set box", OFFSET(draw_box), AV_OPT_TYPE_BOOL, {.i64=0}, 0, 1 , FLAGS}, {"boxborderw", "set box border width", OFFSET(boxborderw), AV_OPT_TYPE_INT, {.i64=0}, INT_MIN, INT_MAX , FLAGS}, + {"letter_spacing", "set letter spacing in pixels", OFFSET(letter_spacing_expr), AV_OPT_TYPE_STRING, {.str="0"}, 0, 0, FLAGS}, {"line_spacing", "set line spacing in pixels", OFFSET(line_spacing), AV_OPT_TYPE_INT, {.i64=0}, INT_MIN, INT_MAX,FLAGS}, {"fontsize", "set font size", OFFSET(fontsize_expr), AV_OPT_TYPE_STRING, {.str=NULL}, 0, 0 , FLAGS}, {"x", "set x expression", OFFSET(x_expr), AV_OPT_TYPE_STRING, {.str="0"}, 0, 0, FLAGS}, @@ -812,7 +816,7 @@ static av_cold int init(AVFilterContext *ctx) FT_STROKER_LINEJOIN_ROUND, 0); } - s->use_kerning = FT_HAS_KERNING(s->face); + s->use_kerning = FT_HAS_KERNING(s->face) && !s->letter_spacing; /* load the fallback glyph with code 0 */ load_glyph(ctx, NULL, 0); @@ -857,8 +861,9 @@ static av_cold void uninit(AVFilterContext *ctx) av_expr_free(s->y_pexpr); av_expr_free(s->a_pexpr); av_expr_free(s->fontsize_pexpr); + av_expr_free(s->letter_spacing_pexpr); - s->x_pexpr = s->y_pexpr = s->a_pexpr = s->fontsize_pexpr = NULL; + s->x_pexpr = s->y_pexpr = s->a_pexpr = s->fontsize_pexpr = s->letter_spacing_pexpr = NULL; av_freep(&s->positions); s->nb_positions = 0; @@ -903,13 +908,16 @@ static int config_input(AVFilterLink *inlink) av_expr_free(s->x_pexpr); av_expr_free(s->y_pexpr); av_expr_free(s->a_pexpr); - s->x_pexpr = s->y_pexpr = s->a_pexpr = NULL; + av_expr_free(s->letter_spacing_pexpr); + s->x_pexpr = s->y_pexpr = s->a_pexpr = s->letter_spacing_pexpr = NULL; if ((ret = av_expr_parse(&s->x_pexpr, expr = s->x_expr, var_names, NULL, NULL, fun2_names, fun2, 0, ctx)) < 0 || (ret = av_expr_parse(&s->y_pexpr, expr = s->y_expr, var_names, NULL, NULL, fun2_names, fun2, 0, ctx)) < 0 || (ret = av_expr_parse(&s->a_pexpr, expr = s->a_expr, var_names, + NULL, NULL, fun2_names, fun2, 0, ctx)) < 0 || + (ret = av_expr_parse(&s->letter_spacing_pexpr, expr = s->letter_spacing_expr, var_names, NULL, NULL, fun2_names, fun2, 0, ctx)) < 0) { av_log(ctx, AV_LOG_ERROR, "Failed to parse expression: %s \n", expr); return AVERROR(EINVAL); @@ -1525,6 +1533,9 @@ continue_on_invalid2: dummy.fontsize = s->fontsize; glyph = av_tree_find(s->glyphs, &dummy, glyph_cmp, NULL); + /* letter spacing */ + x += s->letter_spacing; + /* kerning */ if (s->use_kerning && prev_glyph && glyph->code) { FT_Get_Kerning(s->face, prev_glyph->code, glyph->code, @@ -1539,7 +1550,12 @@ continue_on_invalid2: else x += glyph->advance; } - max_text_line_w = FFMAX(x, max_text_line_w); + s->letter_spacing = av_expr_eval(s->letter_spacing_pexpr, s->var_values, &s->prng); + if (s->letter_spacing < 0) { + max_text_line_w = x+ s->letter_spacing; + } else { + max_text_line_w = FFMAX(x, max_text_line_w) + s->letter_spacing; + } s->var_values[VAR_TW] = s->var_values[VAR_TEXT_W] = max_text_line_w; s->var_values[VAR_TH] = s->var_values[VAR_TEXT_H] = y + s->max_glyph_h;