virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity

avfilter/drawtext - implement fix_bounds

Browse Source 
When enabled, text, including effects like shadow or box, will be
completely bound within the video frame.

Default value changed to false to keep continuity of behaviour.

Fixes #6960.

Signed-off-by: Kyle Swanson <k@ylo.ph>
This commit is contained in:
Gyan Doshi 2018-01-11 18:30:16 +05:30 committed by Kyle Swanson
parent 2eecf3cf8e
commit 6c1c6c6c71
1 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
libavfilter/vf_drawtext.c
View File

@ -238,7 +238,7 @@ static const AVOption drawtext_options[]= {
{"rate", "set rate (timecode only)", OFFSET(tc_rate), AV_OPT_TYPE_RATIONAL, {.dbl=0}, 0, INT_MAX, FLAGS},
{"reload", "reload text file for each frame", OFFSET(reload), AV_OPT_TYPE_BOOL, {.i64=0}, 0, 1, FLAGS},
{ "alpha", "apply alpha while rendering", OFFSET(a_expr), AV_OPT_TYPE_STRING, { .str = "1" }, .flags = FLAGS },
{"fix_bounds", "check and fix text coords to avoid clipping", OFFSET(fix_bounds), AV_OPT_TYPE_BOOL, {.i64=1}, 0, 1, FLAGS},
{"fix_bounds", "check and fix text coords to avoid clipping", OFFSET(fix_bounds), AV_OPT_TYPE_BOOL, {.i64=0}, 0, 1, FLAGS},
{"start_number", "start frame number for n/frame_num variable", OFFSET(start_number), AV_OPT_TYPE_INT, {.i64=0}, 0, INT_MAX, FLAGS},
#if CONFIG_LIBFRIBIDI
@ -1401,6 +1401,32 @@ static int draw_text(AVFilterContext *ctx, AVFrame *frame,
box_w = FFMIN(width - 1 , max_text_line_w);
box_h = FFMIN(height - 1, y + s->max_glyph_h);
if (s->fix_bounds) {
/* calculate footprint of text effects */
int boxoffset = s->draw_box ? FFMAX(s->boxborderw, 0) : 0;
int borderoffset = s->borderw ? FFMAX(s->borderw, 0) : 0;
int offsetleft = FFMAX3(boxoffset, borderoffset,
(s->shadowx < 0 ? FFABS(s->shadowx) : 0));
int offsettop = FFMAX3(boxoffset, borderoffset,
(s->shadowy < 0 ? FFABS(s->shadowy) : 0));
int offsetright = FFMAX3(boxoffset, borderoffset,
(s->shadowx > 0 ? s->shadowx : 0));
int offsetbottom = FFMAX3(boxoffset, borderoffset,
(s->shadowy > 0 ? s->shadowy : 0));
if (s->x - offsetleft < 0) s->x = offsetleft;
if (s->y - offsettop < 0) s->y = offsettop;
if (s->x + box_w + offsetright > width)
s->x = FFMAX(width - box_w - offsetright, 0);
if (s->y + box_h + offsetbottom > height)
s->y = FFMAX(height - box_h - offsetbottom, 0);
}
/* draw box */
if (s->draw_box)
ff_blend_rectangle(&s->dc, &boxcolor,