[FFmpeg-cvslog] avfilter/drawtext: fix box sizing

Gyan Doshi git at videolan.org
Fri Jul 13 07:42:34 EEST 2018


ffmpeg | branch: master | Gyan Doshi <ffmpeg at gyani.pro> | Tue Jul 10 15:32:06 2018 +0530| [1a31c2b5df1179fdc1b8e84c8fa89d853e517309] | committer: Gyan Doshi

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1a31c2b5df1179fdc1b8e84c8fa89d853e517309
---

 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) {
 



More information about the ffmpeg-cvslog mailing list