#include <vlc_common.h>
#include <vlc_plugin.h>
-#include <vlc_osd.h>
#include <vlc_filter.h>
#include <vlc_stream.h>
#include <vlc_xml.h>
#include <vlc_input.h>
#include <vlc_strings.h>
#include <vlc_dialog.h>
+#include <vlc_memory.h>
#include <math.h>
-#include <errno.h>
#include <ft2build.h>
+#include <freetype/ftsynth.h>
#include FT_FREETYPE_H
#include FT_GLYPH_H
#define FT_FLOOR(X) ((X & -64) >> 6)
#elif defined( WIN32 )
#define DEFAULT_FONT "" /* Default font found at run-time */
#define FC_DEFAULT_FONT "Arial"
+#elif defined( HAVE_MAEMO )
+#define DEFAULT_FONT "/usr/share/fonts/nokia/nosnb.ttf"
+#define FC_DEFAULT_FONT "Nokia Sans Bold"
#else
#define DEFAULT_FONT "/usr/share/fonts/truetype/freefont/FreeSerifBold.ttf"
#define FC_DEFAULT_FONT "Serif Bold"
#ifdef HAVE_FONTCONFIG
#define FONT_LONGTEXT N_("Font family for the font you want to use")
#else
-#define FONT_LONGTEXT N_("Fontfile for the font you want to use")
+#define FONT_LONGTEXT N_("Font file for the font you want to use")
#endif
#define FONTSIZE_TEXT N_("Font size in pixels")
#define FONTSIZER_TEXT N_("Relative font size")
#define FONTSIZER_LONGTEXT N_("This is the relative default size of the " \
"fonts that will be rendered on the video. If absolute font size is set, "\
- "relative size will be overriden." )
+ "relative size will be overridden." )
static const int pi_sizes[] = { 20, 18, 16, 12, 6 };
static const char *const ppsz_sizes_text[] = {
uint8_t *p_fg_bg_ratio; /* 0x00=100% FG --> 0x7F=100% BG */
bool b_new_color_mode;
/** underline information -- only supplied if text should be underlined */
- uint16_t *pi_underline_offset;
+ int *pi_underline_offset;
uint16_t *pi_underline_thickness;
int i_height;
bool b_italic;
bool b_bold;
bool b_underline;
+ bool b_through;
char *psz_fontname;
} ft_style_t;
int i_display_height;
#ifdef HAVE_FONTCONFIG
char* psz_fontfamily;
- xml_t *p_xml;
+ xml_reader_t *p_xml;
#endif
input_attachment_t **pp_font_attachments;
p_filter->p_sys = p_sys = malloc( sizeof( filter_sys_t ) );
if( !p_sys )
return VLC_ENOMEM;
- #ifdef HAVE_FONTCONFIG
+#ifdef HAVE_FONTCONFIG
p_sys->psz_fontfamily = NULL;
p_sys->p_xml = NULL;
#endif
var_Create( p_filter, "freetype-rel-fontsize",
VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
- psz_fontfamily = var_CreateGetString( p_filter, "freetype-font" );
- p_sys->i_default_font_size = var_CreateGetInteger( p_filter, "freetype-fontsize" );
- p_sys->i_effect = var_CreateGetInteger( p_filter, "freetype-effect" );
- p_sys->i_font_opacity = var_CreateGetInteger( p_filter,"freetype-opacity" );
+ psz_fontfamily = var_InheritString( p_filter, "freetype-font" );
+ p_sys->i_default_font_size = var_InheritInteger( p_filter, "freetype-fontsize" );
+ p_sys->i_effect = var_InheritInteger( p_filter, "freetype-effect" );
+ p_sys->i_font_opacity = var_InheritInteger( p_filter,"freetype-opacity" );
p_sys->i_font_opacity = __MAX( __MIN( p_sys->i_font_opacity, 255 ), 0 );
- p_sys->i_font_color = var_CreateGetInteger( p_filter, "freetype-color" );
+ p_sys->i_font_color = var_InheritInteger( p_filter, "freetype-color" );
p_sys->i_font_color = __MAX( __MIN( p_sys->i_font_color , 0xFFFFFF ), 0 );
fontindex=0;
}
#ifdef HAVE_FONTCONFIG
- /* Lets find some fontfile from freetype-font variable family */
- char *psz_fontsize;
- if( asprintf( &psz_fontsize, "%d", p_sys->i_default_font_size ) == -1 )
- goto error;
+ msg_Dbg( p_filter, "Building font databases.");
+ mtime_t t1, t2;
+ t1 = mdate();
#ifdef WIN32
- dialog_progress_bar_t *p_dialog = dialog_ProgressCreate( p_filter,
+ dialog_progress_bar_t *p_dialog = NULL;
+ FcConfig *fcConfig = FcInitLoadConfig();
+
+ p_dialog = dialog_ProgressCreate( p_filter,
_("Building font cache"),
_("Please wait while your font cache is rebuilt.\n"
- "This should take less than few minutes."), NULL );
- char *path;
- path = (char *)malloc( PATH_MAX + 1 );
- /* Fontconfig doesnt seem to know where windows fonts are with
- * current contribs. So just tell default windows font directory
- * is the place to search fonts
- */
- GetWindowsDirectory( path, PATH_MAX + 1 );
- strcat( path, "\\fonts" );
- if( p_dialog )
- dialog_ProgressSet( p_dialog, NULL, 0.4 );
+ "This should take less than a few minutes."), NULL );
- FcConfigAppFontAddDir( NULL , path );
- free(path);
+/* if( p_dialog )
+ dialog_ProgressSet( p_dialog, NULL, 0.5 ); */
+ FcConfigBuildFonts( fcConfig );
+ t2 = mdate();
+ msg_Dbg( p_filter, "Took %ld microseconds", (long)((t2 - t1)) );
if( p_dialog )
- dialog_ProgressSet( p_dialog, NULL, 0.5 );
+ {
+// dialog_ProgressSet( p_dialog, NULL, 1.0 );
+ dialog_ProgressDestroy( p_dialog );
+ p_dialog = NULL;
+ }
#endif
- mtime_t t1, t2;
-
- msg_Dbg( p_filter, "Building font database.");
- t1 = mdate();
- FcConfigBuildFonts( NULL );
- t2 = mdate();
-
- msg_Dbg( p_filter, "Finished building font database." );
- msg_Dbg( p_filter, "Took %ld microseconds", (long)((t2 - t1)) );
+ /* Lets find some fontfile from freetype-font variable family */
+ char *psz_fontsize;
+ if( asprintf( &psz_fontsize, "%d", p_sys->i_default_font_size ) == -1 )
+ goto error;
fontpattern = FcPatternCreate();
-
if( !fontpattern )
{
msg_Err( p_filter, "Creating fontpattern failed");
goto error;
}
-#ifdef WIN32
- if( p_dialog )
- dialog_ProgressSet( p_dialog, NULL, 0.7 );
-#endif
FcPatternAddString( fontpattern, FC_FAMILY, psz_fontfamily);
FcPatternAddString( fontpattern, FC_SIZE, psz_fontsize );
free( psz_fontsize );
}
FcDefaultSubstitute( fontpattern );
-#ifdef WIN32
- if( p_dialog )
- dialog_ProgressSet( p_dialog, NULL, 0.8 );
-#endif
/* testing fontresult here doesn't do any good really, but maybe it will
* in future as fontconfig code doesn't set it in all cases and just
* returns NULL or doesn't set to to Match on all Match cases.*/
goto error;
}
- msg_Dbg( p_filter, "Using %s as font from file %s", psz_fontfamily, psz_fontfile );
+ msg_Dbg( p_filter, "Using %s as font from file %s", psz_fontfamily,
+ psz_fontfile ? psz_fontfile : "(null)" );
p_sys->psz_fontfamily = strdup( psz_fontfamily );
-# ifdef WIN32
- if( p_dialog )
- {
- dialog_ProgressSet( p_dialog, NULL, 1.0 );
- dialog_ProgressDestroy( p_dialog );
- }
-# endif
#else
-#ifdef HAVE_FONTCONFIG
- p_sys->psz_fontfamily = strdup( DEFAULT_FONT );
psz_fontfile = psz_fontfamily;
-#endif
#endif
if( i_error == FT_Err_Unknown_File_Format )
{
- msg_Err( p_filter, "file %s have unknown format", psz_fontfile );
+ msg_Err( p_filter, "file %s have unknown format",
+ psz_fontfile ? psz_fontfile : "(null)" );
goto error;
}
else if( i_error )
{
- msg_Err( p_filter, "failed to load font file %s", psz_fontfile );
+ msg_Err( p_filter, "failed to load font file %s",
+ psz_fontfile ? psz_fontfile : "(null)" );
goto error;
}
#ifdef HAVE_FONTCONFIG
if( fontmatch ) FcPatternDestroy( fontmatch );
if( fontpattern ) FcPatternDestroy( fontpattern );
+
+#ifdef WIN32
+ if( p_dialog )
+ dialog_ProgressDestroy( p_dialog );
#endif
+#endif
+
if( p_sys->p_face ) FT_Done_Face( p_sys->p_face );
if( p_sys->p_library ) FT_Done_FreeType( p_sys->p_library );
free( psz_fontfamily );
}
#ifdef HAVE_FONTCONFIG
- if( p_sys->p_xml ) xml_Delete( p_sys->p_xml );
+ if( p_sys->p_xml ) xml_ReaderDelete( p_sys->p_xml );
free( p_sys->psz_fontfamily );
#endif
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 )
+ if( filter_GetInputAttachments( p_filter, &pp_attachments, &i_attachments_cnt ) )
return VLC_EGENERIC;
- if( VLC_SUCCESS != input_Control( p_input, INPUT_GET_ATTACHMENTS, &pp_attachments, &i_attachments_cnt ))
- {
- vlc_object_release(p_input);
- 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;
+ if( !p_sys->pp_font_attachments )
+ return VLC_ENOMEM;
- for( k = 0; k < i_attachments_cnt; k++ )
+ for( int 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 )
{
- 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 );
- }
+ p_sys->pp_font_attachments[ p_sys->i_font_attachments++ ] = p_attach;
}
else
{
}
free( pp_attachments );
- vlc_object_release(p_input);
-
- return rv;
+ return VLC_SUCCESS;
}
/*****************************************************************************
/* Create a new subpicture region */
memset( &fmt, 0, sizeof(video_format_t) );
fmt.i_chroma = VLC_CODEC_YUVP;
- fmt.i_aspect = 0;
fmt.i_width = fmt.i_visible_width = i_width + 4;
fmt.i_height = fmt.i_visible_height = i_height + 4;
if( p_region->fmt.i_visible_width > 0 )
fmt.i_x_offset = fmt.i_y_offset = 0;
assert( !p_region->p_picture );
- p_region->p_picture = picture_New( fmt.i_chroma, fmt.i_width, fmt.i_height, fmt.i_aspect );
+ p_region->p_picture = picture_NewFromFormat( &fmt );
if( !p_region->p_picture )
return VLC_EGENERIC;
+ fmt.p_palette = p_region->fmt.p_palette ? p_region->fmt.p_palette : malloc(sizeof(*fmt.p_palette));
p_region->fmt = fmt;
/* Calculate text color components */
bool b_ok = true;
/* break the underline around the tails of any glyphs which cross it */
+ /* Strikethrough doesn't get broken */
for( z = x - i_line_thickness;
- z < x + i_line_thickness && b_ok;
+ z < x + i_line_thickness && b_ok && (i_line_offset >= 0);
z++ )
{
if( p_next_glyph && ( z >= i_extra ) )
/* Create a new subpicture region */
memset( &fmt, 0, sizeof(video_format_t) );
fmt.i_chroma = VLC_CODEC_YUVA;
- fmt.i_aspect = 0;
fmt.i_width = fmt.i_visible_width = i_width + 6;
fmt.i_height = fmt.i_visible_height = i_height + 6;
if( p_region->fmt.i_visible_width > 0 )
fmt.i_visible_height = p_region->fmt.i_visible_height;
fmt.i_x_offset = fmt.i_y_offset = 0;
- p_region->p_picture = picture_New( fmt.i_chroma, fmt.i_width, fmt.i_height, fmt.i_aspect );
+ p_region->p_picture = picture_NewFromFormat( &fmt );
if( !p_region->p_picture )
return VLC_EGENERIC;
p_region->fmt = fmt;
/* Do bidi conversion line-by-line */
while( pos < i_string_length )
{
- while( pos < i_string_length )
+ while( pos < i_string_length )
{
i_char = psz_unicode[pos];
if (i_char != '\r' && i_char != '\n')
}
p_line->p_glyph_pos[ i ].x = i_pen_x;
p_line->p_glyph_pos[ i ].y = i_pen_y;
- i_error = FT_Load_Glyph( face, i_glyph_index, FT_LOAD_DEFAULT );
+ i_error = FT_Load_Glyph( face, i_glyph_index, FT_LOAD_NO_BITMAP | FT_LOAD_DEFAULT );
if( i_error )
{
- msg_Err( p_filter, "unable to render text FT_Load_Glyph returned"
- " %d", i_error );
- goto error;
+ i_error = FT_Load_Glyph( 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 );
+ goto error;
+ }
}
i_error = FT_Get_Glyph( glyph, &tmp_glyph );
if( i_error )
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" ) )
+ if( var_InheritBool( 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 );
#ifdef HAVE_FONTCONFIG
static ft_style_t *CreateStyle( char *psz_fontname, int i_font_size,
uint32_t i_font_color, uint32_t i_karaoke_bg_color, bool b_bold,
- bool b_italic, bool b_uline )
+ bool b_italic, bool b_uline, bool b_through )
{
ft_style_t *p_style = malloc( sizeof( ft_style_t ));
p_style->b_italic = b_italic;
p_style->b_bold = b_bold;
p_style->b_underline = b_uline;
+ p_style->b_through = b_through;
p_style->psz_fontname = strdup( psz_fontname );
}
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_through == s2->b_through ) &&
( s1->b_bold == s2->b_bold ) &&
( s1->b_underline == s2->b_underline ) &&
( !strcmp( s1->psz_fontname, s2->psz_fontname )))
static ft_style_t *GetStyleFromFontStack( filter_sys_t *p_sys,
font_stack_t **p_fonts, bool b_bold, bool b_italic,
- bool b_uline )
+ bool b_uline, bool b_through )
{
ft_style_t *p_style = NULL;
&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 );
+ i_karaoke_bg_color, b_bold, b_italic, b_uline, b_through );
}
return p_style;
}
static int RenderTag( filter_t *p_filter, FT_Face p_face, int i_font_color,
- bool b_uline, int i_karaoke_bgcolor,
+ bool b_uline, bool b_through, bool b_bold,
+ bool b_italic, 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 )
p_line->p_glyph_pos[ i ].x = *pi_pen_x;
p_line->p_glyph_pos[ i ].y = i_pen_y;
- i_error = FT_Load_Glyph( p_face, i_glyph_index, FT_LOAD_DEFAULT );
+ i_error = FT_Load_Glyph( p_face, i_glyph_index, FT_LOAD_NO_BITMAP | FT_LOAD_DEFAULT );
if( 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_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 );
+ p_line->pp_glyphs[ i ] = NULL;
+ return VLC_EGENERIC;
+ }
}
+
+ /* Do synthetic styling now that Freetype supports it;
+ * ie. if the font we have loaded is NOT already in the
+ * style that the tags want, then switch it on; if they
+ * are then don't. */
+ if (b_bold && !( p_face->style_flags & FT_STYLE_FLAG_BOLD ))
+ FT_GlyphSlot_Embolden( p_face->glyph );
+ if (b_italic && !( p_face->style_flags & FT_STYLE_FLAG_ITALIC ))
+ FT_GlyphSlot_Oblique( p_face->glyph );
+
i_error = FT_Get_Glyph( p_face->glyph, &tmp_glyph );
if( i_error )
{
FT_Done_Glyph( tmp_glyph );
continue;
}
- if( b_uline )
+ if( b_uline || b_through )
{
float aOffset = FT_FLOOR(FT_MulFix(p_face->underline_position,
p_face->size->metrics.y_scale));
( aOffset < 0 ) ? -aOffset : aOffset;
p_line->pi_underline_thickness[ i ] =
( aSize < 0 ) ? -aSize : aSize;
+ if (b_through)
+ {
+ /* Move the baseline to make it strikethrough instead of
+ * underline. That means that strikethrough takes precedence
+ */
+ float aDescent = FT_FLOOR(FT_MulFix(p_face->descender*2,
+ p_face->size->metrics.y_scale));
+
+ p_line->pi_underline_offset[ i ] -=
+ ( aDescent < 0 ) ? -aDescent : aDescent;
+ }
}
+
p_line->pp_glyphs[ i ] = (FT_BitmapGlyph)tmp_glyph;
p_line->p_fg_rgb[ i ] = i_font_color & 0x00ffffff;
p_line->p_bg_rgb[ i ] = i_karaoke_bgcolor & 0x00ffffff;
{
(*pi_runs)++;
+ /* XXX this logic looks somewhat broken */
+
if( *ppp_styles )
{
- *ppp_styles = (ft_style_t **)
- realloc( *ppp_styles, *pi_runs * sizeof( ft_style_t * ) );
+ *ppp_styles = realloc_or_free( *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 * ) );
+ *ppp_styles = malloc( *pi_runs * sizeof( ft_style_t * ) );
}
/* We have just malloc'ed this memory successfully -
p_style = NULL;
}
+ /* XXX more iffy logic */
+
if( *ppi_run_lengths )
{
- *ppi_run_lengths = (uint32_t *)
- realloc( *ppi_run_lengths, *pi_runs * sizeof( uint32_t ) );
+ *ppi_run_lengths = realloc_or_free( *ppi_run_lengths,
+ *pi_runs * sizeof( uint32_t ) );
}
else if( *pi_runs == 1 )
{
if( RenderTag( p_filter, p_face ? p_face : p_sys->p_face,
p_style->i_font_color, p_style->b_underline,
+ p_style->b_through,
+ p_style->b_bold,
+ p_style->b_italic,
p_style->i_karaoke_bg_color,
p_line, psz_unicode, &i_pen_x, i_pen_y, &i_posn,
&tmp_result ) != VLC_SUCCESS )
{
int rv = VLC_SUCCESS;
stream_t *p_sub = NULL;
- xml_reader_t *p_xml_reader = NULL;
if( !p_region_in || !p_region_in->psz_html )
return VLC_EGENERIC;
(uint8_t *) p_region_in->psz_html,
strlen( p_region_in->psz_html ),
true );
- if( p_sub )
+ if( unlikely(p_sub == NULL) )
+ return VLC_SUCCESS;
+
+ xml_reader_t *p_xml_reader = p_filter->p_sys->p_xml;
+ bool b_karaoke = false;
+
+ if( !p_xml_reader )
+ p_xml_reader = xml_ReaderCreate( p_filter, p_sub );
+ else
+ p_xml_reader = xml_ReaderReset( p_xml_reader, p_sub );
+
+ p_filter->p_sys->p_xml = p_xml_reader;
+ if( p_xml_reader )
{
- if( !p_filter->p_sys->p_xml ) p_filter->p_sys->p_xml = xml_Create( p_filter );
- if( p_filter->p_sys->p_xml )
+ /* Look for Root Node */
+ if( xml_ReaderRead( p_xml_reader ) == 1 )
{
- bool b_karaoke = false;
+ char *psz_node = xml_ReaderName( p_xml_reader );
- p_xml_reader = xml_ReaderCreate( p_filter->p_sys->p_xml, p_sub );
- if( p_xml_reader )
+ if( !strcasecmp( "karaoke", psz_node ) )
{
- /* 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", true );
- b_karaoke = true;
- }
- else if( !strcasecmp( "text", psz_node ) )
- {
- b_karaoke = false;
- }
- else
- {
- /* Only text and karaoke tags are supported */
- msg_Dbg( p_filter, "Unsupported top-level tag '%s' ignored.", psz_node );
- xml_ReaderDelete( p_filter->p_sys->p_xml, p_xml_reader );
- p_xml_reader = NULL;
- rv = VLC_EGENERIC;
- }
-
- free( 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", true );
+ b_karaoke = true;
}
-
- if( p_xml_reader )
+ else if( !strcasecmp( "text", psz_node ) )
{
- uint32_t *psz_text;
- int i_len = 0;
- 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;
-
- 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 = false;
+ }
+ else
+ {
+ /* Only text and karaoke tags are supported */
+ msg_Dbg( p_filter, "Unsupported top-level tag '%s' ignored.", psz_node );
+ p_filter->p_sys->p_xml = xml_ReaderReset( p_xml_reader, NULL );
+ p_xml_reader = NULL;
+ rv = VLC_EGENERIC;
+ }
- b_karaoke, &i_k_runs, &pi_k_run_lengths,
- &pi_k_durations );
+ free( psz_node );
+ }
+ }
- p_region_out->i_x = p_region_in->i_x;
- p_region_out->i_y = p_region_in->i_y;
+ if( p_xml_reader )
+ {
+ uint32_t *psz_text;
+ int i_len = 0;
+ 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;
+
+ psz_text = (uint32_t *)malloc( strlen( p_region_in->psz_html ) *
+ sizeof( uint32_t ) );
+ if( psz_text )
+ {
+ 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 );
- 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 );
- }
+ p_region_out->i_x = p_region_in->i_x;
+ p_region_out->i_y = p_region_in->i_y;
- for( k=0; k<i_runs; k++)
- DeleteStyle( pp_styles[k] );
- free( pp_styles );
- free( pi_run_lengths );
- free( psz_text );
+ 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 );
+ }
- /* 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 );
+ for( uint_fast32_t k=0; k<i_runs; k++)
+ DeleteStyle( pp_styles[k] );
+ free( pp_styles );
+ free( pi_run_lengths );
+ free( psz_text );
- xml_ReaderDelete( p_filter->p_sys->p_xml, p_xml_reader );
+ /* Don't attempt to render text that couldn't be layed out
+ * properly. */
+ if(( rv == VLC_SUCCESS ) && ( i_len > 0 ))
+ {
+ if( var_InheritBool( 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 );
}
}
- stream_Delete( p_sub );
+ p_filter->p_sys->p_xml = xml_ReaderReset( p_xml_reader, NULL );
+ FreeLines( p_lines );
}
-
+ stream_Delete( p_sub );
return rv;
}
FcPatternDestroy( p_pat );
return strdup( (const char*)val_s );
}
+#else
+
+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 )
+{
+ VLC_UNUSED(p_filter);
+ VLC_UNUSED(psz_text_in);
+ VLC_UNUSED(psz_text_out);
+ VLC_UNUSED(pi_runs);
+ VLC_UNUSED(ppi_run_lengths);
+ VLC_UNUSED(ppp_styles);
+ VLC_UNUSED(p_style);
+}
+
+static ft_style_t *GetStyleFromFontStack( filter_sys_t *p_sys,
+ font_stack_t **p_fonts, bool b_bold, bool b_italic,
+ bool b_uline, bool b_through )
+{
+ VLC_UNUSED(p_sys);
+ VLC_UNUSED(p_fonts);
+ VLC_UNUSED(b_bold);
+ VLC_UNUSED(b_italic);
+ VLC_UNUSED(b_uline);
+ VLC_UNUSED(b_through);
+ return NULL;
+}
#endif
static void FreeLine( line_desc_t *p_line )
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_offset = calloc( i_count + 1, sizeof( int ) );
p_line->pi_underline_thickness = calloc( i_count + 1, sizeof( uint16_t ) );
if( ( p_line->pp_glyphs == NULL ) ||
( p_line->p_glyph_pos == NULL ) ||
projects / vlc / blobdiff