*
* Authors: Sigmund Augdal Helberg <dnumgis@videolan.org>
* Gildas Bazin <gbazin@videolan.org>
- * Bernie Purcell <b dot purcell at adbglobal dot com>
+ * Bernie Purcell <bitmap@videolan.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <stdlib.h> /* malloc(), free() */
#include <string.h>
#ifdef HAVE_LINUX_LIMITS_H
#include <vlc_filter.h>
#include <vlc_stream.h>
#include <vlc_xml.h>
+#include <vlc_input.h>
#include <math.h>
static int Create ( vlc_object_t * );
static void Destroy( vlc_object_t * );
+static int LoadFontsFromAttachments( filter_t *p_filter );
+
/* The RenderText call maps to pf_render_string, defined in vlc_filter.h */
static int RenderText( filter_t *, subpicture_region_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 GetFontSize( filter_t *p_filter );
static int SetFontSize( filter_t *, int );
+static void YUVFromRGB( uint32_t i_argb,
+ uint8_t *pi_y, uint8_t *pi_u, uint8_t *pi_v );
/*****************************************************************************
* Module descriptor
"relative size will be overriden." )
static int pi_sizes[] = { 20, 18, 16, 12, 6 };
-static char *ppsz_sizes_text[] = { N_("Smaller"), N_("Small"), N_("Normal"),
- N_("Large"), N_("Larger") };
+static const char *ppsz_sizes_text[] = { N_("Smaller"), N_("Small"), N_("Normal"),
+ N_("Large"), N_("Larger") };
#define YUVP_TEXT N_("Use YUVP renderer")
#define YUVP_LONGTEXT N_("This renders the font using \"paletized YUV\". " \
"This option is only needed if you want to encode into DVB subtitles" )
#define EFFECT_OUTLINE_FAT 3
static int pi_effects[] = { 1, 2, 3 };
-static char *ppsz_effects_text[] = { N_("Background"),N_("Outline"),
- N_("Fat Outline") };
+static const char *ppsz_effects_text[] = { N_("Background"),N_("Outline"),
+ N_("Fat Outline") };
static int pi_color_values[] = {
0x00000000, 0x00808080, 0x00C0C0C0, 0x00FFFFFF, 0x00800000,
0x00FF0000, 0x00FF00FF, 0x00FFFF00, 0x00808000, 0x00008000, 0x00008080,
0x0000FF00, 0x00800080, 0x00000080, 0x000000FF, 0x0000FFFF };
-static char *ppsz_color_descriptions[] = {
+static const char *ppsz_color_descriptions[] = {
N_("Black"), N_("Gray"), N_("Silver"), N_("White"), N_("Maroon"),
N_("Red"), N_("Fuchsia"), N_("Yellow"), N_("Olive"), N_("Green"), N_("Teal"),
N_("Lime"), N_("Purple"), N_("Navy"), N_("Blue"), N_("Aqua") };
* -- if the rendering mode supports it (RenderYUVA) and
* b_new_color_mode is set, then it becomes possible to
* have multicoloured text within the subtitles. */
- uint32_t *p_rgb;
+ uint32_t *p_fg_rgb;
+ uint32_t *p_bg_rgb;
+ uint8_t *p_fg_bg_ratio; /* 0x00=100% FG --> 0x7F=100% BG */
vlc_bool_t b_new_color_mode;
/** underline information -- only supplied if text should be underlined */
uint16_t *pi_underline_offset;
{
char *psz_name;
int i_size;
- int i_color;
- int i_alpha;
+ uint32_t i_color; /* ARGB */
+ uint32_t i_karaoke_bg_color; /* ARGB */
font_stack_t *p_next;
};
+typedef struct
+{
+ int i_font_size;
+ uint32_t i_font_color; /* ARGB */
+ uint32_t i_karaoke_bg_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 * );
#ifdef HAVE_FONTCONFIG
FcConfig *p_fontconfig;
#endif
+
+ input_attachment_t **pp_font_attachments;
+ int i_font_attachments;
};
/*****************************************************************************
{
if( psz_fontfile ) free( psz_fontfile );
psz_fontfile = (char *)malloc( PATH_MAX + 1 );
+ if( !psz_fontfile )
+ {
+ msg_Err( p_filter, "out of memory" );
+ goto error;
+ }
#ifdef WIN32
GetWindowsDirectory( psz_fontfile, PATH_MAX + 1 );
strcat( psz_fontfile, "\\fonts\\arial.ttf" );
-#elif __APPLE__
+#elif defined(__APPLE__)
strcpy( psz_fontfile, DEFAULT_FONT );
#else
msg_Err( p_filter, "user didn't specify a font" );
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 )
if( SetFontSize( p_filter, 0 ) != VLC_SUCCESS ) goto error;
if( psz_fontfile ) free( psz_fontfile );
+
+ p_sys->pp_font_attachments = NULL;
+ p_sys->i_font_attachments = 0;
+
p_filter->pf_render_text = RenderText;
#ifdef HAVE_FONTCONFIG
p_filter->pf_render_html = RenderHtml;
#else
p_filter->pf_render_html = NULL;
#endif
+
+ LoadFontsFromAttachments( p_filter );
+
return VLC_SUCCESS;
error:
filter_t *p_filter = (filter_t *)p_this;
filter_sys_t *p_sys = p_filter->p_sys;
+ if( p_sys->pp_font_attachments )
+ {
+ int k;
+
+ for( k = 0; k < p_sys->i_font_attachments; k++ )
+ {
+ vlc_input_attachment_Delete( p_sys->pp_font_attachments[k] );
+ }
+
+ free( p_sys->pp_font_attachments );
+ }
+
#ifdef HAVE_FONTCONFIG
FcConfigDestroy( p_sys->p_fontconfig );
p_sys->p_fontconfig = NULL;
free( p_sys );
}
+/*****************************************************************************
+ * Make any TTF/OTF fonts present in the attachments of the media file
+ * and store them for later use by the FreeType Engine
+ *****************************************************************************/
+static int LoadFontsFromAttachments( filter_t *p_filter )
+{
+ filter_sys_t *p_sys = p_filter->p_sys;
+ input_thread_t *p_input;
+ input_attachment_t **pp_attachments;
+ int i_attachments_cnt;
+ int k;
+ int rv = VLC_SUCCESS;
+
+ p_input = (input_thread_t *)vlc_object_find( p_filter, VLC_OBJECT_INPUT, FIND_PARENT );
+ if( ! p_input )
+ return VLC_EGENERIC;
+
+ if( VLC_SUCCESS != input_Control( p_input, INPUT_GET_ATTACHMENTS, &pp_attachments, &i_attachments_cnt ))
+ return VLC_EGENERIC;
+
+ p_sys->i_font_attachments = 0;
+ p_sys->pp_font_attachments = malloc( i_attachments_cnt * sizeof( input_attachment_t * ));
+ if(! p_sys->pp_font_attachments )
+ rv = VLC_ENOMEM;
+
+ for( k = 0; k < i_attachments_cnt; k++ )
+ {
+ input_attachment_t *p_attach = pp_attachments[k];
+
+ if( p_sys->pp_font_attachments )
+ {
+ if(( !strcmp( p_attach->psz_mime, "application/x-truetype-font" ) || // TTF
+ !strcmp( p_attach->psz_mime, "application/x-font-otf" ) ) && // OTF
+ ( p_attach->i_data > 0 ) &&
+ ( p_attach->p_data != NULL ) )
+ {
+ p_sys->pp_font_attachments[ p_sys->i_font_attachments++ ] = p_attach;
+ }
+ else
+ {
+ vlc_input_attachment_Delete( p_attach );
+ }
+ }
+ else
+ {
+ vlc_input_attachment_Delete( p_attach );
+ }
+ }
+ free( pp_attachments );
+
+ return rv;
+}
+
/*****************************************************************************
* Render: place string in picture
*****************************************************************************
if( p_line->i_width < i_width )
{
- if( ( p_region->p_style && p_region->p_style->i_text_align == SUBPICTURE_ALIGN_RIGHT ) ||
- ( !p_region->p_style && (p_region->i_align & 0x3) == SUBPICTURE_ALIGN_RIGHT ) )
+ if( (p_region->i_align & 0x3) == SUBPICTURE_ALIGN_RIGHT )
{
i_align_offset = i_width - p_line->i_width;
}
- else if( ( p_region->p_style && p_region->p_style->i_text_align != SUBPICTURE_ALIGN_LEFT ) ||
- ( !p_region->p_style && (p_region->i_align & 0x3) != SUBPICTURE_ALIGN_LEFT ) )
+ else if( (p_region->i_align & 0x3) != SUBPICTURE_ALIGN_LEFT )
{
i_align_offset = ( i_width - p_line->i_width ) / 2;
}
if( p_line->i_width < i_width )
{
- if( ( p_region->p_style && p_region->p_style->i_text_align == SUBPICTURE_ALIGN_RIGHT ) ||
- ( !p_region->p_style && (p_region->i_align & 0x3) == SUBPICTURE_ALIGN_RIGHT ) )
+ if( (p_region->i_align & 0x3) == SUBPICTURE_ALIGN_RIGHT )
{
i_align_offset = i_width - p_line->i_width;
}
- else if( ( p_region->p_style && p_region->p_style->i_text_align != SUBPICTURE_ALIGN_LEFT ) ||
- ( !p_region->p_style && (p_region->i_align & 0x3) != SUBPICTURE_ALIGN_LEFT ) )
+ else if( (p_region->i_align & 0x3) != SUBPICTURE_ALIGN_LEFT )
{
i_align_offset = ( i_width - p_line->i_width ) / 2;
}
free( p_region_tmp );
/* Calculate text color components */
- i_y = (uint8_t)__MIN(abs( 2104 * p_line->i_red + 4130 * p_line->i_green +
- 802 * p_line->i_blue + 4096 + 131072 ) >> 13, 235);
- i_u = (uint8_t)__MIN(abs( -1214 * p_line->i_red + -2384 * p_line->i_green +
- 3598 * p_line->i_blue + 4096 + 1048576) >> 13, 240);
- i_v = (uint8_t)__MIN(abs( 3598 * p_line->i_red + -3013 * p_line->i_green +
- -585 * p_line->i_blue + 4096 + 1048576) >> 13, 240);
+ YUVFromRGB( (p_line->i_red << 16) |
+ (p_line->i_green << 8) |
+ (p_line->i_blue ),
+ &i_y, &i_u, &i_v);
i_alpha = p_line->i_alpha;
p_dst_y = p_region->picture.Y_PIXELS;
if( p_line->i_width < i_width )
{
- if( ( p_region->p_style && p_region->p_style->i_text_align == SUBPICTURE_ALIGN_RIGHT ) ||
- ( !p_region->p_style && (p_region->i_align & 0x3) == SUBPICTURE_ALIGN_RIGHT ) )
+ if( (p_region->i_align & 0x3) == SUBPICTURE_ALIGN_RIGHT )
{
i_align_offset = i_width - p_line->i_width;
}
- else if( ( p_region->p_style && p_region->p_style->i_text_align != SUBPICTURE_ALIGN_LEFT ) ||
- ( !p_region->p_style && (p_region->i_align & 0x3) != SUBPICTURE_ALIGN_LEFT ) )
+ else if( (p_region->i_align & 0x3) != SUBPICTURE_ALIGN_LEFT )
{
i_align_offset = ( i_width - p_line->i_width ) / 2;
}
if( p_line->b_new_color_mode )
{
/* Every glyph can (and in fact must) have its own color */
- int i_red = ( p_line->p_rgb[ i ] & 0x00ff0000 ) >> 16;
- int i_green = ( p_line->p_rgb[ i ] & 0x0000ff00 ) >> 8;
- int i_blue = ( p_line->p_rgb[ i ] & 0x000000ff );
-
- i_y = (uint8_t)__MIN(abs( 2104 * i_red + 4130 * i_green +
- 802 * i_blue + 4096 + 131072 ) >> 13, 235);
- i_u = (uint8_t)__MIN(abs( -1214 * i_red + -2384 * i_green +
- 3598 * i_blue + 4096 + 1048576) >> 13, 240);
- i_v = (uint8_t)__MIN(abs( 3598 * i_red + -3013 * i_green +
- -585 * i_blue + 4096 + 1048576) >> 13, 240);
+ YUVFromRGB( p_line->p_fg_rgb[ i ], &i_y, &i_u, &i_v );
}
for( y = 0, i_bitmap_offset = 0; y < p_glyph->bitmap.rows; y++ )
{
for( x = 0; x < p_glyph->bitmap.width; x++, i_bitmap_offset++ )
{
+ uint8_t i_y_local = i_y;
+ uint8_t i_u_local = i_u;
+ uint8_t i_v_local = i_v;
+
+ if( p_line->p_fg_bg_ratio != 0x00 )
+ {
+ int i_split = p_glyph->bitmap.width *
+ p_line->p_fg_bg_ratio[ i ] / 0x7f;
+
+ if( x > i_split )
+ {
+ YUVFromRGB( p_line->p_bg_rgb[ i ],
+ &i_y_local, &i_u_local, &i_v_local );
+ }
+ }
+
if( p_glyph->bitmap.buffer[i_bitmap_offset] )
{
p_dst_y[i_offset+x] = ((p_dst_y[i_offset+x] *(255-(int)p_glyph->bitmap.buffer[i_bitmap_offset])) +
subpicture_region_t *p_region_in )
{
filter_sys_t *p_sys = p_filter->p_sys;
- line_desc_t *p_lines = 0, *p_line = 0, *p_next = 0, *p_prev = 0;
+ line_desc_t *p_lines = NULL, *p_line = NULL, *p_next = NULL, *p_prev = NULL;
int i, i_pen_y, i_pen_x, i_error, i_glyph_index, i_previous;
- uint32_t *psz_unicode, *psz_unicode_orig = 0, i_char, *psz_line_start;
+ uint32_t *psz_unicode, *psz_unicode_orig = NULL, i_char, *psz_line_start;
int i_string_length;
char *psz_string;
vlc_iconv_t iconv_handle = (vlc_iconv_t)(-1);
int i_font_color, i_font_alpha, i_font_size, i_red, i_green, i_blue;
+ vlc_value_t val;
+ int i_scale = 1000;
FT_BBox line;
FT_BBox glyph_size;
psz_string = p_region_in->psz_text;
if( !psz_string || !*psz_string ) return VLC_EGENERIC;
+ if( VLC_SUCCESS == var_Get( p_filter, "scale", &val ))
+ i_scale = val.i_int;
+
if( p_region_in->p_style )
{
i_font_color = __MAX( __MIN( p_region_in->p_style->i_font_color, 0xFFFFFF ), 0 );
i_font_alpha = __MAX( __MIN( p_region_in->p_style->i_font_alpha, 255 ), 0 );
- i_font_size = __MAX( __MIN( p_region_in->p_style->i_font_size, 255 ), 0 );
+ i_font_size = __MAX( __MIN( p_region_in->p_style->i_font_size, 255 ), 0 ) * i_scale / 1000;
}
else
{
i_font_color = p_sys->i_font_color;
i_font_alpha = 255 - p_sys->i_font_opacity;
- i_font_size = p_sys->i_default_font_size;
+ i_font_size = p_sys->i_default_font_size * i_scale / 1000;
}
if( i_font_color == 0xFFFFFF ) i_font_color = p_sys->i_font_color;
int start_pos, pos = 0;
p_fribidi_string = malloc( (i_string_length + 1) * sizeof(uint32_t) );
+ if( !p_fribidi_string )
+ {
+ msg_Err( p_filter, "out of memory" );
+ goto error;
+ }
/* Do bidi conversion line-by-line */
while(pos < i_string_length)
/* 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;
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;
{
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;
}
#ifdef HAVE_FONTCONFIG
-static int PushFont( font_stack_t **p_font, char *psz_name, int i_size,
- int i_color, int i_alpha )
+static ft_style_t *CreateStyle( char *psz_fontname, int i_font_size,
+ uint32_t i_font_color, uint32_t i_karaoke_bg_color, 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;
+ p_style->i_karaoke_bg_color = i_karaoke_bg_color;
+ p_style->b_italic = b_italic;
+ p_style->b_bold = b_bold;
+ p_style->b_underline = b_uline;
+
+ 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,
+ uint32_t i_color, uint32_t i_karaoke_bg_color )
{
font_stack_t *p_new;
return VLC_EGENERIC;
p_new = malloc( sizeof( font_stack_t ) );
+ if( ! p_new )
+ return VLC_ENOMEM;
+
p_new->p_next = NULL;
if( psz_name )
else
p_new->psz_name = NULL;
- p_new->i_size = i_size;
- p_new->i_color = i_color;
- p_new->i_alpha = i_alpha;
+ p_new->i_size = i_size;
+ p_new->i_color = i_color;
+ p_new->i_karaoke_bg_color = i_karaoke_bg_color;
if( !*p_font )
{
}
static int PeekFont( font_stack_t **p_font, char **psz_name, int *i_size,
- int *i_color, int *i_alpha )
+ uint32_t *i_color, uint32_t *i_karaoke_bg_color )
{
font_stack_t *p_last;
p_last=p_last->p_next )
;
- *psz_name = p_last->psz_name;
- *i_size = p_last->i_size;
- *i_color = p_last->i_color;
- *i_alpha = p_last->i_alpha;
+ *psz_name = p_last->psz_name;
+ *i_size = p_last->i_size;
+ *i_color = p_last->i_color;
+ *i_karaoke_bg_color = p_last->i_karaoke_bg_color;
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);
+ }
+ }
+ else
+ {
+ msg_Warn( p_filter, "unable to do conversion" );
}
- *(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) );
+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;
- /* 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);
+ char *psz_fontname = NULL;
+ uint32_t i_font_color = p_sys->i_font_color & 0x00ffffff;
+ uint32_t i_karaoke_bg_color = i_font_color;
+ int i_font_size = p_sys->i_font_size;
- free( psz_unicode );
- psz_unicode = p_fribidi_string;
- p_fribidi_string[ i_string_length ] = 0;
+ if( VLC_SUCCESS == PeekFont( p_fonts, &psz_fontname, &i_font_size,
+ &i_font_color, &i_karaoke_bg_color ))
+ {
+ p_style = CreateStyle( psz_fontname, i_font_size, i_font_color,
+ i_karaoke_bg_color, 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,
+ vlc_bool_t b_uline, int i_karaoke_bgcolor,
+ 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;
{
FT_BBox glyph_size;
- FT_Glyph_Get_CBox( 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;
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;
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;
}
}
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;
+ p_line->p_fg_rgb[ i ] = i_font_color & 0x00ffffff;
+ p_line->p_bg_rgb[ i ] = i_karaoke_bgcolor & 0x00ffffff;
+ p_line->p_fg_bg_ratio[ i ] = 0x00;
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 )
}
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;
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;
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, int i_scale )
{
- filter_sys_t *p_sys = p_filter->p_sys;
+ int rv;
+ char *psz_fontname = NULL;
+ uint32_t i_font_color = 0xffffff;
+ int i_font_alpha = 0;
+ uint32_t i_karaoke_bg_color = 0x00ffffff;
+ 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_karaoke_bg_color ))
+ {
+ psz_fontname = strdup( psz_fontname );
+ i_font_size = i_font_size * 1000 / i_scale;
+ }
+ i_font_alpha = (i_font_color >> 24) & 0xff;
+ i_font_color &= 0x00ffffff;
- 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_scale / 1000,
+ (i_font_color & 0xffffff) | ((i_font_alpha & 0xff) << 24),
+ i_karaoke_bg_color );
- 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 void SetKaraokeLen( uint32_t i_runs, uint32_t *pi_run_lengths,
+ uint32_t i_k_runs, uint32_t *pi_k_run_lengths )
+{
+ /* Karaoke tags _PRECEDE_ the text they specify a duration
+ * for, therefore we are working out the length for the
+ * previous tag, and first time through we have nothing
+ */
+ if( pi_k_run_lengths )
+ {
+ int i_chars = 0;
+ uint32_t i;
+
+ /* Work out how many characters are presently in the string
+ */
+ for( i = 0; i < i_runs; i++ )
+ i_chars += pi_run_lengths[ i ];
+
+ /* Subtract away those we've already allocated to other
+ * karaoke tags
+ */
+ for( i = 0; i < i_k_runs; i++ )
+ i_chars -= pi_k_run_lengths[ i ];
+ pi_k_run_lengths[ i_k_runs - 1 ] = i_chars;
+ }
+}
+
+static void SetupKaraoke( xml_reader_t *p_xml_reader, uint32_t *pi_k_runs,
+ uint32_t **ppi_k_run_lengths,
+ uint32_t **ppi_k_durations )
+{
+ while ( xml_ReaderNextAttr( p_xml_reader ) == VLC_SUCCESS )
+ {
+ char *psz_name = xml_ReaderName( p_xml_reader );
+ char *psz_value = xml_ReaderValue( p_xml_reader );
+
+ if( psz_name && psz_value &&
+ !strcasecmp( "t", psz_name ) )
+ {
+ if( ppi_k_durations && ppi_k_run_lengths )
+ {
+ (*pi_k_runs)++;
+
+ if( *ppi_k_durations )
+ {
+ *ppi_k_durations = (uint32_t *)
+ realloc( *ppi_k_durations,
+ *pi_k_runs * sizeof( uint32_t ) );
+ }
+ else if( *pi_k_runs == 1 )
+ {
+ *ppi_k_durations = (uint32_t *)
+ malloc( *pi_k_runs * sizeof( uint32_t ) );
+ }
+
+ if( *ppi_k_run_lengths )
+ {
+ *ppi_k_run_lengths = (uint32_t *)
+ realloc( *ppi_k_run_lengths,
+ *pi_k_runs * sizeof( uint32_t ) );
+ }
+ else if( *pi_k_runs == 1 )
+ {
+ *ppi_k_run_lengths = (uint32_t *)
+ malloc( *pi_k_runs * sizeof( uint32_t ) );
+ }
+ if( *ppi_k_durations )
+ (*ppi_k_durations)[ *pi_k_runs - 1 ] = atoi( psz_value );
+
+ if( *ppi_k_run_lengths )
+ (*ppi_k_run_lengths)[ *pi_k_runs - 1 ] = 0;
+ }
+ }
+ if( psz_name ) free( psz_name );
+ if( psz_value ) free( psz_value );
+ }
+}
+
+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,
+
+ vlc_bool_t b_karaoke,
+ uint32_t *pi_k_runs,
+ uint32_t **ppi_k_run_lengths,
+ uint32_t **ppi_k_durations )
+{
+ 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;
+ vlc_value_t val;
+ int i_scale = 1000;
+
+ 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( VLC_SUCCESS == var_Get( p_filter, "scale", &val ))
+ i_scale = val.i_int;
+
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 * i_scale / 1000,
+ (p_font_style->i_font_color & 0xffffff) |
+ ((p_font_style->i_font_alpha & 0xff) << 24),
+ (p_font_style->i_karaoke_background_color & 0xffffff) |
+ ((p_font_style->i_karaoke_background_alpha & 0xff) << 24));
if( p_font_style->i_style_flags & STYLE_BOLD )
b_bold = VLC_TRUE;
}
else
{
- PushFont( &p_fonts, FC_DEFAULT_FONT, 24, 0xffffff, 0 );
+ rv = PushFont( &p_fonts,
+ FC_DEFAULT_FONT,
+ p_sys->i_font_size,
+ 0x00ffffff,
+ 0x00ffffff );
}
+ 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 ) )
{
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 ( p_xml_reader );
- char *psz_value = xml_ReaderValue ( p_xml_reader );
-
- 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 ) )
- {
- 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 );
- }
- }
- PushFont( &p_fonts, psz_fontname, i_font_size, i_font_color, i_font_alpha );
- free( psz_fontname );
- }
+ rv = HandleFontAttributes( p_xml_reader, &p_fonts, i_scale );
else if( !strcasecmp( "b", psz_node ) )
- {
b_bold = VLC_TRUE;
- }
else if( !strcasecmp( "i", psz_node ) )
- {
b_italic = VLC_TRUE;
- }
else if( !strcasecmp( "u", psz_node ) )
- {
b_uline = VLC_TRUE;
- }
else if( !strcasecmp( "br", psz_node ) )
{
- if( p_line )
+ SetupLine( p_filter, "\n", &psz_text,
+ pi_runs, ppi_run_lengths, ppp_styles,
+ GetStyleFromFontStack( p_sys,
+ &p_fonts,
+ b_bold,
+ b_italic,
+ b_uline ) );
+ }
+ else if( !strcasecmp( "k", psz_node ) )
+ {
+ /* Only valid in karaoke */
+ if( b_karaoke )
{
- p_prev = p_line;
- if( !(p_line = NewLine( (byte_t *)psz_html )) )
+ if( *pi_k_runs > 0 )
{
- msg_Err( p_filter, "out of memory" );
- free( psz_node );
- rv = VLC_EGENERIC;
- break;
+ SetKaraokeLen( *pi_runs, *ppi_run_lengths,
+ *pi_k_runs, *ppi_k_run_lengths );
}
- p_line->b_new_color_mode = VLC_TRUE;
- p_result->x = __MAX( p_result->x, tmp_result.x );
- p_result->y += tmp_result.y;
-
- p_line->p_next = NULL;
- i_pen_x = 0;
- i_pen_y += tmp_result.y;
- i_posn = 0;
- p_prev->p_next = p_line;
- tmp_result.x = 0;
- tmp_result.y = 0;
+ SetupKaraoke( p_xml_reader, pi_k_runs,
+ ppi_k_run_lengths, ppi_k_durations );
}
}
+
free( psz_node );
}
break;
psz_node = xml_ReaderValue( p_xml_reader );
if( psz_node )
{
- char *psz_fontname = NULL;
- int i_font_color = 0xffffff;
- int i_font_alpha = 0;
- int i_font_size = 24;
- FT_Face p_face = NULL;
-
- if( VLC_SUCCESS == PeekFont( &p_fonts, &psz_fontname, &i_font_size, &i_font_color, &i_font_alpha ) )
+ /* Turn any multiple-whitespaces into single spaces */
+ char *s = strpbrk( psz_node, "\t\r\n " );
+ while( s )
{
- int i_idx = 0;
- char *psz_fontfile = FontConfig_Select( p_sys->p_fontconfig, psz_fontname, b_bold, b_italic, &i_idx );
+ int i_whitespace = strspn( s, "\t\r\n " );
- if( psz_fontfile )
- {
- if( FT_New_Face( p_sys->p_library, psz_fontfile ? psz_fontfile : "",
- i_idx, &p_face ) )
- {
- free( psz_fontfile );
- free( psz_node );
- rv = VLC_EGENERIC;
- break;
- }
- free( psz_fontfile );
- }
- }
+ if( i_whitespace > 1 )
+ memmove( &s[1],
+ &s[i_whitespace],
+ strlen( s ) - i_whitespace + 1 );
+ *s++ = ' ';
- if( FT_Select_Charmap( p_face ? p_face : p_sys->p_face, ft_encoding_unicode ) ||
- FT_Set_Pixel_Sizes( p_face ? p_face : p_sys->p_face, 0, i_font_size ) )
- {
- free( psz_node );
- rv = VLC_EGENERIC;
- break;
+ s = strpbrk( s, "\t\r\n " );
}
- p_sys->i_use_kerning = FT_HAS_KERNING( ( p_face ? p_face : p_sys->p_face ) );
+ SetupLine( p_filter, psz_node, &psz_text,
+ pi_runs, ppi_run_lengths, ppp_styles,
+ GetStyleFromFontStack( p_sys,
+ &p_fonts,
+ b_bold,
+ b_italic,
+ b_uline ) );
+ free( psz_node );
+ }
+ break;
+ }
+ if( rv != VLC_SUCCESS )
+ {
+ psz_text = psz_text_orig;
+ break;
+ }
+ }
+ if( b_karaoke )
+ {
+ SetKaraokeLen( *pi_runs, *ppi_run_lengths,
+ *pi_k_runs, *ppi_k_run_lengths );
+ }
+
+ *pi_len = psz_text - psz_text_orig;
+
+ while( VLC_SUCCESS == PopFont( &p_fonts ) );
+
+ return rv;
+}
+
+static int CheckForEmbeddedFont( filter_sys_t *p_sys, FT_Face *pp_face, ft_style_t *p_style )
+{
+ int k;
+
+ for( k=0; k < p_sys->i_font_attachments; k++ )
+ {
+ input_attachment_t *p_attach = p_sys->pp_font_attachments[k];
+ int i_font_idx = 0;
+ FT_Face p_face = NULL;
+
+ while( 0 == FT_New_Memory_Face( p_sys->p_library,
+ p_attach->p_data,
+ p_attach->i_data,
+ i_font_idx,
+ &p_face ))
+ {
+ if( p_face )
+ {
+ vlc_bool_t match = !strcasecmp( p_face->family_name,
+ p_style->psz_fontname );
+
+ if( p_face->style_flags & FT_STYLE_FLAG_BOLD )
+ match = match && p_style->b_bold;
+ else
+ match = match && !p_style->b_bold;
+
+ if( p_face->style_flags & FT_STYLE_FLAG_ITALIC )
+ match = match && p_style->b_italic;
+ else
+ match = match && !p_style->b_italic;
+
+ if( match )
+ {
+ *pp_face = p_face;
+ return VLC_SUCCESS;
+ }
+
+ FT_Done_Face( p_face );
+ }
+ i_font_idx++;
+ }
+ }
+ return VLC_EGENERIC;
+}
+
+static int ProcessLines( filter_t *p_filter,
+ uint32_t *psz_text,
+ int i_len,
+
+ uint32_t i_runs,
+ uint32_t *pi_run_lengths,
+ ft_style_t **pp_styles,
+ line_desc_t **pp_lines,
+
+ FT_Vector *p_result,
+
+ vlc_bool_t b_karaoke,
+ uint32_t i_k_runs,
+ uint32_t *pi_k_run_lengths,
+ uint32_t *pi_k_durations )
+{
+ filter_sys_t *p_sys = p_filter->p_sys;
+ ft_style_t **pp_char_styles;
+ int *p_new_positions = NULL;
+ int8_t *p_levels = NULL;
+ uint8_t *pi_karaoke_bar = NULL;
+ uint32_t i, j, k;
+ int i_prev;
+
+ /* Assign each character in the text string its style explicitly, so that
+ * after the characters have been shuffled around by Fribidi, we can re-apply
+ * the styles, and to simplify the calculation of runs within a line.
+ */
+ pp_char_styles = (ft_style_t **) malloc( i_len * sizeof( ft_style_t * ));
+ if( !pp_char_styles )
+ return VLC_ENOMEM;
+
+ if( b_karaoke )
+ {
+ pi_karaoke_bar = (uint8_t *) malloc( i_len * sizeof( uint8_t ));
+ /* If we can't allocate sufficient memory for karaoke, continue anyway -
+ * we just won't be able to display the progress bar; at least we'll
+ * get the text.
+ */
+ }
+
+ i = 0;
+ for( j = 0; j < i_runs; j++ )
+ for( k = 0; k < pi_run_lengths[ j ]; k++ )
+ pp_char_styles[ i++ ] = pp_styles[ j ];
+
+#if defined(HAVE_FRIBIDI)
+ {
+ ft_style_t **pp_char_styles_new;
+ int *p_old_positions;
+ uint32_t *p_fribidi_string;
+ int start_pos, pos = 0;
+
+ pp_char_styles_new = (ft_style_t **)
+ malloc( i_len * sizeof( ft_style_t * ));
+
+ p_fribidi_string = (uint32_t *)
+ malloc( (i_len + 1) * sizeof(uint32_t) );
+ p_old_positions = (int *)
+ malloc( (i_len + 1) * sizeof( int ) );
+ p_new_positions = (int *)
+ malloc( (i_len + 1) * sizeof( int ) );
+ p_levels = (int8_t *)
+ malloc( (i_len + 1) * sizeof( int8_t ) );
+
+ if( ! pp_char_styles_new ||
+ ! p_fribidi_string ||
+ ! p_old_positions ||
+ ! p_new_positions ||
+ ! p_levels )
+ {
+ msg_Err( p_filter, "out of memory" );
+ if( p_levels ) free( p_levels );
+ if( p_old_positions ) free( p_old_positions );
+ if( p_new_positions ) free( p_new_positions );
+ if( p_fribidi_string ) free( p_fribidi_string );
+ if( pp_char_styles_new ) free( pp_char_styles_new );
+ if( pi_karaoke_bar ) free( pi_karaoke_bar );
+
+ free( pp_char_styles );
+ return VLC_ENOMEM;
+ }
+
+ /* Do bidi conversion line-by-line */
+ while(pos < i_len)
+ {
+ while(pos < i_len) {
+ if (psz_text[pos] != '\n')
+ break;
+ p_fribidi_string[pos] = psz_text[pos];
+ pp_char_styles_new[pos] = pp_char_styles[pos];
+ p_new_positions[pos] = pos;
+ p_levels[pos] = 0;
+ ++pos;
+ }
+ start_pos = pos;
+ while(pos < i_len) {
+ if (psz_text[pos] == '\n')
+ break;
+ ++pos;
+ }
+ if (pos > start_pos)
+ {
+ FriBidiCharType base_dir = FRIBIDI_TYPE_LTR;
+ fribidi_log2vis((FriBidiChar*)psz_text + start_pos,
+ pos - start_pos, &base_dir,
+ (FriBidiChar*)p_fribidi_string + start_pos,
+ p_new_positions + start_pos,
+ p_old_positions,
+ p_levels + start_pos );
+ for( j = (uint32_t) start_pos; j < (uint32_t) pos; j++ )
+ {
+ pp_char_styles_new[ j ] = pp_char_styles[ start_pos +
+ p_old_positions[ j - start_pos ] ];
+ p_new_positions[ j ] += start_pos;
+ }
+ }
+ }
+ free( p_old_positions );
+ free( pp_char_styles );
+ pp_char_styles = pp_char_styles_new;
+ psz_text = p_fribidi_string;
+ p_fribidi_string[ i_len ] = 0;
+ }
+#endif
+ /* Work out the karaoke */
+ if( pi_karaoke_bar )
+ {
+ int64_t i_last_duration = 0;
+ int64_t i_duration = 0;
+ int64_t i_start_pos = 0;
+ int64_t i_elapsed = var_GetTime( p_filter, "spu-elapsed" ) / 1000;
+
+ for( k = 0; k< i_k_runs; k++ )
+ {
+ double fraction = 0.0;
+
+ i_duration += pi_k_durations[ k ];
+
+ if( i_duration < i_elapsed )
+ {
+ /* Completely finished this run-length -
+ * let it render normally */
+
+ fraction = 1.0;
+ }
+ else if( i_elapsed < i_last_duration )
+ {
+ /* Haven't got up to this segment yet -
+ * render it completely in karaoke BG mode */
+
+ fraction = 0.0;
+ }
+ else
+ {
+ /* Partway through this run */
+
+ fraction = (double)(i_elapsed - i_last_duration) /
+ (double)pi_k_durations[ k ];
+ }
+ for( i = 0; i < pi_k_run_lengths[ k ]; i++ )
+ {
+ double shade = pi_k_run_lengths[ k ] * fraction;
+
+ if( p_new_positions )
+ j = p_new_positions[ i_start_pos + i ];
+ else
+ j = i_start_pos + i;
+
+ if( i < (uint32_t)shade )
+ pi_karaoke_bar[ j ] = 0xff;
+ else if( (double)i > shade )
+ pi_karaoke_bar[ j ] = 0x00;
+ else
+ {
+ shade -= (int)shade;
+ pi_karaoke_bar[ j ] = ((int)(shade * 128.0) & 0x7f) |
+ ((p_levels ? (p_levels[ j ] % 2) : 0 ) << 7);
+ }
+ }
+
+ i_last_duration = i_duration;
+ i_start_pos += pi_k_run_lengths[ k ];
+ }
+ }
+ if( p_levels ) free( p_levels );
+ if( p_new_positions ) free( p_new_positions );
- uint32_t *psz_unicode = IconvText( p_filter, psz_node );
+ FT_Vector tmp_result;
- if( !psz_unicode )
+ line_desc_t *p_line = NULL;
+ line_desc_t *p_prev = NULL;
+
+ int i_pen_x = 0;
+ int i_pen_y = 0;
+ int i_posn = 0;
+
+ p_result->x = p_result->y = 0;
+ tmp_result.x = tmp_result.y = 0;
+
+ i_prev = 0;
+ for( k = 0; k <= (uint32_t) i_len; k++ )
+ {
+ if( ( k == (uint32_t) i_len ) ||
+ ( ( k > 0 ) &&
+ !StyleEquals( pp_char_styles[ k ], pp_char_styles[ k - 1] ) ) )
+ {
+ ft_style_t *p_style = pp_char_styles[ k - 1 ];
+
+ /* End of the current style run */
+ FT_Face p_face = NULL;
+ int i_idx = 0;
+
+ /* Look for a match amongst our attachments first */
+ CheckForEmbeddedFont( p_sys, &p_face, p_style );
+
+ if( ! p_face )
+ {
+ char *psz_fontfile = FontConfig_Select( p_sys->p_fontconfig,
+ p_style->psz_fontname,
+ p_style->b_bold,
+ p_style->b_italic,
+ &i_idx );
+ if( psz_fontfile )
+ {
+ if( FT_New_Face( p_sys->p_library,
+ psz_fontfile ? psz_fontfile : "", i_idx, &p_face ) )
{
- free( psz_node );
- if( p_face ) FT_Done_Face( p_face );
- rv = VLC_EGENERIC;
- break;
+ free( psz_fontfile );
+ free( pp_char_styles );
+#if defined(HAVE_FRIBIDI)
+ free( psz_text );
+#endif
+ if( pi_karaoke_bar )
+ free( pi_karaoke_bar );
+ return VLC_EGENERIC;
}
+ free( psz_fontfile );
+ }
+ }
+ if( p_face &&
+ FT_Select_Charmap( p_face, ft_encoding_unicode ) )
+ {
+ /* We've loaded a font face which is unhelpful for actually
+ * rendering text - fallback to the default one.
+ */
+ FT_Done_Face( p_face );
+ p_face = NULL;
+ }
- while( *psz_unicode )
- {
- if( !p_line )
- {
- if( !(p_line = NewLine( (byte_t *)psz_html )) )
- {
- msg_Err( p_filter, "out of memory" );
- free( psz_node );
- if( p_face ) FT_Done_Face( p_face );
- rv = VLC_EGENERIC;
- break;
- }
- /* New Color mode only works in YUVA rendering mode --
- * (RGB mode has palette constraints on it). We therefore
- * need to populate the legacy colour fields also.
- */
- p_line->b_new_color_mode = VLC_TRUE;
- p_line->i_alpha = i_font_alpha;
- p_line->i_red = ( i_font_color & 0xff0000 ) >> 16;
- p_line->i_green = ( i_font_color & 0x00ff00 ) >> 8;
- p_line->i_blue = ( i_font_color & 0x0000ff );
- p_line->p_next = NULL;
- i_pen_x = 0;
- i_pen_y += tmp_result.y;
- tmp_result.x = 0;
- tmp_result.y = 0;
- i_posn = 0;
- if( p_prev ) p_prev->p_next = p_line;
- else *p_lines = p_line;
- }
+ if( FT_Select_Charmap( p_face ? p_face : p_sys->p_face,
+ ft_encoding_unicode ) ||
+ FT_Set_Pixel_Sizes( p_face ? p_face : p_sys->p_face, 0,
+ p_style->i_font_size ) )
+ {
+ if( p_face ) FT_Done_Face( p_face );
+ free( pp_char_styles );
+#if defined(HAVE_FRIBIDI)
+ free( psz_text );
+#endif
+ if( pi_karaoke_bar )
+ free( pi_karaoke_bar );
+ return VLC_EGENERIC;
+ }
+ p_sys->i_use_kerning =
+ FT_HAS_KERNING( ( p_face ? p_face : p_sys->p_face ) );
- if( RenderTag( p_filter, p_face, i_font_color, b_uline, p_line, psz_unicode, &i_pen_x, i_pen_y, &i_posn, &tmp_result ) != VLC_SUCCESS )
- {
- free( psz_node );
- if( p_face ) FT_Done_Face( p_face );
- rv = VLC_EGENERIC;
- break;
- }
- if( *psz_unicode )
- {
- p_result->x = __MAX( p_result->x, tmp_result.x );
- p_result->y += tmp_result.y;
- p_prev = p_line;
- p_line = NULL;
- }
+ uint32_t *psz_unicode = (uint32_t *)
+ malloc( (k - i_prev + 1) * sizeof( uint32_t ));
+ if( !psz_unicode )
+ {
+ msg_Err( p_filter, "out of memory" );
+ if( p_face ) FT_Done_Face( p_face );
+ free( pp_char_styles );
+ free( psz_unicode );
+#if defined(HAVE_FRIBIDI)
+ free( psz_text );
+#endif
+ if( pi_karaoke_bar )
+ free( pi_karaoke_bar );
+ return VLC_ENOMEM;
+ }
+ memcpy( psz_unicode, psz_text + i_prev,
+ sizeof( uint32_t ) * ( k - i_prev ) );
+ psz_unicode[ k - i_prev ] = 0;
+ while( *psz_unicode )
+ {
+ if( !p_line )
+ {
+ if( !(p_line = NewLine( i_len - i_prev)) )
+ {
+ msg_Err( p_filter, "out of memory" );
+ if( p_face ) FT_Done_Face( p_face );
+ free( pp_char_styles );
+ free( psz_unicode );
+#if defined(HAVE_FRIBIDI)
+ free( psz_text );
+#endif
+ if( pi_karaoke_bar )
+ free( pi_karaoke_bar );
+ return VLC_ENOMEM;
}
- if( rv != VLC_SUCCESS ) break;
+ /* New Color mode only works in YUVA rendering mode --
+ * (RGB mode has palette constraints on it). We therefore
+ * need to populate the legacy colour fields also.
+ */
+ p_line->b_new_color_mode = VLC_TRUE;
+ p_line->i_alpha = ( p_style->i_font_color & 0xff000000 ) >> 24;
+ p_line->i_red = ( p_style->i_font_color & 0x00ff0000 ) >> 16;
+ p_line->i_green = ( p_style->i_font_color & 0x0000ff00 ) >> 8;
+ p_line->i_blue = ( p_style->i_font_color & 0x000000ff );
+ p_line->p_next = NULL;
+ i_pen_x = 0;
+ i_pen_y += tmp_result.y;
+ tmp_result.x = 0;
+ tmp_result.y = 0;
+ i_posn = 0;
+ if( p_prev ) p_prev->p_next = p_line;
+ else *pp_lines = p_line;
+ }
+ if( RenderTag( p_filter, p_face ? p_face : p_sys->p_face,
+ p_style->i_font_color, p_style->b_underline,
+ p_style->i_karaoke_bg_color,
+ p_line, psz_unicode, &i_pen_x, i_pen_y, &i_posn,
+ &tmp_result ) != VLC_SUCCESS )
+ {
if( p_face ) FT_Done_Face( p_face );
+ free( pp_char_styles );
free( psz_unicode );
- free( psz_node );
+#if defined(HAVE_FRIBIDI)
+ free( psz_text );
+#endif
+ if( pi_karaoke_bar )
+ free( pi_karaoke_bar );
+ return VLC_EGENERIC;
}
- break;
+
+ if( *psz_unicode )
+ {
+ p_result->x = __MAX( p_result->x, tmp_result.x );
+ p_result->y += tmp_result.y;
+
+ p_prev = p_line;
+ p_line = NULL;
+ }
+ }
+ free( psz_unicode );
+ if( p_face ) FT_Done_Face( p_face );
+ i_prev = k;
}
}
+ free( pp_char_styles );
+#if defined(HAVE_FRIBIDI)
+ free( psz_text );
+#endif
if( p_line )
{
p_result->x = __MAX( p_result->x, tmp_result.x );
p_result->y += tmp_result.y;
}
+ if( pi_karaoke_bar )
+ {
+ int i = 0;
+ for( p_line = *pp_lines; p_line; p_line=p_line->p_next )
+ {
+ for( k = 0; p_line->pp_glyphs[ k ]; k++, i++ )
+ {
+ if( (pi_karaoke_bar[ i ] & 0x7f) == 0x7f)
+ {
+ /* do nothing */
+ }
+ else if( (pi_karaoke_bar[ i ] & 0x7f) == 0x00)
+ {
+ /* 100% BG colour will render faster if we
+ * instead make it 100% FG colour, so leave
+ * the ratio alone and copy the value across
+ */
+ p_line->p_fg_rgb[ k ] = p_line->p_bg_rgb[ k ];
+ }
+ else
+ {
+ if( pi_karaoke_bar[ i ] & 0x80 )
+ {
+ /* Swap Left and Right sides over for Right aligned
+ * language text (eg. Arabic, Hebrew)
+ */
+ uint32_t i_tmp = p_line->p_fg_rgb[ k ];
- while( VLC_SUCCESS == PopFont( &p_fonts ) );
+ p_line->p_fg_rgb[ k ] = p_line->p_bg_rgb[ k ];
+ p_line->p_bg_rgb[ k ] = i_tmp;
+ }
+ p_line->p_fg_bg_ratio[ k ] = (pi_karaoke_bar[ i ] & 0x7f);
+ }
+ }
+ /* Jump over the '\n' at the line-end */
+ i++;
+ }
+ free( pi_karaoke_bar );
+ }
- return rv;
+ return VLC_SUCCESS;
}
-
static int RenderHtml( filter_t *p_filter, subpicture_region_t *p_region_out,
subpicture_region_t *p_region_in )
{
if( !p_region_in || !p_region_in->psz_html )
return VLC_EGENERIC;
+ /* Reset the default fontsize in case screen metrics have changed */
+ p_filter->p_sys->i_font_size = GetFontSize( p_filter );
+
p_sub = stream_MemoryNew( VLC_OBJECT(p_filter),
- p_region_in->psz_html,
+ (uint8_t *) p_region_in->psz_html,
strlen( p_region_in->psz_html ),
VLC_TRUE );
if( p_sub )
p_xml = xml_Create( p_filter );
if( p_xml )
{
+ vlc_bool_t b_karaoke = VLC_FALSE;
+
p_xml_reader = xml_ReaderCreate( p_xml, p_sub );
if( p_xml_reader )
{
+ /* Look for Root Node */
+ if( xml_ReaderRead( p_xml_reader ) == 1 )
+ {
+ char *psz_node = xml_ReaderName( p_xml_reader );
+
+ if( !strcasecmp( "karaoke", psz_node ) )
+ {
+ /* We're going to have to render the text a number
+ * of times to show the progress marker on the text.
+ */
+ var_SetBool( p_filter, "text-rerender", VLC_TRUE );
+ b_karaoke = VLC_TRUE;
+ }
+ else if( !strcasecmp( "text", psz_node ) )
+ {
+ b_karaoke = VLC_FALSE;
+ }
+ else
+ {
+ /* Only text and karaoke tags are supported */
+ xml_ReaderDelete( p_xml, p_xml_reader );
+ p_xml_reader = NULL;
+ rv = VLC_EGENERIC;
+ }
+
+ free( psz_node );
+ }
+ }
+
+ if( p_xml_reader )
+ {
+ uint32_t *psz_text;
+ int i_len;
+ uint32_t i_runs = 0;
+ uint32_t i_k_runs = 0;
+ uint32_t *pi_run_lengths = NULL;
+ uint32_t *pi_k_run_lengths = NULL;
+ uint32_t *pi_k_durations = NULL;
+ ft_style_t **pp_styles = NULL;
FT_Vector result;
line_desc_t *p_lines = NULL;
- rv = ProcessNodes( p_filter, p_xml_reader, p_region_in->psz_html, p_region_in->p_style, &p_lines, &result );
-
- if( rv == VLC_SUCCESS )
+ psz_text = (uint32_t *)malloc( strlen( p_region_in->psz_html ) *
+ sizeof( uint32_t ) );
+ if( psz_text )
{
+ uint32_t k;
+
+ rv = ProcessNodes( p_filter, p_xml_reader,
+ p_region_in->p_style, psz_text, &i_len,
+ &i_runs, &pi_run_lengths, &pp_styles,
+ b_karaoke, &i_k_runs, &pi_k_run_lengths,
+ &pi_k_durations );
+
p_region_out->i_x = p_region_in->i_x;
p_region_out->i_y = p_region_in->i_y;
- if( config_GetInt( p_filter, "freetype-yuvp" ) )
- Render( p_filter, p_region_out, p_lines, result.x, result.y );
- else
- RenderYUVA( p_filter, p_region_out, p_lines, result.x, result.y );
+ if(( rv == VLC_SUCCESS ) && ( i_len > 0 ))
+ {
+ rv = ProcessLines( p_filter, psz_text, i_len, i_runs,
+ pi_run_lengths, pp_styles, &p_lines, &result,
+ b_karaoke, i_k_runs, pi_k_run_lengths,
+ pi_k_durations );
+ }
+
+ for( k=0; k<i_runs; k++)
+ DeleteStyle( pp_styles[k] );
+ free( pp_styles );
+ free( pi_run_lengths );
+ free( psz_text );
+
+ /* Don't attempt to render text that couldn't be layed out
+ * properly.
+ */
+ if(( rv == VLC_SUCCESS ) && ( i_len > 0 ))
+ {
+ if( config_GetInt( p_filter, "freetype-yuvp" ) )
+ {
+ Render( p_filter, p_region_out, p_lines,
+ result.x, result.y );
+ }
+ else
+ {
+ RenderYUVA( p_filter, p_region_out, p_lines,
+ result.x, result.y );
+ }
+ }
}
FreeLines( p_lines );
}
stream_Delete( p_sub );
}
- /* No longer need a HTML version of the text */
- free( p_region_in->psz_html );
- p_region_in->psz_html = NULL;
return rv;
}
-static char* FontConfig_Select( FcConfig* priv, const char* family, vlc_bool_t b_bold, vlc_bool_t b_italic, int *i_idx )
+static char* FontConfig_Select( FcConfig* priv, const char* family,
+ vlc_bool_t b_bold, vlc_bool_t b_italic, int *i_idx )
{
FcResult result;
FcPattern *pat, *p_pat;
FcPatternDestroy( pat );
if( !p_pat ) return NULL;
- if( ( FcResultMatch != FcPatternGetBool( p_pat, FC_OUTLINE, 0, &val_b ) ) ||
- ( val_b != FcTrue ) )
+ if( ( FcResultMatch != FcPatternGetBool( p_pat, FC_OUTLINE, 0, &val_b ) )
+ || ( val_b != FcTrue ) )
{
FcPatternDestroy( p_pat );
return NULL;
/*
if( strcasecmp((const char*)val_s, family ) != 0 )
- msg_Warn( p_filter, "fontconfig: selected font family is not the requested one: '%s' != '%s'\n",
+ msg_Warn( p_filter, "fontconfig: selected font family is not"
+ "the requested one: '%s' != '%s'\n",
(const char*)val_s, family );
*/
}
free( p_line->pp_glyphs );
free( p_line->p_glyph_pos );
- free( p_line->p_rgb );
+ free( p_line->p_fg_rgb );
+ free( p_line->p_bg_rgb );
+ free( p_line->p_fg_bg_ratio );
free( p_line->pi_underline_offset );
free( p_line->pi_underline_thickness );
free( p_line );
}
}
-static line_desc_t *NewLine( byte_t *psz_string )
+static line_desc_t *NewLine( int i_count )
{
- int i_count;
line_desc_t *p_line = malloc( sizeof(line_desc_t) );
if( !p_line ) return NULL;
p_line->i_width = 0;
p_line->p_next = NULL;
- /* We don't use CountUtf8Characters() here because we are not acutally
- * sure the string is utf8. Better be safe than sorry. */
- i_count = strlen( (char *)psz_string );
-
p_line->pp_glyphs = malloc( sizeof(FT_BitmapGlyph) * ( i_count + 1 ) );
- p_line->p_glyph_pos = malloc( sizeof( FT_Vector ) * i_count + 1 );
- p_line->p_rgb = malloc( sizeof( uint32_t ) * i_count + 1 );
- p_line->pi_underline_offset = calloc( i_count+ + 1, sizeof( uint16_t ) );
- p_line->pi_underline_thickness = calloc( i_count+ + 1, sizeof( uint16_t ) );
+ p_line->p_glyph_pos = malloc( sizeof( FT_Vector ) * ( i_count + 1 ) );
+ p_line->p_fg_rgb = malloc( sizeof( uint32_t ) * ( i_count + 1 ) );
+ p_line->p_bg_rgb = malloc( sizeof( uint32_t ) * ( i_count + 1 ) );
+ p_line->p_fg_bg_ratio = calloc( i_count + 1, sizeof( uint8_t ) );
+ p_line->pi_underline_offset = calloc( i_count + 1, sizeof( uint16_t ) );
+ p_line->pi_underline_thickness = calloc( i_count + 1, sizeof( uint16_t ) );
if( ( p_line->pp_glyphs == NULL ) ||
( p_line->p_glyph_pos == NULL ) ||
- ( p_line->p_rgb == NULL ) ||
+ ( p_line->p_fg_rgb == NULL ) ||
+ ( p_line->p_bg_rgb == NULL ) ||
+ ( p_line->p_fg_bg_ratio == NULL ) ||
( p_line->pi_underline_offset == NULL ) ||
( p_line->pi_underline_thickness == NULL ) )
{
- if( p_line->pi_underline_thickness ) free( p_line->pi_underline_thickness );
+ if( p_line->pi_underline_thickness )
+ free( p_line->pi_underline_thickness );
if( p_line->pi_underline_offset ) free( p_line->pi_underline_offset );
- if( p_line->p_rgb ) free( p_line->p_rgb );
+ if( p_line->p_fg_rgb ) free( p_line->p_fg_rgb );
+ if( p_line->p_bg_rgb ) free( p_line->p_bg_rgb );
+ if( p_line->p_fg_bg_ratio ) free( p_line->p_fg_bg_ratio );
if( p_line->p_glyph_pos ) free( p_line->p_glyph_pos );
if( p_line->pp_glyphs ) free( p_line->pp_glyphs );
free( p_line );
return p_line;
}
-static int SetFontSize( filter_t *p_filter, int i_size )
+static int GetFontSize( filter_t *p_filter )
{
filter_sys_t *p_sys = p_filter->p_sys;
+ vlc_value_t val;
+ int i_size = 0;
- if( i_size && i_size == p_sys->i_font_size ) return VLC_SUCCESS;
-
- if( !i_size )
+ if( p_sys->i_default_font_size )
{
- vlc_value_t val;
-
- if( !p_sys->i_default_font_size &&
- p_sys->i_display_height == (int)p_filter->fmt_out.video.i_height )
- return VLC_SUCCESS;
-
- if( p_sys->i_default_font_size )
- {
+ if( VLC_SUCCESS == var_Get( p_filter, "scale", &val ))
+ i_size = p_sys->i_default_font_size * val.i_int / 1000;
+ else
i_size = p_sys->i_default_font_size;
- }
+ }
+ else
+ {
+ var_Get( p_filter, "freetype-rel-fontsize", &val );
+ i_size = (int)p_filter->fmt_out.video.i_height / val.i_int;
+ p_filter->p_sys->i_display_height =
+ p_filter->fmt_out.video.i_height;
+ }
+ if( i_size <= 0 )
+ {
+ msg_Warn( p_filter, "invalid fontsize, using 12" );
+ if( VLC_SUCCESS == var_Get( p_filter, "scale", &val ))
+ i_size = 12 * val.i_int / 1000;
else
- {
- var_Get( p_filter, "freetype-rel-fontsize", &val );
- i_size = (int)p_filter->fmt_out.video.i_height / val.i_int;
- p_filter->p_sys->i_display_height =
- p_filter->fmt_out.video.i_height;
- }
- if( i_size <= 0 )
- {
- msg_Warn( p_filter, "invalid fontsize, using 12" );
i_size = 12;
- }
+ }
+ 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 );
}
return VLC_SUCCESS;
}
+
+static void YUVFromRGB( uint32_t i_argb,
+ uint8_t *pi_y, uint8_t *pi_u, uint8_t *pi_v )
+{
+ int i_red = ( i_argb & 0x00ff0000 ) >> 16;
+ int i_green = ( i_argb & 0x0000ff00 ) >> 8;
+ int i_blue = ( i_argb & 0x000000ff );
+
+ *pi_y = (uint8_t)__MIN(abs( 2104 * i_red + 4130 * i_green +
+ 802 * i_blue + 4096 + 131072 ) >> 13, 235);
+ *pi_u = (uint8_t)__MIN(abs( -1214 * i_red + -2384 * i_green +
+ 3598 * i_blue + 4096 + 1048576) >> 13, 240);
+ *pi_v = (uint8_t)__MIN(abs( 3598 * i_red + -3013 * i_green +
+ -585 * i_blue + 4096 + 1048576) >> 13, 240);
+}
projects / vlc / blobdiff