From patchwork Thu Jul 20 09:46:25 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: efren yang X-Patchwork-Id: 4382 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.1.76 with SMTP id 73csp1915225vsb; Thu, 20 Jul 2017 02:46:40 -0700 (PDT) X-Received: by 10.223.150.54 with SMTP id b51mr6536580wra.185.1500544000371; Thu, 20 Jul 2017 02:46:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500544000; cv=none; d=google.com; s=arc-20160816; b=v8kCqjVhV71eLMiJzN0hUrvxabAwxHAwwhhuCLVhUs8ZznY/qrd6o1OVeyQj/HtgL3 dxCw+2eoFTe7l6+hPWshf8ghdAsbpcdWCmW4lzRvHS778eozEXQzWN2f7M3HCXfJsCeQ vcvkSYGEuw66/cd+3rzTabkykSy4LDdTlI+dsfSTub2Z540MP4ImeQZusSO38DMfxETm xIFjv3N1jC0PysTgNt10+jWCg9wPm1axgwxjar+1VPJ4FmVszj0/nWJFJcdmG1hPX9+0 Eu8f0u1nQ2F1+ItuLh/1Hm51MbeW3MZBBizmzZTOr21uGoIdK2fR2VBdL4BV8Xpx5Rsq SC9w== 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=gHQa374f76p9vClCltrfFixtJ3d7jnPoUQ9jBfUWQXo=; b=df8+YyL1OIvlrJGlvHqT1FyDe7fyASuRDrmBwp/XBCbzAX9PEhIYCDyvzIjMI08aUq wtH75PcykLdg5KT+EV1TN3GW216bfzdS6sj8e3tCP2cQOp0EKBALHxcft72UcjxvVUrX sDYlJJzqU62PQuheRxu72nH/YMYtQLH/c41Oaao07INcJWwrZPqdEOhhnkG+adw1BaaT GpjlemCG4l2jbpCn/6tKKNobO+aO+rtcms/xikEQY3i4M31nTjuREVh20WmZHipETMT1 viuHvP81GhlcWJKq22wyS/f4i8G0ZTirDrb289mzZh2tmZ8xJr9PdiKIiyzdWGaVYcmG 2T5A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@163.com header.b=fwmZpI+v; 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 63si5696075wrr.46.2017.07.20.02.46.39; Thu, 20 Jul 2017 02:46:40 -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=fwmZpI+v; 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 8E0C0687ED5; Thu, 20 Jul 2017 12:46:28 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from m12-16.163.com (m12-16.163.com [220.181.12.16]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CE7DD680875 for ; Thu, 20 Jul 2017 12:46:20 +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=pxkGl ogehx2zLZSo59B1qcE8+97abM3Xh4kJFDYYoD8=; b=fwmZpI+v/2k4QJy1cDuMh VFCKAvA3bJfvaMU3nwuhPlFWjWpNn4erKc6nitMbXdf+cafxdIKWzCsEj5BhFT/s XZRhduKO+XjOOplRrO/GkKJNuCEcta5EqpV9vx/D7Dy+kQ3LIBvhyS6pJw25Yjwo 802tOhoTXlAZ/L2m2hlY20= Received: from YW-A2526-D.local (unknown [101.227.12.253]) by smtp12 (Coremail) with SMTP id EMCowAD3fwPwe3BZBVkcNQ--.46748S2; Thu, 20 Jul 2017 17:46:24 +0800 (CST) Date: Thu, 20 Jul 2017 17:46:25 +0800 From: efren yang To: ffmpeg-devel@ffmpeg.org; Message-ID: <93845222-e997-4977-b57b-6964b29ca6dd@YW-A2526-D.local> X-Mailer: TortoiseGit MIME-Version: 1.0 X-CM-TRANSID: EMCowAD3fwPwe3BZBVkcNQ--.46748S2 X-Coremail-Antispam: 1Uf129KBjvJXoW7ZryUKFyktryrGrW3KFWfKrg_yoW8uF4xpF 4rWan7Xws5GF1xuas5AF1DJ3W5uw1xXa4kK395Z3y7JF10y3Z5XFnIkFy5Grn3Zrs7Z3y5 ZFWF9F47K3sIy3DanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jl-e5UUUUU= X-Originating-IP: [101.227.12.253] X-CM-SenderInfo: phiuv0xb1d0wi6rwjhhfrp/xtbBohEbF1aDtP6pEgAAsb Subject: [FFmpeg-devel] [PATCH] vf_drawtext: support to set glyph spacing while drawing text. ./ffmpeg -i input -vf drawtext="glyph_spacing=10:textfile=1.txt:fontfile=demo.ttf" -f flv 1.flv could set glyph 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 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavfilter/vf_drawtext.c b/libavfilter/vf_drawtext.c index 137ae5891e..ceeee96c5a 100644 --- a/libavfilter/vf_drawtext.c +++ b/libavfilter/vf_drawtext.c @@ -162,7 +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 + int glyph_spacing; ///< glyph 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 @@ -215,7 +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 }, + {"glyph_spacing", "set glyph spacing in pixels", OFFSET(glyph_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}, @@ -1376,7 +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; + x += s->glyph_spacing; } max_text_line_w = FFMAX(x, max_text_line_w);