From patchwork Thu Jul 20 02:21:47 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: efren yang X-Patchwork-Id: 4375 X-Patchwork-Delegate: root@ffmpeg.org Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.1.76 with SMTP id 73csp1545241vsb; Wed, 19 Jul 2017 19:21:59 -0700 (PDT) X-Received: by 10.28.173.6 with SMTP id w6mr1099127wme.12.1500517319468; Wed, 19 Jul 2017 19:21:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500517319; cv=none; d=google.com; s=arc-20160816; b=0eUBF4CmijVd84kkhKaMuBnU00Dnz+UQ58V3KGW/89N1WpeagbOBnAcD0MXbDE0J4B vyTt6ViFTnW2zx6Ehdu29Wv63BISOTFEV9mGd7CUFJnYl946fU7rz5eghfmVGf09CbLw Tou0bXeVyKFBUbdeUboFiPr1xDM4xvN4hFW1yS/66aQggE3ulUWaVDm6lXqOvG3vkxQG ly8Cqe+UWEIucCuaAKPLfZI8HuJd8i/sTIVHZZoj9+k3VhgoybUkmrNyQL0WdcmGeEC1 V7ALA6Ao3azGyZEGV1GRitHnRgspB48tDLKw2TGE8G2fGEI8teAbbpE1M7qd1JTA7RiX Sr0A== 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:to:from:date :dkim-signature:delivered-to:arc-authentication-results; bh=hG6516uf9HpSqhX397IHh7NGLGnqp5H4mt2dZraiWTY=; b=xNvJYaMuVXweMd8evG9fO3FN/sXdEVgaxN8yyGxJ6MKQs9aPFaGBdgrdlH4tlrz+RV 5tYD2ezYaK6BosRHp/BjNWgtEJ9d53XipSA8t51YzHY92OxNR9DmDcPiBQzOvOdn6yp8 BhqP5Gl/94OU8lX7oSJAnkW1UUmoYobGFrfvlegOMFAVXOPq511K9szQ2zDe7sa4U2cj EO9bdlctoblvk2c4u3Z1qjTiNwOYNB0PUFFaXymKSiGoQDvSSflKpMeOUFfUP5fJ8YcY CiqZCU9u9WSg4jZzCb45xLA3i7vXmh5mslUfxsSfxqI2x0WmhdDPsiZ1vvKwgwuCx7jS Pk1Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@163.com header.b=hR+rgqAS; 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 s30si4088218wrb.115.2017.07.19.19.21.59; Wed, 19 Jul 2017 19:21:59 -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=@163.com header.b=hR+rgqAS; 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 E163B689203; Thu, 20 Jul 2017 05:21:48 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from m12-14.163.com (m12-14.163.com [220.181.12.14]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 92B616883E9 for ; Thu, 20 Jul 2017 05:21:41 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=Date:From:Subject:Message-ID:MIME-Version; bh=6SIOz OqaQNPwMiOj1KORW/pehDQmuu5ogXXOJDwybJE=; b=hR+rgqASQCiWkJkqjN7MD gHv3r/075WwLZ1/cVzSb9NsyxDRKlb6kNECdjgbIUKRhvFZDWCwKvGnuDHkp1veS 1H3apn7WsY8ChK1MLJKiqE+8Kf7uPrJkRZ/xXOFsLOxyqK1xZFN3VDBDhsEJmxnl K8bYql7neGoHw1+hR1DVOw= Received: from YW-A2526-D.local (unknown [101.227.12.253]) by smtp10 (Coremail) with SMTP id DsCowAAHgXy6E3BZV8ftPw--.51314S2; Thu, 20 Jul 2017 10:21:47 +0800 (CST) Date: Thu, 20 Jul 2017 10:21:47 +0800 From: efren yang To: ffmpeg-devel@ffmpeg.org; Message-ID: X-Mailer: TortoiseGit MIME-Version: 1.0 X-CM-TRANSID: DsCowAAHgXy6E3BZV8ftPw--.51314S2 X-Coremail-Antispam: 1Uf129KBjvJXoW7Zr4kKw45XF15tr4fKw18AFb_yoW8CFy8pF 4rWan7Wws7GF1xuas8AF1DX3W5Zw1kWa4kG395Z39rJFn0y3WkZr9IkFy5Cws3Zr4xZ343 ZFWY9FsrGwnxt3DanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jGyxiUUUUU= X-Originating-IP: [101.227.12.253] X-CM-SenderInfo: phiuv0xb1d0wi6rwjhhfrp/xtbBbBsbF1c6+zNVTQAAsG Subject: [FFmpeg-devel] [PATCH] vf_drawtext: support to set word spacing while drawing text. ./ffmpeg -i input -vf drawtext="word_spacing=10:textfile=1.txt:fontfile=demo.ttf" -f flv 1.flv could set word spacing 10 pixel. X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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: , efren_yang@163.com Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: efren yang --- libavfilter/vf_drawtext.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavfilter/vf_drawtext.c b/libavfilter/vf_drawtext.c index f6151443bb..137ae5891e 100644 --- a/libavfilter/vf_drawtext.c +++ b/libavfilter/vf_drawtext.c @@ -162,6 +162,7 @@ typedef struct DrawTextContext { unsigned int default_fontsize; ///< default font size to use int line_spacing; ///< lines spacing in pixels + int word_spacing; ///< word spacing in pixels short int draw_box; ///< draw box around text - true or false int boxborderw; ///< box border width int use_kerning; ///< font kerning is used - true/false @@ -214,6 +215,7 @@ static const AVOption drawtext_options[]= { {"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}, {"line_spacing", "set line spacing in pixels", OFFSET(line_spacing), AV_OPT_TYPE_INT, {.i64=0}, INT_MIN, INT_MAX,FLAGS}, + {"word_spacing", "set word spacing in pixels", OFFSET(word_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}, CHAR_MIN, CHAR_MAX , FLAGS}, {"x", "set x expression", OFFSET(x_expr), AV_OPT_TYPE_STRING, {.str="0"}, CHAR_MIN, CHAR_MAX, FLAGS}, {"y", "set y expression", OFFSET(y_expr), AV_OPT_TYPE_STRING, {.str="0"}, CHAR_MIN, CHAR_MAX, FLAGS}, @@ -1374,6 +1376,7 @@ static int draw_text(AVFilterContext *ctx, AVFrame *frame, s->positions[i].y = y - glyph->bitmap_top + y_max; if (code == '\t') x = (x / s->tabsize + 1)*s->tabsize; else x += glyph->advance; + x += s->word_spacing; } max_text_line_w = FFMAX(x, max_text_line_w);