RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avfilter/vf_drawtext: fix text width measurement

This commit is contained in:
yethie 2023-09-07 18:39:25 +02:00 committed by Paul B Mahol
parent da784b81a6
commit aeff5bcba0
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libavfilter/vf_drawtext.c
View File

@ -1757,9 +1757,17 @@ continue_on_failed2:
first_min_x64 = FFMIN(glyph->bbox.xMin, first_min_x64); first_min_x64 = FFMIN(glyph->bbox.xMin, first_min_x64);
} }
if (t == hb->glyph_count - 1) { if (t == hb->glyph_count - 1) {
w64 += glyph->bbox.xMax; // The following code measures the width of the line up to the last
last_max_x64 = FFMAX(glyph->bbox.xMax, last_max_x64); // character's horizontal advance
cur_line->offset_right64 = glyph->bbox.xMax; int last_char_width = hb->glyph_pos[t].x_advance;
// The following code measures the width of the line up to the rightmost
// visible pixel of the last character
// int last_char_width = glyph->bbox.xMax;
w64 += last_char_width;
last_max_x64 = FFMAX(last_char_width, last_max_x64);
cur_line->offset_right64 = last_char_width;
} else { } else {
if (is_tab) { if (is_tab) {
int size = s->blank_advance64 * s->tabsize; int size = s->blank_advance64 * s->tabsize;