Commit ae267444 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Freetype:

This patch:
* try to solve the fribidi styles problems that have occured
* introduces ft_style_t, to solve the precedent problem,
* solves a few errors from precedent commits,
* split some big functions on my request to avoid many imbrications.

Patch from Bernie Purcell.
parent 6e8a32ce
......@@ -93,7 +93,7 @@ static int RenderHtml( filter_t *, subpicture_region_t *,
static char *FontConfig_Select( FcConfig *, const char *,
vlc_bool_t, vlc_bool_t, int * );
#endif
static line_desc_t *NewLine( byte_t * );
static line_desc_t *NewLine( int );
static int SetFontSize( filter_t *, int );
......@@ -218,6 +218,16 @@ struct font_stack_t
font_stack_t *p_next;
};
typedef struct
{
int i_font_size;
uint32_t i_font_color; /* ARGB */
vlc_bool_t b_italic;
vlc_bool_t b_bold;
vlc_bool_t b_underline;
char *psz_fontname;
} ft_style_t;
static int Render( filter_t *, subpicture_region_t *, line_desc_t *, int, int);
static void FreeLines( line_desc_t * );
static void FreeLine( line_desc_t * );
......@@ -323,7 +333,6 @@ static int Create( vlc_object_t *p_this )
msg_Err( p_filter, "couldn't initialize freetype" );
goto error;
}
i_error = FT_New_Face( p_sys->p_library, psz_fontfile ? psz_fontfile : "",
0, &p_sys->p_face );
if( i_error == FT_Err_Unknown_File_Format )
......@@ -994,7 +1003,7 @@ static int RenderText( filter_t *p_filter, subpicture_region_t *p_region_out,
/* Calculate relative glyph positions and a bounding box for the
* entire string */
if( !(p_line = NewLine( (byte_t *)psz_string )) )
if( !(p_line = NewLine( strlen( psz_string ))) )
{
msg_Err( p_filter, "out of memory" );
goto error;
......@@ -1018,7 +1027,7 @@ static int RenderText( filter_t *p_filter, subpicture_region_t *p_region_out,
if( i_char == '\n' )
{
psz_line_start = psz_unicode;
if( !(p_next = NewLine( (byte_t *)psz_string )) )
if( !(p_next = NewLine( strlen( psz_string ))) )
{
msg_Err( p_filter, "out of memory" );
goto error;
......@@ -1087,7 +1096,7 @@ static int RenderText( filter_t *p_filter, subpicture_region_t *p_region_out,
{
p_line->pp_glyphs[ i ] = NULL;
FreeLine( p_line );
p_line = NewLine( (byte_t *)psz_string );
p_line = NewLine( strlen( psz_string ));
if( p_prev ) p_prev->p_next = p_line;
else p_lines = p_line;
......@@ -1150,6 +1159,58 @@ static int RenderText( filter_t *p_filter, subpicture_region_t *p_region_out,
}
#ifdef HAVE_FONTCONFIG
static ft_style_t *CreateStyle( char *psz_fontname, int i_font_size,
int i_font_color, int i_font_alpha, vlc_bool_t b_bold,
vlc_bool_t b_italic, vlc_bool_t b_uline )
{
ft_style_t *p_style = malloc( sizeof( ft_style_t ));
if( p_style )
{
p_style->i_font_size = i_font_size;
p_style->i_font_color = ( i_font_color & 0x00ffffff )
| (( i_font_alpha & 0xff ) << 24 );
p_style->b_italic = b_italic;
p_style->b_bold = b_bold;
p_style->b_underline = b_uline;
/* p_style has just been malloc'ed in this function -
* it CAN'T have a previous assignment, and hence we
* don't need to do a free() for any previous value -
* which will in fact be undefined. */
p_style->psz_fontname = strdup( psz_fontname );
}
return p_style;
}
static void DeleteStyle( ft_style_t *p_style )
{
if( p_style )
{
if( p_style->psz_fontname )
free( p_style->psz_fontname );
free( p_style );
}
}
static vlc_bool_t StyleEquals( ft_style_t *s1, ft_style_t *s2 )
{
if( !s1 || !s2 )
return VLC_FALSE;
if( s1 == s2 )
return VLC_TRUE;
if(( s1->i_font_size == s2->i_font_size ) &&
( s1->i_font_color == s2->i_font_color ) &&
( s1->b_italic == s2->b_italic ) &&
( s1->b_bold == s2->b_bold ) &&
( s1->b_underline == s2->b_underline ) &&
( !strcmp( s1->psz_fontname, s2->psz_fontname )))
{
return VLC_TRUE;
}
return VLC_FALSE;
}
static int PushFont( font_stack_t **p_font, const char *psz_name, int i_size,
int i_color, int i_alpha )
{
......@@ -1159,7 +1220,7 @@ static int PushFont( font_stack_t **p_font, const char *psz_name, int i_size,
return VLC_EGENERIC;
p_new = malloc( sizeof( font_stack_t ) );
if( !p_new )
if( ! p_new )
return VLC_ENOMEM;
p_new->p_next = NULL;
......@@ -1238,88 +1299,90 @@ static int PeekFont( font_stack_t **p_font, char **psz_name, int *i_size,
return VLC_SUCCESS;
}
static uint32_t *IconvText( filter_t *p_filter, char *psz_string )
static void IconvText( filter_t *p_filter, const char *psz_string,
uint32_t *i_string_length, uint32_t **ppsz_unicode )
{
vlc_iconv_t iconv_handle = (vlc_iconv_t)(-1);
uint32_t *psz_unicode;
int i_string_length;
psz_unicode =
malloc( ( strlen( psz_string ) + 1 ) * sizeof( uint32_t ) );
if( psz_unicode == NULL )
/* If memory hasn't been allocated for our output string, allocate it here
* - the calling function must now be responsible for freeing it.
*/
if( !*ppsz_unicode )
*ppsz_unicode = (uint32_t *)
malloc( (strlen( psz_string ) + 1) * sizeof( uint32_t ));
/* We don't need to handle a NULL pointer in *ppsz_unicode
* if we are instead testing for a non NULL value like we are here */
if( *ppsz_unicode )
{
msg_Err( p_filter, "out of memory" );
return NULL;;
}
#if defined(WORDS_BIGENDIAN)
iconv_handle = vlc_iconv_open( "UCS-4BE", "UTF-8" );
iconv_handle = vlc_iconv_open( "UCS-4BE", "UTF-8" );
#else
iconv_handle = vlc_iconv_open( "UCS-4LE", "UTF-8" );
iconv_handle = vlc_iconv_open( "UCS-4LE", "UTF-8" );
#endif
if( iconv_handle == (vlc_iconv_t)-1 )
{
msg_Warn( p_filter, "unable to do conversion" );
free( psz_unicode );
return NULL;;
}
{
char *p_in_buffer, *p_out_buffer;
size_t i_in_bytes, i_out_bytes, i_out_bytes_left, i_ret;
i_in_bytes = strlen( psz_string );
i_out_bytes = i_in_bytes * sizeof( uint32_t );
i_out_bytes_left = i_out_bytes;
p_in_buffer = psz_string;
p_out_buffer = (char *)psz_unicode;
i_ret = vlc_iconv( iconv_handle, (const char**)&p_in_buffer, &i_in_bytes,
&p_out_buffer, &i_out_bytes_left );
vlc_iconv_close( iconv_handle );
if( i_in_bytes )
if( iconv_handle != (vlc_iconv_t)-1 )
{
msg_Warn( p_filter, "failed to convert string to unicode (%s), "
"bytes left %d", strerror(errno), (int)i_in_bytes );
free( psz_unicode );
return NULL;;
char *p_in_buffer, *p_out_buffer;
size_t i_in_bytes, i_out_bytes, i_out_bytes_left, i_ret;
i_in_bytes = strlen( psz_string );
i_out_bytes = i_in_bytes * sizeof( uint32_t );
i_out_bytes_left = i_out_bytes;
p_in_buffer = (char *) psz_string;
p_out_buffer = (char *) *ppsz_unicode;
i_ret = vlc_iconv( iconv_handle, (const char**)&p_in_buffer,
&i_in_bytes, &p_out_buffer, &i_out_bytes_left );
vlc_iconv_close( iconv_handle );
if( i_in_bytes )
{
msg_Warn( p_filter, "failed to convert string to unicode (%s), "
"bytes left %d", strerror(errno), (int)i_in_bytes );
}
else
{
*(uint32_t*)p_out_buffer = 0;
*i_string_length =
(i_out_bytes - i_out_bytes_left) / sizeof(uint32_t);
}
}
*(uint32_t*)p_out_buffer = 0;
i_string_length = (i_out_bytes - i_out_bytes_left) / sizeof(uint32_t);
}
#if defined(HAVE_FRIBIDI)
{
uint32_t *p_fribidi_string;
p_fribidi_string = malloc( (i_string_length + 1) * sizeof(uint32_t) );
if( !p_fribidi_string )
else
{
msg_Err( p_filter, "out of memory" );
free( psz_unicode );
return NULL;
msg_Warn( p_filter, "unable to do conversion" );
}
}
}
/* Do bidi conversion line-by-line */
FriBidiCharType base_dir = FRIBIDI_TYPE_LTR;
fribidi_log2vis((FriBidiChar*)psz_unicode, i_string_length,
&base_dir, (FriBidiChar*)p_fribidi_string, 0, 0, 0);
static ft_style_t *GetStyleFromFontStack( filter_sys_t *p_sys,
font_stack_t **p_fonts, vlc_bool_t b_bold, vlc_bool_t b_italic,
vlc_bool_t b_uline )
{
ft_style_t *p_style = NULL;
free( psz_unicode );
psz_unicode = p_fribidi_string;
p_fribidi_string[ i_string_length ] = 0;
char *psz_fontname = NULL;
int i_font_color = p_sys->i_font_color;
int i_font_alpha = 0;
int i_font_size = p_sys->i_font_size;
if( VLC_SUCCESS == PeekFont( p_fonts, &psz_fontname, &i_font_size,
&i_font_color, &i_font_alpha ) )
{
p_style = CreateStyle( psz_fontname, i_font_size, i_font_color,
i_font_alpha, b_bold, b_italic, b_uline );
}
#endif
return psz_unicode;
return p_style;
}
static int RenderTag( filter_t *p_filter, FT_Face p_face, int i_font_color,
vlc_bool_t b_uline, line_desc_t *p_line, uint32_t *psz_unicode,
int *pi_pen_x, int i_pen_y, int *pi_start,
FT_Vector *p_result )
vlc_bool_t b_uline, line_desc_t *p_line,
uint32_t *psz_unicode, int *pi_pen_x, int i_pen_y,
int *pi_start, FT_Vector *p_result )
{
FT_BBox line;
int i_yMin, i_yMax;
int i;
vlc_bool_t b_first_on_line = VLC_TRUE;
int i_previous = 0;
int i_pen_x_start = *pi_pen_x;
......@@ -1333,7 +1396,8 @@ static int RenderTag( filter_t *p_filter, FT_Face p_face, int i_font_color,
{
FT_BBox glyph_size;
FT_Glyph_Get_CBox( (FT_Glyph) p_line->pp_glyphs[ i ], ft_glyph_bbox_pixels, &glyph_size );
FT_Glyph_Get_CBox( (FT_Glyph) p_line->pp_glyphs[ i ],
ft_glyph_bbox_pixels, &glyph_size );
line.xMax = p_line->p_glyph_pos[ i ].x + glyph_size.xMax -
glyph_size.xMin + p_line->pp_glyphs[ i ]->left;
......@@ -1343,7 +1407,10 @@ static int RenderTag( filter_t *p_filter, FT_Face p_face, int i_font_color,
i_yMin = line.yMin;
i_yMax = line.yMax;
while( *psz_unicode && ( *psz_unicode != 0xffff ) )
if( line.xMax > 0 )
b_first_on_line = VLC_FALSE;
while( *psz_unicode && ( *psz_unicode != '\n' ) )
{
FT_BBox glyph_size;
FT_Glyph tmp_glyph;
......@@ -1364,14 +1431,16 @@ static int RenderTag( filter_t *p_filter, FT_Face p_face, int i_font_color,
i_error = FT_Load_Glyph( p_face, i_glyph_index, FT_LOAD_DEFAULT );
if( i_error )
{
msg_Err( p_filter, "unable to render text FT_Load_Glyph returned %d", i_error );
msg_Err( p_filter,
"unable to render text FT_Load_Glyph returned %d", i_error );
p_line->pp_glyphs[ i ] = NULL;
return VLC_EGENERIC;
}
i_error = FT_Get_Glyph( p_face->glyph, &tmp_glyph );
if( i_error )
{
msg_Err( p_filter, "unable to render text FT_Get_Glyph returned %d", i_error );
msg_Err( p_filter,
"unable to render text FT_Get_Glyph returned %d", i_error );
p_line->pp_glyphs[ i ] = NULL;
return VLC_EGENERIC;
}
......@@ -1384,17 +1453,21 @@ static int RenderTag( filter_t *p_filter, FT_Face p_face, int i_font_color,
}
if( b_uline )
{
float aOffset = FT_FLOOR(FT_MulFix(p_face->underline_position, p_face->size->metrics.y_scale));
float aSize = FT_CEIL(FT_MulFix(p_face->underline_thickness, p_face->size->metrics.y_scale));
p_line->pi_underline_offset[ i ] = ( aOffset < 0 ) ? -aOffset : aOffset;
p_line->pi_underline_thickness[ i ] = ( aSize < 0 ) ? -aSize : aSize;
float aOffset = FT_FLOOR(FT_MulFix(p_face->underline_position,
p_face->size->metrics.y_scale));
float aSize = FT_CEIL(FT_MulFix(p_face->underline_thickness,
p_face->size->metrics.y_scale));
p_line->pi_underline_offset[ i ] =
( aOffset < 0 ) ? -aOffset : aOffset;
p_line->pi_underline_thickness[ i ] =
( aSize < 0 ) ? -aSize : aSize;
}
p_line->pp_glyphs[ i ] = (FT_BitmapGlyph)tmp_glyph;
p_line->p_rgb[ i ] = i_font_color & 0x00ffffff;
line.xMax = p_line->p_glyph_pos[i].x + glyph_size.xMax -
glyph_size.xMin + ((FT_BitmapGlyph)tmp_glyph)->left;
glyph_size.xMin + ((FT_BitmapGlyph)tmp_glyph)->left;
if( line.xMax > (int)p_filter->fmt_out.video.i_visible_width - 20 )
{
while( --i > *pi_start )
......@@ -1408,13 +1481,29 @@ static int RenderTag( filter_t *p_filter, FT_Face p_face, int i_font_color,
}
if( psz_unicode == psz_unicode_start )
{
msg_Warn( p_filter, "unbreakable string" );
if( b_first_on_line )
{
msg_Warn( p_filter, "unbreakable string" );
p_line->pp_glyphs[ i ] = NULL;
return VLC_EGENERIC;
}
*pi_pen_x = i_pen_x_start;
p_line->i_width = line.xMax;
p_line->i_height = __MAX( p_line->i_height,
p_face->size->metrics.height >> 6 );
p_line->pp_glyphs[ i ] = NULL;
return VLC_EGENERIC;
p_result->x = __MAX( p_result->x, line.xMax );
p_result->y = __MAX( p_result->y, __MAX( p_line->i_height,
i_yMax - i_yMin ) );
*pi_start = i;
return VLC_SUCCESS;
}
else
{
*psz_unicode = 0xffff;
*psz_unicode = '\n';
}
psz_unicode = psz_unicode_start;
*pi_pen_x = i_pen_x_start;
......@@ -1433,11 +1522,13 @@ static int RenderTag( filter_t *p_filter, FT_Face p_face, int i_font_color,
i++;
}
p_line->i_width = line.xMax;
p_line->i_height = __MAX( p_line->i_height, p_face->size->metrics.height >> 6 );
p_line->i_height = __MAX( p_line->i_height,
p_face->size->metrics.height >> 6 );
p_line->pp_glyphs[ i ] = NULL;
p_result->x = __MAX( p_result->x, line.xMax );
p_result->y = __MAX( p_result->y, __MAX( p_line->i_height, line.yMax - line.yMin ) );
p_result->y = __MAX( p_result->y, __MAX( p_line->i_height,
line.yMax - line.yMin ) );
*pi_start = i;
......@@ -1459,38 +1550,161 @@ static int RenderTag( filter_t *p_filter, FT_Face p_face, int i_font_color,
return VLC_SUCCESS;
}
static int ProcessNodes( filter_t *p_filter, xml_reader_t *p_xml_reader, char *psz_html, text_style_t *p_font_style, line_desc_t **p_lines, FT_Vector *p_result )
static int HandleFontAttributes( xml_reader_t *p_xml_reader,
font_stack_t **p_fonts )
{
filter_sys_t *p_sys = p_filter->p_sys;
int rv;
char *psz_fontname = NULL;
int i_font_color = 0xffffff;
int i_font_alpha = 0;
int i_font_size = 24;
/* Default all attributes to the top font in the stack -- in case not
* all attributes are specified in the sub-font
*/
if( VLC_SUCCESS == PeekFont( p_fonts,
&psz_fontname,
&i_font_size,
&i_font_color,
&i_font_alpha ))
{
psz_fontname = strdup( psz_fontname );
}
FT_Vector tmp_result;
while ( xml_ReaderNextAttr( p_xml_reader ) == VLC_SUCCESS )
{
char *psz_name = xml_ReaderName ( p_xml_reader );
char *psz_value = xml_ReaderValue ( p_xml_reader );
font_stack_t *p_fonts = NULL;
vlc_bool_t b_italic = VLC_FALSE;
vlc_bool_t b_bold = VLC_FALSE;
vlc_bool_t b_uline = VLC_FALSE;
if( psz_name && psz_value )
{
if( !strcasecmp( "face", psz_name ) )
{
if( psz_fontname ) free( psz_fontname );
psz_fontname = strdup( psz_value );
}
else if( !strcasecmp( "size", psz_name ) )
{
if( ( *psz_value == '+' ) || ( *psz_value == '-' ) )
{
int i_value = atoi( psz_value );
if( ( i_value >= -5 ) && ( i_value <= 5 ) )
i_font_size += ( i_value * i_font_size ) / 10;
else if( i_value < -5 )
i_font_size = - i_value;
else if( i_value > 5 )
i_font_size = i_value;
}
else
i_font_size = atoi( psz_value );
}
else if( !strcasecmp( "color", psz_name ) &&
( psz_value[0] == '#' ) )
{
i_font_color = strtol( psz_value + 1, NULL, 16 );
i_font_color &= 0x00ffffff;
}
else if( !strcasecmp( "alpha", psz_name ) &&
( psz_value[0] == '#' ) )
{
i_font_alpha = strtol( psz_value + 1, NULL, 16 );
i_font_alpha &= 0xff;
}
free( psz_name );
free( psz_value );
}
}
rv = PushFont( p_fonts,
psz_fontname,
i_font_size,
i_font_color,
i_font_alpha );
line_desc_t *p_line = NULL;
line_desc_t *p_prev = NULL;
free( psz_fontname );
char *psz_node = NULL;
return rv;
}
int i_pen_x = 0;
int i_pen_y = 0;
int i_posn = 0;
static void SetupLine( filter_t *p_filter, const char *psz_text_in,
uint32_t **psz_text_out, uint32_t *pi_runs,
uint32_t **ppi_run_lengths, ft_style_t ***ppp_styles,
ft_style_t *p_style )
{
uint32_t i_string_length = 0;
int rv = VLC_SUCCESS;
IconvText( p_filter, psz_text_in, &i_string_length, psz_text_out );
*psz_text_out += i_string_length;
p_result->x = p_result->y = 0;
tmp_result.x = tmp_result.y = 0;
if( ppp_styles && ppi_run_lengths )
{
(*pi_runs)++;
if( *ppp_styles )
{
*ppp_styles = (ft_style_t **)
realloc( *ppp_styles, *pi_runs * sizeof( ft_style_t * ) );
}
else if( *pi_runs == 1 )
{
*ppp_styles = (ft_style_t **)
malloc( *pi_runs * sizeof( ft_style_t * ) );
}
/* We have just malloc'ed this memory successfully -
* *pi_runs HAS to be within the memory area of *ppp_styles */
if( *ppp_styles )
{
(*ppp_styles)[ *pi_runs - 1 ] = p_style;
p_style = NULL;
}
if( *ppi_run_lengths )
{
*ppi_run_lengths = (uint32_t *)
realloc( *ppi_run_lengths, *pi_runs * sizeof( uint32_t ) );
}
else if( *pi_runs == 1 )
{
*ppi_run_lengths = (uint32_t *)
malloc( *pi_runs * sizeof( uint32_t ) );
}
/* same remarks here */
if( *ppi_run_lengths )
{
(*ppi_run_lengths)[ *pi_runs - 1 ] = i_string_length;
}
}
/* If we couldn't use the p_style argument due to memory allocation
* problems above, release it here.
*/
if( p_style ) DeleteStyle( p_style );
}
static int ProcessNodes( filter_t *p_filter, xml_reader_t *p_xml_reader,
text_style_t *p_font_style, uint32_t *psz_text,
int *pi_len, uint32_t *pi_runs,
uint32_t **ppi_run_lengths, ft_style_t ***ppp_styles)
{
int rv = VLC_SUCCESS;
filter_sys_t *p_sys = p_filter->p_sys;
uint32_t *psz_text_orig = psz_text;
font_stack_t *p_fonts = NULL;
char *psz_node = NULL;
vlc_bool_t b_italic = VLC_FALSE;
vlc_bool_t b_bold = VLC_FALSE;
vlc_bool_t b_uline = VLC_FALSE;
if( p_font_style )
{
PushFont( &p_fonts,
p_font_style->psz_fontname,
p_font_style->i_font_size,
p_font_style->i_font_color,
p_font_style->i_font_alpha );
rv = PushFont( &p_fonts,
p_font_style->psz_fontname,
p_font_style->i_font_size,
p_font_style->i_font_color,
p_font_style->i_font_alpha );
if( p_font_style->i_style_flags & STYLE_BOLD )
b_bold = VLC_TRUE;
......@@ -1501,10 +1715,16 @@ static int ProcessNodes( filter_t *p_filter, xml_reader_t *p_xml_reader, char *p
}
else
{
PushFont( &p_fonts, FC_DEFAULT_FONT, p_sys->i_font_size, 0xffffff, 0 );
rv = PushFont( &p_fonts,
FC_DEFAULT_FONT,
p_sys->i_font_size,
0xffffff,
0 );
}
if( rv != VLC_SUCCESS )
return rv;
while ( ( xml_ReaderRead( p_xml_reader ) == 1 ) && ( rv == VLC_SUCCESS ) )
while ( ( xml_ReaderRead( p_xml_reader ) == 1 ) )
{
switch ( xml_ReaderNodeType( p_xml_reader ) )
{
......@@ -1532,92 +1752,24 @@ static int ProcessNodes( filter_t *p_filter, xml_reader_t *p_xml_reader, char *p
if( psz_node )
{
if( !strcasecmp( "font", psz_node ) )
{
char *psz_fontname = NULL;
int i_font_color = 0xffffff;
int i_font_alpha = 0;
int i_font_size = 24;
/* Default all attributes to the top font in the stack -- in case not
* all attributes are specified in the sub-font
*/
if( VLC_SUCCESS == PeekFont( &p_fonts, &psz_fontname, &i_font_size, &i_font_color, &i_font_alpha ))
{
psz_fontname = strdup( psz_fontname );
}
while ( xml_ReaderNextAttr( p_xml_reader ) == VLC_SUCCESS )
{
char *psz_name = xml_ReaderName