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

lavfi/vf_drawtext: fix memory management when destroying font face 

Ref https://trac.ffmpeg.org/ticket/11152

According to harfbuzz docs, hb_ft_font_set_funcs() does not need to be
called, as, quoted:

```
An #hb_font_t object created with hb_ft_font_create()
is preconfigured for FreeType font functions and does not
require this function to be used.
```

Using this function seems to cause memory management issues between
harfbuzz and freetype, and could be eliminated.

This commit also call hb_ft_font_changed() when the underlying FC_Face
changes size, as stated on hardbuzz:

```
HarfBuzz also provides a utility function called hb_ft_font_changed() that you should call
whenever you have altered the properties of your underlying FT_Face, as well as a hb_ft_get_face()
that you can call on an hb_font_t font object to fetch its underlying FT_Face.
```

Finally, the execution order between hb_font_destroy() and
hb_buffer_destroy() is flipped to match the order of creation of
the respective objects.

Signed-off-by: Leandro Santiago <leandrosansilva@gmail.com>
Signed-off-by: Marton Balint <cus@passwd.hu>
This commit is contained in:
Leandro Santiago 2024-10-31 21:48:27 +01:00 committed by Marton Balint
parent 9d8f7bf4b8
commit 69cbda5770
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavfilter/vf_drawtext.c
View File

@ -453,6 +453,12 @@ static av_cold int set_fontsize(AVFilterContext *ctx, unsigned int fontsize)
return AVERROR(EINVAL); return AVERROR(EINVAL);
} }
// Whenever the underlying FT_Face changes, harfbuzz has to be notified of the change.
for (int line = 0; line < s->line_count; line++) {
TextLine *cur_line = &s->lines[line];
hb_ft_font_changed(cur_line->hb_data.font);
}
s->fontsize = fontsize; s->fontsize = fontsize;
return 0; return 0;
@ -1369,11 +1375,10 @@ static int shape_text_hb(DrawTextContext *s, HarfbuzzData* hb, const char* text,
hb_buffer_set_script(hb->buf, HB_SCRIPT_LATIN); hb_buffer_set_script(hb->buf, HB_SCRIPT_LATIN);
hb_buffer_set_language(hb->buf, hb_language_from_string("en", -1)); hb_buffer_set_language(hb->buf, hb_language_from_string("en", -1));
hb_buffer_guess_segment_properties(hb->buf); hb_buffer_guess_segment_properties(hb->buf);
hb->font = hb_ft_font_create(s->face, NULL); hb->font = hb_ft_font_create_referenced(s->face);
if(hb->font == NULL) { if(hb->font == NULL) {
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
} }
hb_ft_font_set_funcs(hb->font);
hb_buffer_add_utf8(hb->buf, text, textLen, 0, -1); hb_buffer_add_utf8(hb->buf, text, textLen, 0, -1);
hb_shape(hb->font, hb->buf, NULL, 0); hb_shape(hb->font, hb->buf, NULL, 0);
hb->glyph_info = hb_buffer_get_glyph_infos(hb->buf, &hb->glyph_count); hb->glyph_info = hb_buffer_get_glyph_infos(hb->buf, &hb->glyph_count);
@ -1384,8 +1389,8 @@ static int shape_text_hb(DrawTextContext *s, HarfbuzzData* hb, const char* text,
static void hb_destroy(HarfbuzzData *hb) static void hb_destroy(HarfbuzzData *hb)
{ {
hb_buffer_destroy(hb->buf);
hb_font_destroy(hb->font); hb_font_destroy(hb->font);
hb_buffer_destroy(hb->buf);
hb->buf = NULL; hb->buf = NULL;
hb->font = NULL; hb->font = NULL;
hb->glyph_info = NULL; hb->glyph_info = NULL;