/* Default fonts */
#ifdef __APPLE__
-# define DEFAULT_FONT_FILE "/Library/Fonts/Arial Unicode.ttf"
-# define DEFAULT_FAMILY "Arial Unicode MS"
-# define DEFAULT_MONOSPACE_FONT_FILE "/System/Library/Fonts/Monaco.dfont"
-# define DEFAULT_MONOSPACE_FAMILY "Monaco"
+# define SYSTEM_DEFAULT_FONT_FILE "/Library/Fonts/Arial Unicode.ttf"
+# define SYSTEM_DEFAULT_FAMILY "Arial Unicode MS"
+# define SYSTEM_DEFAULT_MONOSPACE_FONT_FILE "/System/Library/Fonts/Monaco.dfont"
+# define SYSTEM_DEFAULT_MONOSPACE_FAMILY "Monaco"
#elif defined( WIN32 )
-# define DEFAULT_FONT_FILE "arial.ttf" /* Default path font found at run-time */
-# define DEFAULT_FAMILY "Arial"
-# define DEFAULT_MONOSPACE_FONT_FILE "cour.ttf"
-# define DEFAULT_MONOSPACE_FAMILY "Courier New"
+# define SYSTEM_DEFAULT_FONT_FILE "arial.ttf" /* Default path font found at run-time */
+# define SYSTEM_DEFAULT_FAMILY "Arial"
+# define SYSTEM_DEFAULT_MONOSPACE_FONT_FILE "cour.ttf"
+# define SYSTEM_DEFAULT_MONOSPACE_FAMILY "Courier New"
#elif defined( __OS2__ )
-# define DEFAULT_FONT_FILE "/psfonts/tnrwt_k.ttf"
-# define DEFAULT_FAMILY "Times New Roman WT K"
-# define DEFAULT_MONOSPACE_FONT_FILE "/psfonts/mtsansdk.ttf"
-# define DEFAULT_MONOSPACE_FAMILY "Monotype Sans Duospace WT K"
-#elif defined( HAVE_MAEMO )
-# define DEFAULT_FONT_FILE "/usr/share/fonts/nokia/nosnb.ttf"
-# define DEFAULT_FAMILY "Nokia Sans Bold"
-# error Missing monospaced fonts
+# define SYSTEM_DEFAULT_FONT_FILE "/psfonts/tnrwt_k.ttf"
+# define SYSTEM_DEFAULT_FAMILY "Times New Roman WT K"
+# define SYSTEM_DEFAULT_MONOSPACE_FONT_FILE "/psfonts/mtsansdk.ttf"
+# define SYSTEM_DEFAULT_MONOSPACE_FAMILY "Monotype Sans Duospace WT K"
#elif defined( __ANDROID__ )
-# define DEFAULT_FONT_FILE "/system/fonts/DroidSans-Bold.ttf"
-# define DEFAULT_FAMILY "Droid Sans Bold"
-# define DEFAULT_MONOSPACE_FONT_FILE "/system/fonts/DroidSansMono.ttf"
-# define DEFAULT_MONOSPACE_FAMILY "Droid Sans Mono"
+# define SYSTEM_DEFAULT_FONT_FILE "/system/fonts/DroidSans-Bold.ttf"
+# define SYSTEM_DEFAULT_FAMILY "Droid Sans Bold"
+# define SYSTEM_DEFAULT_MONOSPACE_FONT_FILE "/system/fonts/DroidSansMono.ttf"
+# define SYSTEM_DEFAULT_MONOSPACE_FAMILY "Droid Sans Mono"
#else
-# define DEFAULT_FONT_FILE "/usr/share/fonts/truetype/freefont/FreeSerifBold.ttf"
-# define DEFAULT_FAMILY "Serif Bold"
-# define DEFAULT_MONOSPACE_FONT_FILE "/usr/share/fonts/truetype/freefont/FreeMono.ttf"
-# define DEFAULT_MONOSPACE_FAMILY "Monospace"
+# define SYSTEM_DEFAULT_FONT_FILE "/usr/share/fonts/truetype/freefont/FreeSerifBold.ttf"
+# define SYSTEM_DEFAULT_FAMILY "Serif Bold"
+# define SYSTEM_DEFAULT_MONOSPACE_FONT_FILE "/usr/share/fonts/truetype/freefont/FreeMono.ttf"
+# define SYSTEM_DEFAULT_MONOSPACE_FAMILY "Monospace"
+#endif
+
+#ifndef DEFAULT_FONT_FILE
+#define DEFAULT_FONT_FILE SYSTEM_DEFAULT_FONT_FILE
+#endif
+
+#ifndef DEFAULT_FAMILY
+#define DEFAULT_FAMILY SYSTEM_DEFAULT_FAMILY
+#endif
+
+#ifndef DEFAULT_MONOSPACE_FONT_FILE
+#define DEFAULT_MONOSPACE_FONT_FILE SYSTEM_DEFAULT_MONOSPACE_FONT_FILE
+#endif
+
+#ifndef DEFAULT_MONOSPACE_FAMILY
+#define DEFAULT_MONOSPACE_FAMILY SYSTEM_DEFAULT_MONOSPACE_FAMILY
#endif
/* Freetype */
*****************************************************************************/
static int Create ( vlc_object_t * );
static void Destroy( vlc_object_t * );
+static int OptionCallback( vlc_object_t *, char const *, vlc_value_t, vlc_value_t, void *);
#define FONT_TEXT N_("Font")
#define MONOSPACE_FONT_TEXT N_("Monospace Font")
input_attachment_t **pp_font_attachments;
int i_font_attachments;
+
+ vlc_mutex_t lock;
};
/* */
filter_sys_t *p_sys = p_filter->p_sys;
int i_size = 0;
+ vlc_mutex_lock( &p_filter->p_sys->lock );
if( p_sys->i_default_font_size )
{
i_size = p_sys->i_default_font_size;
+ vlc_mutex_unlock( &p_filter->p_sys->lock );
}
else
{
+ vlc_mutex_unlock( &p_filter->p_sys->lock );
int i_ratio = var_GetInteger( p_filter, "freetype-rel-fontsize" );
if( i_ratio > 0 )
{
#endif
#ifdef WIN32
-#define FONT_DIR_NT "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Fonts"
+#define FONT_DIR_NT _T("SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Fonts")
-static int GetFileFontByName( const char *font_name, char **psz_filename )
+static int GetFileFontByName( LPCTSTR font_name, char **psz_filename )
{
HKEY hKey;
- wchar_t vbuffer[MAX_PATH];
- wchar_t dbuffer[256];
+ TCHAR vbuffer[MAX_PATH];
+ TCHAR dbuffer[256];
- if( RegOpenKeyExA(HKEY_LOCAL_MACHINE, FONT_DIR_NT, 0, KEY_READ, &hKey)
+ if( RegOpenKeyEx(HKEY_LOCAL_MACHINE, FONT_DIR_NT, 0, KEY_READ, &hKey)
!= ERROR_SUCCESS )
return 1;
- MultiByteToWideChar( CP_ACP, 0, font_name, -1, dbuffer, 256 );
- char *font_name_temp = FromWide( dbuffer );
+ char *font_name_temp = FromT( font_name );
size_t fontname_len = strlen( font_name_temp );
for( int index = 0;; index++ )
DWORD vbuflen = MAX_PATH - 1;
DWORD dbuflen = 255;
- LONG i_result = RegEnumValueW( hKey, index, vbuffer, &vbuflen,
- NULL, NULL, (LPBYTE)dbuffer, &dbuflen);
+ LONG i_result = RegEnumValue( hKey, index, vbuffer, &vbuflen,
+ NULL, NULL, (LPBYTE)dbuffer, &dbuflen);
if( i_result != ERROR_SUCCESS )
{
RegCloseKey( hKey );
return i_result;
}
- char *psz_value = FromWide( vbuffer );
+ char *psz_value = FromT( vbuffer );
char *s = strchr( psz_value,'(' );
if( s != NULL && s != psz_value ) s[-1] = '\0';
free( psz_value );
}
- *psz_filename = FromWide( dbuffer );
+ *psz_filename = FromT( dbuffer );
free( font_name_temp );
RegCloseKey( hKey );
return 0;
if( (type & RASTER_FONTTYPE) ) return 1;
// if( lpelfe->elfScript ) FIXME
- return GetFileFontByName( (const char *)lpelfe->elfFullName, (char **)lParam );
+ return GetFileFontByName( (LPCTSTR)lpelfe->elfFullName, (char **)lParam );
}
static char* Win32_Select( filter_t *p_filter, const char* family,
if( b_bold )
lf.lfWeight = FW_BOLD;
- char facename[32];
- wchar_t* psz_fbuffer = ToWide( family );
- WideCharToMultiByte( CP_ACP, 0, psz_fbuffer, -1, facename, 32, " ", 0 );
- strncpy( (LPSTR)&lf.lfFaceName, facename, 32 );
+ LPTSTR psz_fbuffer = ToT( family );
+ _tcsncpy( (LPTSTR)&lf.lfFaceName, psz_fbuffer, LF_FACESIZE );
free( psz_fbuffer );
/* */
p_region->fmt = fmt;
/* Initialize the picture background */
- uint8_t i_a = p_sys->i_background_opacity;
+ vlc_mutex_lock( &p_sys->lock );
+ uint8_t i_opacity = p_sys->i_background_opacity;
+ uint32_t i_background_color = p_sys->i_background_color;
+ uint8_t i_shadow_opacity = p_sys->i_shadow_opacity;
+ uint8_t i_outline_opacity = p_sys->i_outline_opacity;
+ uint32_t i_shadow_color = p_sys->i_shadow_color;
+ uint32_t i_outline_color = p_sys->i_outline_color;
+ vlc_mutex_unlock( &p_sys->lock );
uint8_t i_x, i_y, i_z;
if (p_region->b_renderbg) {
ExtractComponents, BlendPixel);
} else {
/* Render background under entire subpicture block */
- ExtractComponents( p_sys->i_background_color, &i_x, &i_y, &i_z );
- FillPicture( p_picture, i_a, i_x, i_y, i_z );
+ ExtractComponents( i_background_color, &i_x, &i_y, &i_z );
+ FillPicture( p_picture, i_opacity, i_x, i_y, i_z );
}
/* Render shadow then outline and then normal glyphs */
if( !p_glyph )
continue;
- i_a = (ch->i_color >> 24) & 0xff;
+ i_opacity = (ch->i_color >> 24) & 0xff;
uint32_t i_color;
switch (g) {
case 0:
- i_a = i_a * p_sys->i_shadow_opacity / 255;
- i_color = p_sys->i_shadow_color;
+ i_opacity = i_opacity * i_shadow_opacity / 255;
+ i_color = i_shadow_color;
break;
case 1:
- i_a = i_a * p_sys->i_outline_opacity / 255;
- i_color = p_sys->i_outline_color;
+ i_opacity = i_opacity * i_outline_opacity / 255;
+ i_color = i_outline_color;
break;
default:
i_color = ch->i_color;
BlendAXYZGlyph( p_picture,
i_glyph_x, i_glyph_y,
- i_a, i_x, i_y, i_z,
+ i_opacity, i_x, i_y, i_z,
p_glyph,
BlendPixel );
if( g == 2 && ch->i_line_thickness > 0 )
BlendAXYZLine( p_picture,
i_glyph_x, i_glyph_y + p_glyph->top,
- i_a, i_x, i_y, i_z,
+ i_opacity, i_x, i_y, i_z,
&ch[0],
i + 1 < p_line->i_character_count ? &ch[1] : NULL,
BlendPixel );
int i_style_flags )
{
char *psz_fontname = NULL;
+ vlc_mutex_lock(&p_sys->lock);
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;
+ vlc_mutex_unlock(&p_sys->lock);
+ uint32_t i_karaoke_bg_color = i_font_color;
if( PeekFont( p_fonts, &psz_fontname, &i_font_size,
&i_font_color, &i_karaoke_bg_color ) )
}
else
{
+ vlc_mutex_lock(&p_sys->lock);
+ uint32_t i_font_size = p_sys->i_font_size;
+ uint32_t i_font_color = p_sys->i_font_color;
+ uint32_t i_font_opacity = p_sys->i_font_opacity;
+ vlc_mutex_unlock(&p_sys->lock);
rv = PushFont( &p_fonts,
p_sys->psz_fontfamily,
- p_sys->i_font_size,
- (p_sys->i_font_color & 0xffffff) |
- ((p_sys->i_font_opacity & 0xff) << 24),
+ i_font_size,
+ (i_font_color & 0xffffff) |
+ ((i_font_opacity & 0xff) << 24),
0x00ffffff );
}
if( p_sys->b_font_bold )
msg_Err( p_filter, "Failed to set font size to %d", p_current_style->i_font_size );
if( p_sys->p_stroker )
{
- int i_radius = (p_current_style->i_font_size << 6) * p_sys->f_outline_thickness;
+ vlc_mutex_lock( &p_sys->lock );
+ double f_outline_thickness = p_sys->f_outline_thickness;
+ vlc_mutex_unlock( &p_sys->lock );
+ int i_radius = (p_current_style->i_font_size << 6) * f_outline_thickness;
FT_Stroker_Set( p_sys->p_stroker,
i_radius,
FT_STROKER_LINECAP_ROUND,
STYLE_ITALIC |
STYLE_UNDERLINE |
STYLE_STRIKEOUT) );
- else
+ else {
+ vlc_mutex_lock( &p_sys->lock );
+ uint8_t i_font_size = p_sys->i_font_size;
+ uint32_t i_font_color = p_sys->i_font_color;
+ uint8_t i_font_opacity = p_sys->i_font_opacity;
+ vlc_mutex_unlock( &p_sys->lock );
p_style = CreateStyle( p_sys->psz_fontfamily,
- p_sys->i_font_size,
- (p_sys->i_font_color & 0xffffff) |
- ((p_sys->i_font_opacity & 0xff) << 24),
+ i_font_size,
+ (i_font_color & 0xffffff) |
+ ((i_font_opacity & 0xff) << 24),
0x00ffffff, 0);
+ }
if( p_sys->b_font_bold )
p_style->i_style_flags |= STYLE_BOLD;
else if( !p_chroma_list || *p_chroma_list == 0 )
p_chroma_list = p_chroma_list_rgba;
- const int i_margin = p_sys->i_background_opacity > 0 ? i_max_face_height / 4 : 0;
+ vlc_mutex_lock( &p_sys->lock );
+ uint8_t i_background_opacity = p_sys->i_background_opacity;
+ vlc_mutex_unlock( &p_sys->lock );
+
+ const int i_margin = i_background_opacity > 0 ? i_max_face_height / 4 : 0;
for( const vlc_fourcc_t *p_chroma = p_chroma_list; *p_chroma != 0; p_chroma++ )
{
rv = VLC_EGENERIC;
p_sys->i_font_size = 0;
p_sys->i_display_height = 0;
+ vlc_mutex_init( &p_sys->lock );
+
var_Create( p_filter, "freetype-rel-fontsize",
VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
+ var_Create( p_filter, "freetype-background-opacity",
+ VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
+ var_Create( p_filter, "freetype-background-color",
+ VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
+ var_Create( p_filter, "freetype-outline-thickness",
+ VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
+ var_Create( p_filter, "freetype-color",
+ VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
psz_fontfamily = var_InheritString( p_filter, "freetype-font" );
psz_monofontfamily = var_InheritString( p_filter, "freetype-monofont" );
LoadFontsFromAttachments( p_filter );
+ var_AddCallback(p_this, "freetype-rel-fontsize", OptionCallback, p_this);
+ var_AddCallback(p_this, "freetype-background-opacity", OptionCallback, p_this);
+ var_AddCallback(p_this, "freetype-background-color", OptionCallback, p_this);
+ var_AddCallback(p_this, "freetype-outline-thickness", OptionCallback, p_this);
+ var_AddCallback(p_this, "freetype-color", OptionCallback, p_this);
+
#ifdef HAVE_STYLES
free( psz_fontfile );
free( psz_monofontfile );
filter_t *p_filter = (filter_t *)p_this;
filter_sys_t *p_sys = p_filter->p_sys;
+ var_DelCallback(p_this, "freetype-rel-fontsize", OptionCallback, p_this);
+ var_DelCallback(p_this, "freetype-background-opacity", OptionCallback, p_this);
+ var_DelCallback(p_this, "freetype-background-color", OptionCallback, p_this);
+ var_DelCallback(p_this, "freetype-outline-thickness", OptionCallback, p_this);
+ var_DelCallback(p_this, "freetype-color", OptionCallback, p_this);
+
if( p_sys->pp_font_attachments )
{
for( int k = 0; k < p_sys->i_font_attachments; k++ )
FT_Stroker_Done( p_sys->p_stroker );
FT_Done_Face( p_sys->p_face );
FT_Done_FreeType( p_sys->p_library );
+ vlc_mutex_destroy( &p_sys->lock );
free( p_sys );
}
+static int OptionCallback( vlc_object_t *p_this, char const *psz_var,
+ vlc_value_t oldval, vlc_value_t newval, void *p_data)
+{
+ VLC_UNUSED(oldval);
+ VLC_UNUSED(p_data);
+
+ filter_t *p_filter = (filter_t *)p_this;
+ filter_sys_t *p_sys = p_filter->p_sys;
+
+ vlc_mutex_lock( &p_sys->lock );
+ if( !strcmp(psz_var, "freetype-rel-fontsize") )
+ msg_Dbg( p_this, "changed relative font size to %"PRId64, newval.i_int);
+ else if( !strcmp(psz_var, "freetype-color") ) {
+ p_sys->i_font_color = newval.i_int;
+ p_sys->i_font_color = VLC_CLIP( p_sys->i_font_color, 0, 0xFFFFFF );
+ } else if( !strcmp(psz_var, "freetype-background-opacity") ) {
+ p_sys->i_background_opacity = newval.i_int;
+ msg_Dbg( p_filter, "changed background opacity to %"PRId64, newval.i_int);
+ } else if( !strcmp(psz_var, "freetype-outline-thickness") ) {
+ p_sys->f_outline_thickness = newval.i_int / 100.;
+ p_sys->f_outline_thickness = VLC_CLIP( p_sys->f_outline_thickness, 0.0, 0.5 );
+ msg_Dbg( p_filter, "changed outline thickness to %"PRId64, newval.i_int);
+ } else if( !strcmp(psz_var, "freetype-background-color") ) {
+ p_sys->i_background_color = newval.i_int;
+ p_sys->i_background_color = VLC_CLIP( p_sys->i_background_color, 0, 0xFFFFFF );
+ msg_Dbg( p_filter, "changed background color to %"PRId64, newval.i_int);
+ }
+ vlc_mutex_unlock( &p_sys->lock );
+
+ return VLC_SUCCESS;
+}
projects / vlc / blobdiff