From patchwork Tue Jan 17 22:24:59 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Steven X-Patchwork-Id: 2236 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.89.21 with SMTP id n21csp737783vsb; Tue, 17 Jan 2017 14:27:11 -0800 (PST) X-Received: by 10.223.177.202 with SMTP id r10mr7929196wra.94.1484692030967; Tue, 17 Jan 2017 14:27:10 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 54si22085406wrz.258.2017.01.17.14.27.10; Tue, 17 Jan 2017 14:27:10 -0800 (PST) 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 99B4B68A278; Wed, 18 Jan 2017 00:26:57 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from smtpbg292.qq.com (smtpbg292.qq.com [113.108.11.231]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 291B668A1DF for ; Wed, 18 Jan 2017 00:26:50 +0200 (EET) X-QQ-mid: bizesmtp1t1484691910tyuqxj3ae Received: from localhost (unknown [47.90.47.25]) by esmtp4.qq.com (ESMTP) with id ; Wed, 18 Jan 2017 06:25:09 +0800 (CST) X-QQ-SSF: 01100000002000F0F720000A0000000 X-QQ-FEAT: oIoGrveFQB8ESQQKjF3aZSJAwdX9LLJWysVikAQUHhGsrmU87/gSPx1J5uTrN ns6jLFdOVuR4LDvdE16O9MxLkxTAAYXZFbyb7MeNe1loEmYNBBbMn2zXfSVKShs4iumMW8R snGj1TqgVTETT+8tKYvczvVAH4YZs7HZttDO8Lz+A7vQQ/CphISEpFjF2gs946Npph1DVli 94UND/zxUK3f0J2nGGAsKrapd3jRclvdvqwzjVycNS0TGCyrtPHtIX/sxEowCUnCIySNThF TtWrsRl0vFhwDH X-QQ-GoodBg: 0 From: Steven Liu To: ffmpeg-devel@ffmpeg.org Date: Wed, 18 Jan 2017 06:24:59 +0800 Message-Id: <20170117222459.593-1-lq@chinaffmpeg.org> X-Mailer: git-send-email 2.10.1.382.ga23ca1b.dirty X-QQ-SENDSIZE: 520 X-QQ-Bgrelay: 1 Subject: [FFmpeg-devel] [PATCH v2] avfilter:vf_drawtext: add new line space size set parameter 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: Steven Liu MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" add line_spacing parameter to set the space between two lines Based on an idea by: Leandro Santiago Reviewed-by: Michael Niedermayer Signed-off-by: Steven Liu --- doc/filters.texi | 4 ++++ libavfilter/vf_drawtext.c | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/doc/filters.texi b/doc/filters.texi index 94548b1..a0c2980 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -6750,6 +6750,10 @@ option, check the "Color" section in the ffmpeg-utils manual. The default value of @var{boxcolor} is "white". +@item line_spacing +Set the line spacing in pixels of the border to be drawn around the box using @var{box}. +The default value of @var{line_spacing} is 0. + @item borderw Set the width of the border to be drawn around the text using @var{bordercolor}. The default value of @var{borderw} is 0. diff --git a/libavfilter/vf_drawtext.c b/libavfilter/vf_drawtext.c index 649240b..d8f7730 100644 --- a/libavfilter/vf_drawtext.c +++ b/libavfilter/vf_drawtext.c @@ -158,6 +158,7 @@ typedef struct DrawTextContext { int borderw; ///< border width unsigned int fontsize; ///< font size to use + int line_spacing; ///< lines 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 @@ -209,6 +210,7 @@ static const AVOption drawtext_options[]= { {"shadowcolor", "set shadow color", OFFSET(shadowcolor.rgba), AV_OPT_TYPE_COLOR, {.str="black"}, CHAR_MIN, CHAR_MAX, 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}, + {"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), AV_OPT_TYPE_INT, {.i64=0}, 0, INT_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}, @@ -1250,7 +1252,7 @@ static int draw_text(AVFilterContext *ctx, AVFrame *frame, if (is_newline(code)) { max_text_line_w = FFMAX(max_text_line_w, x); - y += s->max_glyph_h; + y += s->max_glyph_h + s->line_spacing; x = 0; continue; }