From patchwork Tue Jul 10 10:01:27 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gyan X-Patchwork-Id: 9661 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:104:0:0:0:0:0 with SMTP id c4-v6csp3467827jad; Tue, 10 Jul 2018 03:01:42 -0700 (PDT) X-Google-Smtp-Source: AAOMgpeUqOX3So7JMilXC9vO3mS68OcMnXJ1nHLG43xaVpX6laotICe6CXMCO1F1V7rZRy6tpckX X-Received: by 2002:a5d:438d:: with SMTP id i13-v6mr18354238wrq.156.1531216902117; Tue, 10 Jul 2018 03:01:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531216902; cv=none; d=google.com; s=arc-20160816; b=MwmiVgn9v7HXszv2J6hM5Ky7pnYlHRaiNvSnzjU79nprZ6Lf4mJniKBMTGpmuCywmZ kF76g/Za8jZjRmx56GQF76uICC+MgE39ikuVibhZINXG+2RF11UbNfD4KBA6u3VBSDt7 EaF4NBbX3w0cBUK3d4JJk6PXMNJaERUQK7RuC2JvbshMGaCvv2YdC31ZnpciDcdxzrq7 RZ6PKjBDv7/V3fPWrgL73zTZpRVI/MQizLoeVh2TG1G9WO+yIRtb1ml4xCh5tFXD3sup RANH40NFCaVORSLBKGnfkbbwM2nKfeSW568Pur19XFXIKkQ42yzjJ4hV8zoo/IHfPaj8 AxxQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject :content-language:mime-version:user-agent:date:message-id:from:to :dkim-signature:delivered-to:arc-authentication-results; bh=chOSYu9yyfihPg0APPhw2T2QzVQM7DQ3k7cRTHz/WvI=; b=b8tMHGjQNaET0TxmBAjVLtDtwH+2AKuRoIsP65ijHmEmy3FjF0AsNSnXDwJwP8HrtT 33W7YOMyQo6Buoa0swEjqw2IhnUDg1MP8eVkp7TW2+f/5XKZO3fkGCrrHNgEe/zQqlJj tRLyqg8OdAJpXDcOEJ86LuNxbHr981m3Lo59fr99hTjWBavCYBAlNPQhl9Id/hMp5ofG oIiTA8AiAlCSIc5LEck5XN2BksEPcveBBkdjfjLJ9pZr0fMxeAxk71Hkl6W2CPe3ufB7 1hZtwKIy4vb4bWEKQtltCIMvKTzdJE7FOLJ/Rg0peoFA1Cs7Vj0AK9sRDTAtSinjwPJ1 Xxfg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=pLpRQM9q; 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 e9-v6si15059276wrp.36.2018.07.10.03.01.41; Tue, 10 Jul 2018 03:01:42 -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=20161025 header.b=pLpRQM9q; 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 973E468A613; Tue, 10 Jul 2018 13:01:32 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf0-f177.google.com (mail-pf0-f177.google.com [209.85.192.177]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7E97768A519 for ; Tue, 10 Jul 2018 13:01:25 +0300 (EEST) Received: by mail-pf0-f177.google.com with SMTP id s21-v6so15768654pfm.6 for ; Tue, 10 Jul 2018 03:01:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=to:from:subject:message-id:date:user-agent:mime-version :content-language; bh=qfGmFBQ863lnZTjMSBsQ9DcfMCEwiyk7bWs5HtIDEaQ=; b=pLpRQM9qaejMX6dDI8OslhQqjx6jdVuIyw6exi4Pxmv9wCR1T0r9jTBxZQfn5LAAHN cfJXpmDqQOgAgMGbQvPOR2Uj5Ub9uGcSUhy2ZPyhzgZvB84Hhs/inHXVqOet3DSwlmy/ kPc69pqRzJKmKr9ySp62xuxhg8cNJTicRKD8ELwnQ1ikZecWM8uFIClh63FfYkKWmkzG 95ysyRZGcrc54JW0oLdo3hXtvgRNYQhXusg3rb04OztIbP0Kb9RTFZfusgkiXh3UwZyj BFll3bMSj1+IejM1Ux3VqbrSEk5t/YST8JzXxIvStEzot0kU7zaywsbc1stbPs35e2xp O+SA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:from:subject:message-id:date:user-agent :mime-version:content-language; bh=qfGmFBQ863lnZTjMSBsQ9DcfMCEwiyk7bWs5HtIDEaQ=; b=GRZjXHn8QduxybWKO6PQFrD+BZOezJpRBl4ZaqZvBOXi6ExW2eokEevChMBNjVbC3W SpZhUItcpaUhtD+RAi1eQoxkST1caXtaY/xB7x0BG7sxoXDom1vPLQwwHnmp9whsjzZc /oWwYDE7ixzh4yCNIvytYcgeRZQbPGU88wZCFGtVVSOUPXjzxzB5mJyD413mUp6wRvfc 2VChH58ScwJQeULStldviVI2HtN+LF5xVAIEi3E3zg0v8PYapk42BXLxF3OfeYVwX72V eeQTuCJFoKtfVXi8sS+5rgcrC7iMb44Yahb1irW+dVclNI+BRRcJUtwaT1zN9F1gI6r6 WlvQ== X-Gm-Message-State: APt69E1i2M9Qrty2IfmO//0/r2Ng4VrUgpLuMby839rjVr8IwwqQLD07 /MGAAttJLpRv7NrnkDcIkwwKqY6s X-Received: by 2002:a65:5683:: with SMTP id v3-v6mr21502633pgs.176.1531216890229; Tue, 10 Jul 2018 03:01:30 -0700 (PDT) Received: from [192.168.1.225] ([183.87.90.217]) by smtp.gmail.com with ESMTPSA id a15-v6sm30552619pfa.78.2018.07.10.03.01.28 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 10 Jul 2018 03:01:29 -0700 (PDT) To: ffmpeg-devel@ffmpeg.org From: Gyan Doshi Message-ID: Date: Tue, 10 Jul 2018 15:31:27 +0530 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.9.0 MIME-Version: 1.0 Content-Language: en-US Subject: [FFmpeg-devel] [PATCH] avfilter/drawtext: fix box sizing 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Test command: ffplay -f lavfi -i "color,\ drawtext=fontfile='arial.ttf':fontcolor=white:fontsize=H/5:\ text='A string of characters':\ box=1:boxcolor=green:boxborderw=5:\ x='w-w*t/5':y=-th+h*t/10" From b98969d12b3f6959ab1a036f20ba649951bcd1ea Mon Sep 17 00:00:00 2001 From: Gyan Doshi Date: Tue, 10 Jul 2018 15:14:06 +0530 Subject: [PATCH] avfilter/drawtext: fix box sizing At present, box size is clipped to frame size before being drawn, which can lead to the box not fully covering animated text which is longer than one or both frame dimensions. Since ff_blend_rectangle correctly takes care of clipping, it is skipped here which results in correct box sizing --- libavfilter/vf_drawtext.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavfilter/vf_drawtext.c b/libavfilter/vf_drawtext.c index 3affa736c7..cca2cbcb88 100644 --- a/libavfilter/vf_drawtext.c +++ b/libavfilter/vf_drawtext.c @@ -1407,8 +1407,8 @@ static int draw_text(AVFilterContext *ctx, AVFrame *frame, update_color_with_alpha(s, &bordercolor, s->bordercolor); update_color_with_alpha(s, &boxcolor , s->boxcolor ); - box_w = FFMIN(width - 1 , max_text_line_w); - box_h = FFMIN(height - 1, y + s->max_glyph_h); + box_w = max_text_line_w; + box_h = y + s->max_glyph_h; if (s->fix_bounds) {