diff options
| author | Marton Balint <cus@passwd.hu> | 2015-03-31 00:52:47 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-31 13:41:25 +0200 |
| commit | c84b75c89c019fdf7d1b6e4094beb0d9c316731f (patch) | |
| tree | 2250a40def53b455bb590e32c8c7b22bda7f4fe7 | |
| parent | 919d13d2383bd7318b80ed0c5b723323a79a8996 (diff) | |
| download | ffmpeg-c84b75c89c019fdf7d1b6e4094beb0d9c316731f.tar.gz | |
vf_drawtext: add support for setting box border width
Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | doc/filters.texi | 4 | ||||
| -rw-r--r-- | libavfilter/vf_drawtext.c | 5 |
2 files changed, 8 insertions, 1 deletions
diff --git a/doc/filters.texi b/doc/filters.texi index 15f8ed59bf..b75ce5a925 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -3955,6 +3955,10 @@ Used to draw a box around text using the background color. The value must be either 1 (enable) or 0 (disable). The default value of @var{box} is 0. +@item boxborderw +Set the width of the border to be drawn around the box using @var{boxcolor}. +The default value of @var{boxborderw} is 0. + @item boxcolor The color to be used for drawing box around text. For the syntax of this option, check the "Color" section in the ffmpeg-utils manual. diff --git a/libavfilter/vf_drawtext.c b/libavfilter/vf_drawtext.c index cf24d960db..a955d09781 100644 --- a/libavfilter/vf_drawtext.c +++ b/libavfilter/vf_drawtext.c @@ -159,6 +159,7 @@ typedef struct DrawTextContext { unsigned int fontsize; ///< font size to use 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 int tabsize; ///< tab size int fix_bounds; ///< do we let it go out of frame bounds - t/f @@ -204,6 +205,7 @@ static const AVOption drawtext_options[]= { {"bordercolor", "set border color", OFFSET(bordercolor.rgba), AV_OPT_TYPE_COLOR, {.str="black"}, CHAR_MIN, CHAR_MAX, FLAGS}, {"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_INT, {.i64=0}, 0, 1 , FLAGS}, + {"boxborderw", "set box border width", OFFSET(boxborderw), 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}, @@ -1245,7 +1247,8 @@ static int draw_text(AVFilterContext *ctx, AVFrame *frame, if (s->draw_box) ff_blend_rectangle(&s->dc, &s->boxcolor, frame->data, frame->linesize, width, height, - s->x, s->y, box_w, box_h); + s->x - s->boxborderw, s->y - s->boxborderw, + box_w + s->boxborderw * 2, box_h + s->boxborderw * 2); if (s->shadowx || s->shadowy) { if ((ret = draw_glyphs(s, frame, width, height, |