Skip to content

V
vlc
Commit 47b7d83d authored by Francois Cartegnie's avatar Francois Cartegnie
Browse files
Options

freetype: simplify live style handling

parent ee39258e
Show whitespace changes
Inline Side-by-side
Showing with 59 additions and 95 deletions
modules/text_renderer/freetype.c
View file @ 47b7d83d
......@@ -309,54 +309,6 @@ static int LoadFontsFromAttachments( filter_t *p_filter )
return VLC_SUCCESS;
}
static int GetFontSize( filter_t *p_filter )
{
filter_sys_t *p_sys = p_filter->p_sys;
int i_size = 0;
if( p_sys->p_forced_style->i_font_size )
{
i_size = p_sys->p_forced_style->i_font_size;
}
else if( p_sys->p_forced_style->f_font_relsize )
{
i_size = (int) p_filter->fmt_out.video.i_height * p_sys->p_forced_style->f_font_relsize;
}
else if( p_sys->p_default_style->f_font_relsize )
{
i_size = (int) p_filter->fmt_out.video.i_height * p_sys->p_default_style->f_font_relsize;
}
if( i_size <= 0 )
{
msg_Warn( p_filter, "invalid fontsize, using %d", FREETYPE_DEFAULT_FONT_SIZE );
i_size = FREETYPE_DEFAULT_FONT_SIZE;
}
return i_size;
}
static int SetFontSize( filter_t *p_filter, int i_size )
{
filter_sys_t *p_sys = p_filter->p_sys;
if( !i_size )
{
i_size = GetFontSize( p_filter );
msg_Dbg( p_filter, "using fontsize: %i", i_size );
}
p_sys->p_style->i_font_size = i_size;
if( FT_Set_Pixel_Sizes( p_sys->p_face, 0, i_size ) )
{
msg_Err( p_filter, "couldn't set font size to %d", i_size );
return VLC_EGENERIC;
}
return VLC_SUCCESS;
}
/*****************************************************************************
* RenderYUVP: place string in picture
*****************************************************************************
......@@ -774,8 +726,6 @@ static inline int RenderAXYZ( filter_t *p_filter,
void (*FillPicture)( picture_t *p_picture, int, int, int, int ),
void (*BlendPixel)(picture_t *, int, int, int, int, int, int, int) )
{
filter_sys_t *p_sys = p_filter->p_sys;
/* Create a new subpicture region */
const int i_text_width = p_bbox->xMax - p_bbox->xMin;
const int i_text_height = p_bbox->yMax - p_bbox->yMin;
......@@ -844,12 +794,12 @@ static inline int RenderAXYZ( filter_t *p_filter,
uint32_t i_color;
switch (g) {/* Apply font alpha ratio to shadow/outline alpha */
case 0:
i_a = i_a * p_sys->p_style->i_shadow_alpha / 255;
i_color = p_sys->p_style->i_shadow_color;
i_a = i_a * ch->p_style->i_shadow_alpha / 255;
i_color = ch->p_style->i_shadow_color;
break;
case 1:
i_a = i_a * p_sys->p_style->i_outline_alpha / 255;
i_color = p_sys->p_style->i_outline_color;
i_a = i_a * ch->p_style->i_outline_alpha / 255;
i_color = ch->p_style->i_outline_color;
break;
default:
i_color = ch->p_style->i_font_color;
......@@ -901,6 +851,8 @@ static void FillDefaultStyles( filter_t *p_filter )
p_sys->p_default_style->i_shadow_color = var_InheritInteger( p_filter, "freetype-shadow-color" );
p_sys->p_default_style->i_shadow_color = VLC_CLIP( p_sys->p_default_style->i_shadow_color, 0, 0xFFFFFF );
p_sys->p_default_style->i_font_size = 0;
p_sys->p_forced_style->i_font_size = var_InheritInteger( p_filter, "freetype-fontsize" );
p_sys->p_forced_style->f_font_relsize = var_InheritInteger( p_filter, "freetype-rel-fontsize" );
if( p_sys->p_forced_style->f_font_relsize )
......@@ -958,7 +910,7 @@ static uni_char_t* SegmentsToTextAndStyles( filter_t *p_filter, const text_segme
pp_styles = pp_styles_realloc;
// We're actually writing to a read only object, something's wrong with the conception.
text_style_t *p_style = text_style_Duplicate( p_filter->p_sys->p_style );
text_style_t *p_style = text_style_Duplicate( p_filter->p_sys->p_default_style );
if ( p_style == NULL )
{
free( pp_styles );
......@@ -997,9 +949,6 @@ static int Render( filter_t *p_filter, subpicture_region_t *p_region_out,
if( !p_region_in )
return VLC_EGENERIC;
/* Reset the default fontsize in case screen metrics have changed */
p_filter->p_sys->p_style->i_font_size = GetFontSize( p_filter );
const text_style_t **pp_styles = NULL;
size_t i_text_length = 0;
uni_char_t *psz_text = SegmentsToTextAndStyles( p_filter, p_region_in->p_text, &i_text_length, &pp_styles );
......@@ -1126,7 +1075,11 @@ static int Init_FT( vlc_object_t *p_this,
goto error;
}
if( SetFontSize( p_filter, (int) 0 ) != VLC_SUCCESS ) goto error;
if( FT_Set_Pixel_Sizes( p_sys->p_face, 0, STYLE_DEFAULT_FONT_SIZE ) )
{
msg_Err( p_filter, "couldn't set font size to %d", STYLE_DEFAULT_FONT_SIZE );
goto error;
}
i_error = FT_Stroker_New( p_sys->p_library, &p_sys->p_stroker );
if( i_error )
......@@ -1166,8 +1119,6 @@ static int Create( vlc_object_t *p_this )
return VLC_ENOMEM;
}
p_sys->p_style = NULL;
/* empty style for style overriding cases */
p_sys->p_forced_style = text_style_Create( STYLE_NO_DEFAULTS );
if(unlikely(!p_sys->p_forced_style))
......@@ -1230,16 +1181,6 @@ static int Create( vlc_object_t *p_this )
p_sys->pf_select = Dummy_Select;
#endif
/* Set default style to current (FIXME: is current really used/needed?) */
p_sys->p_style = text_style_Duplicate( p_sys->p_default_style );
if( !p_sys->p_style )
{
text_style_Delete( p_sys->p_default_style );
text_style_Delete( p_sys->p_forced_style );
free(p_sys);
return VLC_ENOMEM;
}
/* */
psz_fontfile = p_sys->pf_select( p_filter, p_sys->p_default_style->psz_fontname,
false, false, p_sys->p_default_style->i_font_size, &fontindex );
......@@ -1281,7 +1222,6 @@ static int Create( vlc_object_t *p_this )
error:
free( psz_fontfile );
free( psz_monofontfile );
text_style_Delete( p_sys->p_style );
text_style_Delete( p_sys->p_default_style );
text_style_Delete( p_sys->p_forced_style );
free( p_sys );
......@@ -1329,7 +1269,6 @@ static void Destroy( vlc_object_t *p_this )
}
text_style_Delete( p_sys->p_default_style );
text_style_Delete( p_sys->p_style );
text_style_Delete( p_sys->p_forced_style );
Destroy_FT( p_this );
......@@ -1383,15 +1322,29 @@ static FT_Face LoadEmbeddedFace( filter_sys_t *p_sys, const char *psz_fontname,
return NULL;
}
int ConvertToLiveSize( filter_t *p_filter, const text_style_t *p_style )
{
int i_font_size = STYLE_DEFAULT_FONT_SIZE;
if( p_style->i_font_size )
{
i_font_size = p_style->i_font_size;
}
else if ( p_style->f_font_relsize )
{
i_font_size = (int) p_filter->fmt_out.video.i_height * p_style->f_font_relsize;
}
return i_font_size;
}
FT_Face LoadFace( filter_t *p_filter,
const text_style_t *p_style )
const text_style_t *p_style, int i_font_size )
{
filter_sys_t *p_sys = p_filter->p_sys;
faces_cache_t *p_cache = &p_sys->faces_cache;
for( int i = 0; i < p_cache->i_faces_count; ++i )
if( FaceStyleEquals( &p_cache->p_styles[ i ], p_style )
&& p_cache->p_styles[ i ].i_font_size == p_style->i_font_size
&& p_cache->p_styles[ i ].i_font_size == i_font_size
&& !( ( p_cache->p_styles[ i ].i_style_flags ^ p_style->i_style_flags ) & STYLE_HALFWIDTH ) )
return p_cache->p_faces[ i ];
......@@ -1449,12 +1402,12 @@ FT_Face LoadFace( filter_t *p_filter,
}
int i_font_width = p_style->i_style_flags & STYLE_HALFWIDTH
? p_style->i_font_size / 2 : p_style->i_font_size;
? i_font_size / 2 : i_font_size;
if( FT_Set_Pixel_Sizes( p_face, i_font_width, p_style->i_font_size ) )
if( FT_Set_Pixel_Sizes( p_face, i_font_width, i_font_size ) )
{
msg_Err( p_filter,
"Failed to set font size to %d", p_style->i_font_size );
"Failed to set font size to %d", i_font_size );
FT_Done_Face( p_face );
return NULL;
}
......@@ -1484,7 +1437,7 @@ FT_Face LoadFace( filter_t *p_filter,
}
text_style_t *p_face_style = p_cache->p_styles + p_cache->i_faces_count;
p_face_style->i_font_size = p_style->i_font_size;
p_face_style->i_font_size = i_font_size;
p_face_style->i_style_flags = p_style->i_style_flags;
p_face_style->psz_fontname = strdup( psz_fontname );
p_cache->p_faces[ p_cache->i_faces_count ] = p_face;
......
modules/text_renderer/freetype.h
View file @ 47b7d83d
......@@ -51,7 +51,6 @@ struct filter_sys_t
FT_Stroker p_stroker; /* handle to path stroker object */
text_style_t *p_default_style;
text_style_t *p_style; /* Current Style */
text_style_t *p_forced_style;/* Renderer overridings */
/* More styles... */
......@@ -90,7 +89,8 @@ typedef uint32_t uni_char_t;
#endif
FT_Face LoadFace( filter_t *p_filter, const text_style_t *p_style );
FT_Face LoadFace( filter_t *p_filter, const text_style_t *p_style, int );
int ConvertToLiveSize( filter_t *p_filter, const text_style_t *p_style );
bool FaceStyleEquals( const text_style_t *p_style1,
const text_style_t *p_style2 );
......
modules/text_renderer/text_layout.c
View file @ 47b7d83d
......@@ -516,6 +516,7 @@ static int ShapeParagraphHarfBuzz( filter_t *p_filter,
{
run_desc_t *p_run = p_paragraph->p_runs + i;
const text_style_t *p_style = p_run->p_style;
const int i_live_size = ConvertToLiveSize( p_filter, p_style );
/*
* When using HarfBuzz, this is where font faces are loaded.
......@@ -525,11 +526,11 @@ static int ShapeParagraphHarfBuzz( filter_t *p_filter,
FT_Face p_face = 0;
if( !p_run->p_face )
{
p_face = LoadFace( p_filter, p_style );
p_face = LoadFace( p_filter, p_style, i_live_size );
if( !p_face )
{
p_face = p_sys->p_face;
p_style = p_sys->p_style;
p_style = p_sys->p_default_style;
p_run->p_style = p_style;
}
p_run->p_face = p_face;
......@@ -761,7 +762,8 @@ static int ZeroNsmAdvance( paragraph_t *p_paragraph )
* have already been determined at this point, as well as the advance values.
*/
static int LoadGlyphs( filter_t *p_filter, paragraph_t *p_paragraph,
bool b_use_glyph_indices, bool b_overwrite_advance )
bool b_use_glyph_indices, bool b_overwrite_advance,
int *pi_max_advance_x )
{
if( p_paragraph->i_size <= 0 || p_paragraph->i_runs_count <= 0 )
{
......@@ -772,20 +774,23 @@ static int LoadGlyphs( filter_t *p_filter, paragraph_t *p_paragraph,
}
filter_sys_t *p_sys = p_filter->p_sys;
*pi_max_advance_x = 0;
for( int i = 0; i < p_paragraph->i_runs_count; ++i )
{
run_desc_t *p_run = p_paragraph->p_runs + i;
const text_style_t *p_style = p_run->p_style;
const int i_live_size = ConvertToLiveSize( p_filter, p_style );
FT_Face p_face = 0;
if( !p_run->p_face )
{
p_face = LoadFace( p_filter, p_style );
p_face = LoadFace( p_filter, p_style, i_live_size );
if( !p_face )
{
/* Uses the default font and style */
p_face = p_sys->p_face;
p_style = p_sys->p_style;
p_style = p_sys->p_default_style;
p_run->p_style = p_style;
}
p_run->p_face = p_face;
......@@ -798,7 +803,7 @@ static int LoadGlyphs( filter_t *p_filter, paragraph_t *p_paragraph,
double f_outline_thickness =
var_InheritInteger( p_filter, "freetype-outline-thickness" ) / 100.0;
f_outline_thickness = VLC_CLIP( f_outline_thickness, 0.0, 0.5 );
int i_radius = ( p_style->i_font_size << 6 ) * f_outline_thickness;
int i_radius = ( i_live_size << 6 ) * f_outline_thickness;
FT_Stroker_Set( p_sys->p_stroker,
i_radius,
FT_STROKER_LINECAP_ROUND,
......@@ -853,7 +858,7 @@ static int LoadGlyphs( filter_t *p_filter, paragraph_t *p_paragraph,
p_bitmaps->p_outline = 0;
}
if( p_filter->p_sys->p_style->i_shadow_alpha != STYLE_ALPHA_TRANSPARENT )
if( p_style->i_shadow_alpha != STYLE_ALPHA_TRANSPARENT )
p_bitmaps->p_shadow = p_bitmaps->p_outline ?
p_bitmaps->p_outline : p_bitmaps->p_glyph;
......@@ -863,6 +868,10 @@ static int LoadGlyphs( filter_t *p_filter, paragraph_t *p_paragraph,
p_bitmaps->i_y_advance = p_face->glyph->advance.y;
}
}
int i_max_run_advance_x = FT_FLOOR( FT_MulFix( p_face->max_advance_width, p_face->size->metrics.x_scale ) );
if( i_max_run_advance_x > *pi_max_advance_x )
*pi_max_advance_x = i_max_run_advance_x;
}
return VLC_SUCCESS;
}
......@@ -899,6 +908,7 @@ static int LayoutLine( filter_t *p_filter,
FT_Vector pen = { .x = 0, .y = 0 };
int i_line_index = 0;
int i_font_size = 0;
int i_font_width = 0;
int i_font_max_advance_y = 0;
int i_ul_offset = 0;
......@@ -940,8 +950,9 @@ static int LayoutLine( filter_t *p_filter,
p_style = p_run->p_style;
p_face = p_run->p_face;
i_font_size = ConvertToLiveSize( p_filter, p_style );
i_font_width = p_style->i_style_flags & STYLE_HALFWIDTH ?
p_style->i_font_size / 2 : p_style->i_font_size;
i_font_size / 2 : i_font_size;
}
FT_Vector pen_new = {
......@@ -950,7 +961,7 @@ static int LayoutLine( filter_t *p_filter,
};
FT_Vector pen_shadow = {
.x = pen_new.x + p_sys->f_shadow_vector_x * ( i_font_width << 6 ),
.y = pen_new.y + p_sys->f_shadow_vector_y * ( p_style->i_font_size << 6 )
.y = pen_new.y + p_sys->f_shadow_vector_y * ( i_font_size << 6 )
};
if( p_bitmaps->p_shadow )
......@@ -1240,6 +1251,7 @@ int LayoutText( filter_t *p_filter, line_desc_t **pp_lines,
paragraph_t *p_paragraph = 0;
int i_paragraph_start = 0;
int i_max_height = 0;
int i_max_advance_x = 0;
for( int i = 0; i <= i_len; ++i )
{
......@@ -1275,20 +1287,20 @@ int LayoutText( filter_t *p_filter, line_desc_t **pp_lines,
if( ShapeParagraphHarfBuzz( p_filter, &p_paragraph ) )
goto error;
if( LoadGlyphs( p_filter, p_paragraph, true, false ) )
if( LoadGlyphs( p_filter, p_paragraph, true, false, &i_max_advance_x ) )
goto error;
#elif defined HAVE_FRIBIDI
if( ShapeParagraphFriBidi( p_filter, p_paragraph ) )
goto error;
if( LoadGlyphs( p_filter, p_paragraph, false, true ) )
if( LoadGlyphs( p_filter, p_paragraph, false, true, &i_max_advance_x ) )
goto error;
if( RemoveZeroWidthCharacters( p_paragraph ) )
goto error;
if( ZeroNsmAdvance( p_paragraph ) )
goto error;
#else
if( LoadGlyphs( p_filter, p_paragraph, false, true ) )
if( LoadGlyphs( p_filter, p_paragraph, false, true, &i_max_advance_x ) )
goto error;
#endif
......@@ -1296,8 +1308,7 @@ int LayoutText( filter_t *p_filter, line_desc_t **pp_lines,
* Set max line width to allow for outline and shadow glyphs,
* and any extra width caused by visual reordering
*/
int i_max_width = ( int ) p_filter->fmt_out.video.i_visible_width
- 2 * p_filter->p_sys->p_style->i_font_size;
int i_max_width = ( int ) p_filter->fmt_out.video.i_visible_width - i_max_advance_x;
if( LayoutParagraph( p_filter, p_paragraph,
i_max_width, pp_line, b_grid ) )
goto error;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment