#include <vlc_common.h>
#include <vlc_plugin.h>
-#include <vlc_vout.h>
#include <vlc_osd.h>
-#include <vlc_block.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 <math.h>
#include <errno.h>
#include FT_GLYPH_H
#define FT_FLOOR(X) ((X & -64) >> 6)
#define FT_CEIL(X) (((X + 63) & -64) >> 6)
-#define FT_MulFix(v, s) (((v)*(s))>>16)
+#ifndef FT_MulFix
+ #define FT_MulFix(v, s) (((v)*(s))>>16)
+#endif
#ifdef __APPLE__
#define DEFAULT_FONT "/System/Library/Fonts/LucidaGrande.dfont"
#ifdef HAVE_FONTCONFIG
#include <fontconfig/fontconfig.h>
+#undef DEFAULT_FONT
+#define DEFAULT_FONT FC_DEFAULT_FONT
#endif
#include <assert.h>
-#include "text_renderer.h"
-
/*****************************************************************************
* Module descriptor
*****************************************************************************/
static void Destroy( vlc_object_t * );
#define FONT_TEXT N_("Font")
-#define FONT_LONGTEXT N_("Filename for the font you want to use")
+
+#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")
+#endif
+
#define FONTSIZE_TEXT N_("Font size in pixels")
#define FONTSIZE_LONGTEXT N_("This is the default size of the fonts " \
"that will be rendered on the video. " \
N_("Red"), N_("Fuchsia"), N_("Yellow"), N_("Olive"), N_("Green"), N_("Teal"),
N_("Lime"), N_("Purple"), N_("Navy"), N_("Blue"), N_("Aqua") };
-vlc_module_begin();
- set_shortname( N_("Text renderer"));
- set_description( N_("Freetype2 font renderer") );
- set_category( CAT_VIDEO );
- set_subcategory( SUBCAT_VIDEO_SUBPIC );
+vlc_module_begin ()
+ set_shortname( N_("Text renderer"))
+ set_description( N_("Freetype2 font renderer") )
+ set_category( CAT_VIDEO )
+ set_subcategory( SUBCAT_VIDEO_SUBPIC )
- add_file( "freetype-font", DEFAULT_FONT, NULL, FONT_TEXT, FONT_LONGTEXT,
- false );
+ add_font( "freetype-font", DEFAULT_FONT, NULL, FONT_TEXT, FONT_LONGTEXT,
+ false )
add_integer( "freetype-fontsize", 0, NULL, FONTSIZE_TEXT,
- FONTSIZE_LONGTEXT, true );
+ FONTSIZE_LONGTEXT, true )
/* opacity valid on 0..255, with default 255 = fully opaque */
add_integer_with_range( "freetype-opacity", 255, 0, 255, NULL,
- OPACITY_TEXT, OPACITY_LONGTEXT, true );
+ OPACITY_TEXT, OPACITY_LONGTEXT, true )
/* hook to the color values list, with default 0x00ffffff = white */
add_integer( "freetype-color", 0x00FFFFFF, NULL, COLOR_TEXT,
- COLOR_LONGTEXT, false );
- change_integer_list( pi_color_values, ppsz_color_descriptions, NULL );
+ COLOR_LONGTEXT, false )
+ change_integer_list( pi_color_values, ppsz_color_descriptions, NULL )
add_integer( "freetype-rel-fontsize", 16, NULL, FONTSIZER_TEXT,
- FONTSIZER_LONGTEXT, false );
- change_integer_list( pi_sizes, ppsz_sizes_text, NULL );
+ FONTSIZER_LONGTEXT, false )
+ change_integer_list( pi_sizes, ppsz_sizes_text, NULL )
add_integer( "freetype-effect", 2, NULL, EFFECT_TEXT,
- EFFECT_LONGTEXT, false );
- change_integer_list( pi_effects, ppsz_effects_text, NULL );
+ EFFECT_LONGTEXT, false )
+ change_integer_list( pi_effects, ppsz_effects_text, NULL )
add_bool( "freetype-yuvp", 0, NULL, YUVP_TEXT,
- YUVP_LONGTEXT, true );
- set_capability( "text renderer", 100 );
- add_shortcut( "text" );
- set_callbacks( Create, Destroy );
-vlc_module_end();
+ YUVP_LONGTEXT, true )
+ set_capability( "text renderer", 100 )
+ add_shortcut( "text" )
+ set_callbacks( Create, Destroy )
+vlc_module_end ()
static void FreeLines( line_desc_t * );
static void FreeLine( line_desc_t * );
-#ifdef HAVE_FONTCONFIG
-static vlc_object_t *FontBuilderAttach( filter_t *p_filter, vlc_mutex_t **pp_lock );
-static void FontBuilderDetach( filter_t *p_filter, vlc_object_t *p_fontbuilder );
-static void* FontBuilderThread( vlc_object_t *p_this);
-static void FontBuilderDestructor( vlc_object_t *p_this );
-static void FontBuilderGetFcConfig( filter_t *p_filter, vlc_object_t *p_fontbuilder );
-static int FontBuilderDone( vlc_object_t*, const char *, vlc_value_t, vlc_value_t,
- void* );
-#endif
-
/*****************************************************************************
* filter_sys_t: freetype local data
*****************************************************************************
int i_default_font_size;
int i_display_height;
#ifdef HAVE_FONTCONFIG
- vlc_mutex_t *p_fontconfig_lock;
- bool b_fontconfig_ok;
- FcConfig *p_fontconfig;
+ char* psz_fontfamily;
+ xml_t *p_xml;
#endif
input_attachment_t **pp_font_attachments;
int i_font_attachments;
- vlc_object_t *p_fontbuilder;
};
+#define UCHAR uint32_t
+#define TR_DEFAULT_FONT p_sys->psz_fontfamily
+#define TR_FONT_STYLE_PTR ft_style_t *
+
+#include "text_renderer.h"
+
/*****************************************************************************
* Create: allocates osd-text video thread output method
*****************************************************************************
{
filter_t *p_filter = (filter_t *)p_this;
filter_sys_t *p_sys;
- char *psz_fontfile = NULL;
- int i_error;
- vlc_value_t val;
+ char *psz_fontfile=NULL;
+ char *psz_fontfamily=NULL;
+ int i_error,fontindex;
+
+#ifdef HAVE_FONTCONFIG
+ FcPattern *fontpattern = NULL, *fontmatch = NULL;
+ /* Initialise result to Match, as fontconfig doesnt
+ * really set this other than some error-cases */
+ FcResult fontresult = FcResultMatch;
+#endif
+
/* Allocate structure */
p_filter->p_sys = p_sys = malloc( sizeof( filter_sys_t ) );
if( !p_sys )
return VLC_ENOMEM;
+ #ifdef HAVE_FONTCONFIG
+ p_sys->psz_fontfamily = NULL;
+ p_sys->p_xml = NULL;
+#endif
p_sys->p_face = 0;
p_sys->p_library = 0;
p_sys->i_font_size = 0;
p_sys->i_display_height = 0;
- var_Create( p_filter, "freetype-font",
- VLC_VAR_STRING | VLC_VAR_DOINHERIT );
- var_Create( p_filter, "freetype-fontsize",
- VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
var_Create( p_filter, "freetype-rel-fontsize",
VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
- var_Create( p_filter, "freetype-opacity",
- VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
- var_Create( p_filter, "freetype-effect",
- VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
- var_Get( p_filter, "freetype-opacity", &val );
- p_sys->i_font_opacity = __MAX( __MIN( val.i_int, 255 ), 0 );
- var_Create( p_filter, "freetype-color",
- VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
- var_Get( p_filter, "freetype-color", &val );
- p_sys->i_font_color = __MAX( __MIN( val.i_int, 0xFFFFFF ), 0 );
- p_sys->i_effect = var_GetInteger( p_filter, "freetype-effect" );
-
- /* Look what method was requested */
- var_Get( p_filter, "freetype-font", &val );
- psz_fontfile = val.psz_string;
- if( !psz_fontfile || !*psz_fontfile )
+
+ 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" );
+ 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 = __MAX( __MIN( p_sys->i_font_color , 0xFFFFFF ), 0 );
+
+ fontindex=0;
+ if( !psz_fontfamily || !*psz_fontfamily )
{
- free( psz_fontfile );
- psz_fontfile = (char *)malloc( PATH_MAX + 1 );
- if( !psz_fontfile )
+#ifdef HAVE_FONTCONFIG
+ free( psz_fontfamily);
+ psz_fontfamily=strdup( DEFAULT_FONT );
+#else
+ free( psz_fontfamily );
+ psz_fontfamily = (char *)malloc( PATH_MAX + 1 );
+ if( !psz_fontfamily )
goto error;
+# ifdef WIN32
+ GetWindowsDirectory( psz_fontfamily , PATH_MAX + 1 );
+ strcat( psz_fontfamily, "\\fonts\\arial.ttf" );
+# else
+ strcpy( psz_fontfamily, DEFAULT_FONT );
+# endif
+ msg_Err( p_filter,"User didn't specify fontfile, using %s", psz_fontfamily);
+#endif
+ }
+
+#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;
+
#ifdef WIN32
- GetWindowsDirectory( psz_fontfile, PATH_MAX + 1 );
- strcat( psz_fontfile, "\\fonts\\arial.ttf" );
-#elif defined(__APPLE__)
- strcpy( psz_fontfile, DEFAULT_FONT );
-#else
- msg_Err( p_filter, "user didn't specify a font" );
+ dialog_progress_bar_t *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 );
+
+ FcConfigAppFontAddDir( NULL , path );
+ free(path);
+
+
+ if( p_dialog )
+ dialog_ProgressSet( p_dialog, NULL, 0.5 );
+#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)) );
+
+ 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 );
+
+ if( FcConfigSubstitute( NULL, fontpattern, FcMatchPattern ) == FcFalse )
+ {
+ msg_Err( p_filter, "FontSubstitute failed");
goto error;
+ }
+ 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.*/
+ fontmatch = FcFontMatch( NULL, fontpattern, &fontresult );
+ if( !fontmatch || fontresult == FcResultNoMatch )
+ {
+ msg_Err( p_filter, "Fontmatching failed");
+ goto error;
}
+ FcPatternGetString( fontmatch, FC_FILE, 0, (FcChar8 **)&psz_fontfile);
+ FcPatternGetInteger( fontmatch, FC_INDEX, 0, &fontindex );
+ if( !psz_fontfile )
+ {
+ msg_Err( p_filter, "Failed to get fontfile");
+ goto error;
+ }
+
+ msg_Dbg( p_filter, "Using %s as font from file %s", psz_fontfamily, psz_fontfile );
+ 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
+ p_sys->psz_fontfamily = strdup( DEFAULT_FONT )
+ psz_fontfile = psz_fontfamily;
+#endif
+
i_error = FT_Init_FreeType( &p_sys->p_library );
if( i_error )
{
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 );
+ fontindex, &p_sys->p_face );
+
if( i_error == FT_Err_Unknown_File_Format )
{
msg_Err( p_filter, "file %s have unknown format", psz_fontfile );
goto error;
}
-#ifdef HAVE_FONTCONFIG
- p_sys->b_fontconfig_ok = false;
- p_sys->p_fontconfig = NULL;
- p_sys->p_fontbuilder = FontBuilderAttach( p_filter, &p_sys->p_fontconfig_lock );
-#endif
-
p_sys->i_use_kerning = FT_HAS_KERNING( p_sys->p_face );
- var_Get( p_filter, "freetype-fontsize", &val );
- p_sys->i_default_font_size = val.i_int;
if( SetFontSize( p_filter, 0 ) != VLC_SUCCESS ) goto error;
- 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;
+ FcPatternDestroy( fontmatch );
+ FcPatternDestroy( fontpattern );
#else
p_filter->pf_render_html = NULL;
#endif
+ free( psz_fontfamily );
LoadFontsFromAttachments( p_filter );
return VLC_SUCCESS;
- error:
+error:
+#ifdef HAVE_FONTCONFIG
+ if( fontmatch ) FcPatternDestroy( fontmatch );
+ if( fontpattern ) FcPatternDestroy( fontpattern );
+#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_fontfile );
+ free( psz_fontfamily );
free( p_sys );
return VLC_EGENERIC;
}
}
#ifdef HAVE_FONTCONFIG
- FontBuilderDetach( p_filter, p_sys->p_fontbuilder );
+ if( p_sys->p_xml ) xml_Delete( p_sys->p_xml );
+ free( p_sys->psz_fontfamily );
#endif
/* FcFini asserts calling the subfunction FcCacheFini()
free( p_sys );
}
-#ifdef HAVE_FONTCONFIG
-static vlc_object_t *FontBuilderAttach( filter_t *p_filter, vlc_mutex_t **pp_lock )
-{
- /* Check for an existing Fontbuilder thread */
- vlc_mutex_t *p_lock = var_AcquireMutex( "fontbuilder" );
- vlc_object_t *p_fontbuilder =
- vlc_object_find_name( p_filter->p_libvlc,
- "fontlist builder", FIND_CHILD );
-
- if( !p_fontbuilder )
- {
- /* Create the FontBuilderThread thread as a child of a top-level
- * object, so that it can survive the destruction of the
- * freetype object - the fontlist only needs to be built once,
- * and calling the fontbuild a second time while the first is
- * still in progress can cause thread instabilities.
- *
- * XXX The fontbuilder will be destroy as soon as it is unused.
- */
-
- p_fontbuilder = vlc_object_create( p_filter->p_libvlc,
- sizeof(vlc_object_t) );
- if( p_fontbuilder )
- {
- p_fontbuilder->psz_object_name = strdup( "fontlist builder" );
- p_fontbuilder->p_private = NULL;
- vlc_object_set_destructor( p_fontbuilder, FontBuilderDestructor );
-
- vlc_object_attach( p_fontbuilder, p_filter->p_libvlc );
-
- var_Create( p_fontbuilder, "build-done", VLC_VAR_BOOL );
- var_SetBool( p_fontbuilder, "build-done", false );
-
- if( vlc_thread_create( p_fontbuilder,
- "fontlist builder",
- FontBuilderThread,
- VLC_THREAD_PRIORITY_LOW,
- false ) )
- {
- msg_Warn( p_filter, "fontconfig database builder thread can't "
- "be launched. Font styling support will be limited." );
- }
- }
- }
- if( p_fontbuilder )
- {
- var_AddCallback( p_fontbuilder, "build-done", FontBuilderDone, p_filter );
- FontBuilderGetFcConfig( p_filter, p_fontbuilder );
- }
- vlc_mutex_unlock( p_lock );
- *pp_lock = p_lock;
- return p_fontbuilder;
-}
-static void FontBuilderDetach( filter_t *p_filter, vlc_object_t *p_fontbuilder )
-{
- vlc_mutex_t *lock = var_AcquireMutex( "fontbuilder" );
- if( p_fontbuilder )
- {
- const bool b_alive = vlc_object_alive( p_fontbuilder );
-
- var_DelCallback( p_fontbuilder, "build-done", FontBuilderDone, p_filter );
-
- /* We wait for the thread on the first FontBuilderDetach */
- if( b_alive )
- {
- vlc_object_kill( p_fontbuilder );
- vlc_mutex_unlock( lock );
-
- /* We need to unlock otherwise we may not join (the thread waiting
- * for the lock). It is safe to unlock as no one else will try a
- * join and we have a reference on the object) */
- vlc_thread_join( p_fontbuilder );
-
- vlc_mutex_lock( lock );
- }
- vlc_object_release( p_fontbuilder );
- }
- vlc_mutex_unlock( lock );
-}
-static void* FontBuilderThread( vlc_object_t *p_this )
-{
- FcConfig *p_fontconfig = FcInitLoadConfig();
-
- vlc_thread_ready( p_this );
-
- if( p_fontconfig )
- {
- mtime_t t1, t2;
- int canc = vlc_savecancel ();
-
- //msg_Dbg( p_this, "Building font database..." );
- msg_Dbg( p_this, "Building font database..." );
- t1 = mdate();
- if(! FcConfigBuildFonts( p_fontconfig ))
- {
- /* Don't destroy the fontconfig object - we won't be able to do
- * italics or bold or change the font face, but we will still
- * be able to do underline and change the font size.
- */
- msg_Err( p_this, "fontconfig database can't be built. "
- "Font styling won't be available" );
- }
- t2 = mdate();
-
- msg_Dbg( p_this, "Finished building font database." );
- msg_Dbg( p_this, "Took %ld seconds", (long)((t2 - t1)/1000000) );
-
- vlc_mutex_t *p_lock = var_AcquireMutex( "fontbuilder" );
- p_this->p_private = p_fontconfig;
- vlc_mutex_unlock( p_lock );
-
- var_SetBool( p_this, "build-done", true );
- vlc_restorecancel (canc);
- }
- return NULL;
-}
-static void FontBuilderGetFcConfig( filter_t *p_filter, vlc_object_t *p_fontbuilder )
-{
- filter_sys_t *p_sys = p_filter->p_sys;
-
- p_sys->p_fontconfig = p_fontbuilder->p_private;
- p_sys->b_fontconfig_ok = p_fontbuilder->p_private != NULL;
-}
-static void FontBuilderDestructor( vlc_object_t *p_this )
-{
- FcConfig *p_fontconfig = p_this->p_private;
-
- if( p_fontconfig )
- FcConfigDestroy( p_fontconfig );
-}
-static int FontBuilderDone( vlc_object_t *p_this, const char *psz_var,
- vlc_value_t oldval, vlc_value_t newval, void *param )
-{
- filter_t *p_filter = param;
-
- if( newval.b_bool )
- {
- vlc_mutex_t *p_lock = var_AcquireMutex( "fontbuilder" );
-
- FontBuilderGetFcConfig( p_filter, p_this );
-
- vlc_mutex_unlock( p_lock );
- }
-
- VLC_UNUSED(psz_var);
- VLC_UNUSED(oldval);
- return VLC_SUCCESS;
-}
-#endif
-
/*****************************************************************************
* 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 Render( filter_t *p_filter, subpicture_region_t *p_region,
line_desc_t *p_line, int i_width, int i_height )
{
+ VLC_UNUSED(p_filter);
static const uint8_t pi_gamma[16] =
{0x00, 0x52, 0x84, 0x96, 0xb8, 0xca, 0xdc, 0xee, 0xff,
0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
/* Create a new subpicture region */
memset( &fmt, 0, sizeof(video_format_t) );
- fmt.i_chroma = VLC_FOURCC('Y','U','V','P');
+ 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;
/* Create a new subpicture region */
memset( &fmt, 0, sizeof(video_format_t) );
- fmt.i_chroma = VLC_FOURCC('Y','U','V','A');
+ 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_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;
- }
- }
- free( psz_name );
- 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,
-
- bool 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;
-
- bool b_italic = false;
- bool b_bold = false;
- bool b_uline = false;
-
- if( VLC_SUCCESS == var_Get( p_filter, "scale", &val ))
- i_scale = val.i_int;
-
- if( p_font_style )
- {
- 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 = true;
- if( p_font_style->i_style_flags & STYLE_ITALIC )
- b_italic = true;
- if( p_font_style->i_style_flags & STYLE_UNDERLINE )
- b_uline = true;
- }
- else
- {
- 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 ) )
- {
- switch ( xml_ReaderNodeType( p_xml_reader ) )
- {
- case XML_READER_NONE:
- break;
- case XML_READER_ENDELEM:
- psz_node = xml_ReaderName( p_xml_reader );
-
- if( psz_node )
- {
- if( !strcasecmp( "font", psz_node ) )
- PopFont( &p_fonts );
- else if( !strcasecmp( "b", psz_node ) )
- b_bold = false;
- else if( !strcasecmp( "i", psz_node ) )
- b_italic = false;
- else if( !strcasecmp( "u", psz_node ) )
- b_uline = false;
-
- free( psz_node );
- }
- break;
- case XML_READER_STARTELEM:
- psz_node = xml_ReaderName( p_xml_reader );
- if( psz_node )
- {
- if( !strcasecmp( "font", psz_node ) )
- rv = HandleFontAttributes( p_xml_reader, &p_fonts, i_scale );
- else if( !strcasecmp( "b", psz_node ) )
- b_bold = true;
- else if( !strcasecmp( "i", psz_node ) )
- b_italic = true;
- else if( !strcasecmp( "u", psz_node ) )
- b_uline = true;
- else if( !strcasecmp( "br", psz_node ) )
- {
- 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 )
- {
- if( *pi_k_runs > 0 )
- {
- SetKaraokeLen( *pi_runs, *ppi_run_lengths,
- *pi_k_runs, *ppi_k_run_lengths );
- }
- SetupKaraoke( p_xml_reader, pi_k_runs,
- ppi_k_run_lengths, ppi_k_durations );
- }
- }
-
- free( psz_node );
- }
- break;
- case XML_READER_TEXT:
- psz_node = xml_ReaderValue( p_xml_reader );
- if( psz_node )
- {
- /* Turn any multiple-whitespaces into single spaces */
- char *s = strpbrk( psz_node, "\t\r\n " );
- while( s )
- {
- int i_whitespace = strspn( s, "\t\r\n " );
-
- if( i_whitespace > 1 )
- memmove( &s[1],
- &s[i_whitespace],
- strlen( s ) - i_whitespace + 1 );
- *s++ = ' ';
-
- s = strpbrk( s, "\t\r\n " );
- }
- 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;
{
char *psz_fontfile = NULL;
- vlc_mutex_lock( p_sys->p_fontconfig_lock );
- if( p_sys->b_fontconfig_ok )
- {
- /* FIXME Is there really a race condition between FontConfig_Select with default fontconfig(NULL)
- * and FcConfigBuildFonts ? If not it would be better to remove the check on b_fontconfig_ok */
- psz_fontfile = FontConfig_Select( p_sys->p_fontconfig,
- p_style->psz_fontname,
- p_style->b_bold,
- p_style->b_italic,
- &i_idx );
- }
- vlc_mutex_unlock( p_sys->p_fontconfig_lock );
-
+ psz_fontfile = FontConfig_Select( NULL,
+ p_style->psz_fontname,
+ p_style->b_bold,
+ p_style->b_italic,
+ &i_idx );
if( psz_fontfile && ! *psz_fontfile )
{
msg_Warn( p_filter, "Fontconfig was unable to find a font: \"%s\" %s"
{
int rv = VLC_SUCCESS;
stream_t *p_sub = NULL;
- xml_t *p_xml = NULL;
xml_reader_t *p_xml_reader = NULL;
if( !p_region_in || !p_region_in->psz_html )
true );
if( p_sub )
{
- p_xml = xml_Create( p_filter );
- if( p_xml )
+ if( !p_filter->p_sys->p_xml ) p_filter->p_sys->p_xml = xml_Create( p_filter );
+ if( p_filter->p_sys->p_xml )
{
bool b_karaoke = false;
- p_xml_reader = xml_ReaderCreate( p_xml, p_sub );
+ p_xml_reader = xml_ReaderCreate( p_filter->p_sys->p_xml, p_sub );
if( p_xml_reader )
{
/* Look for Root Node */
{
/* Only text and karaoke tags are supported */
msg_Dbg( p_filter, "Unsupported top-level tag '%s' ignored.", psz_node );
- xml_ReaderDelete( p_xml, p_xml_reader );
+ xml_ReaderDelete( p_filter->p_sys->p_xml, p_xml_reader );
p_xml_reader = NULL;
rv = VLC_EGENERIC;
}
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 );
}
FreeLines( p_lines );
- xml_ReaderDelete( p_xml, p_xml_reader );
+ xml_ReaderDelete( p_filter->p_sys->p_xml, p_xml_reader );
}
- xml_Delete( p_xml );
}
stream_Delete( p_sub );
}
projects / vlc / blobdiff