// Preamble
//////////////////////////////////////////////////////////////////////////////
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
#include <vlc/vlc.h>
#include <vlc_vout.h>
#include <vlc_osd.h>
static int RenderHtml( filter_t *, subpicture_region_t *,
subpicture_region_t * );
+static int GetFontSize( filter_t *p_filter );
static int RenderYUVA( filter_t *p_filter, subpicture_region_t *p_region,
UniChar *psz_utfString, uint32_t i_text_len,
uint32_t i_runs, uint32_t *pi_run_lengths,
ATSUStyle *pp_styles );
static ATSUStyle CreateStyle( char *psz_fontname, int i_font_size,
- int i_font_color, int i_font_alpha,
+ uint32_t i_font_color,
vlc_bool_t b_bold, vlc_bool_t b_italic,
vlc_bool_t b_uline );
//////////////////////////////////////////////////////////////////////////////
{
char *psz_name;
int i_size;
- int i_color;
- int i_alpha;
+ uint32_t i_color; // ARGB
font_stack_t *p_next;
};
p_sys->psz_font_name = strdup( DEFAULT_FONT );
p_sys->i_font_opacity = 255;
p_sys->i_font_color = DEFAULT_FONT_COLOR;
- p_sys->i_font_size = p_filter->fmt_out.video.i_height / DEFAULT_REL_FONT_SIZE;
+ p_sys->i_font_size = GetFontSize( p_filter );
p_filter->pf_render_text = RenderText;
p_filter->pf_render_html = RenderHtml;
free( p_sys->p_fonts );
}
- if( p_sys->psz_font_name ) free( p_sys->psz_font_name );
-
+ free( p_sys->psz_font_name );
free( p_sys );
}
uint32_t i_string_length;
char *psz_string;
int i_font_color, i_font_alpha, i_font_size;
+ vlc_value_t val;
+ int i_scale = 1000;
+
+ p_sys->i_font_size = GetFontSize( p_filter );
// Sanity check
if( !p_region_in || !p_region_out ) return VLC_EGENERIC;
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
{
if( psz_utf16_str != NULL )
{
ATSUStyle p_style = CreateStyle( p_sys->psz_font_name, i_font_size,
- i_font_color, i_font_alpha,
+ (i_font_color & 0xffffff) |
+ ((i_font_alpha & 0xff) << 24),
VLC_FALSE, VLC_FALSE, VLC_FALSE );
if( p_style )
{
}
-static ATSUStyle CreateStyle( char *psz_fontname, int i_font_size, int i_font_color, int i_font_alpha,
+static ATSUStyle CreateStyle( char *psz_fontname, int i_font_size, uint32_t i_font_color,
vlc_bool_t b_bold, vlc_bool_t b_italic, vlc_bool_t b_uline )
{
ATSUStyle p_style;
float f_red = (float)(( i_font_color & 0x00FF0000 ) >> 16) / 255.0;
float f_green = (float)(( i_font_color & 0x0000FF00 ) >> 8) / 255.0;
float f_blue = (float)( i_font_color & 0x000000FF ) / 255.0;
- float f_alpha = ( 255.0 - (float)i_font_alpha) / 255.0;
+ float f_alpha = ( 255.0 - (float)(( i_font_color & 0xFF000000 ) >> 24)) / 255.0;
ATSUFontID font;
Fixed font_size = IntToFixed( i_font_size );
}
static int PushFont( font_stack_t **p_font, const char *psz_name, int i_size,
- int i_color, int i_alpha )
+ uint32_t i_color )
{
font_stack_t *p_new;
p_new->i_size = i_size;
p_new->i_color = i_color;
- p_new->i_alpha = i_alpha;
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 )
{
font_stack_t *p_last;
*psz_name = p_last->psz_name;
*i_size = p_last->i_size;
*i_color = p_last->i_color;
- *i_alpha = p_last->i_alpha;
return VLC_SUCCESS;
}
-static ATSUStyle 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 )
+static ATSUStyle 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 )
{
ATSUStyle p_style = NULL;
- char *psz_fontname = NULL;
- int i_font_color = p_sys->i_font_color;
- int i_font_alpha = 0;
- int i_font_size = p_sys->i_font_size;
+ char *psz_fontname = NULL;
+ uint32_t i_font_color = p_sys->i_font_color;
+ int i_font_size = p_sys->i_font_size;
- if( VLC_SUCCESS == PeekFont( p_fonts, &psz_fontname, &i_font_size, &i_font_color, &i_font_alpha ) )
+ if( VLC_SUCCESS == PeekFont( p_fonts, &psz_fontname, &i_font_size,
+ &i_font_color ))
{
- p_style = CreateStyle( psz_fontname, i_font_size, i_font_color, i_font_alpha,
+ p_style = CreateStyle( psz_fontname, i_font_size, i_font_color,
b_bold, b_italic, b_uline );
}
return p_style;
}
-static int ProcessNodes( filter_t *p_filter, xml_reader_t *p_xml_reader,
- text_style_t *p_font_style, UniChar *psz_text, int *pi_len,
- uint32_t *pi_runs, uint32_t **ppi_run_lengths,
- ATSUStyle **ppp_styles)
+static int HandleFontAttributes( xml_reader_t *p_xml_reader,
+ font_stack_t **p_fonts, int i_scale )
+{
+ int rv;
+ char *psz_fontname = NULL;
+ uint32_t 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 ))
+ {
+ 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;
+
+ 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 ) )
+ {
+ 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) );
+
+ free( psz_fontname );
+
+ return rv;
+}
+
+static int ProcessNodes( filter_t *p_filter,
+ xml_reader_t *p_xml_reader,
+ text_style_t *p_font_style,
+ UniChar *psz_text,
+ int *pi_len,
+
+ uint32_t *pi_runs,
+ uint32_t **ppi_run_lengths,
+ ATSUStyle **ppp_styles )
{
+ int rv = VLC_SUCCESS;
filter_sys_t *p_sys = p_filter->p_sys;
UniChar *psz_text_orig = psz_text;
font_stack_t *p_fonts = NULL;
- int rv = VLC_SUCCESS;
+ vlc_value_t val;
+ int i_scale = 1000;
char *psz_node = NULL;
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 )
{
rv = PushFont( &p_fonts,
p_font_style->psz_fontname,
- p_font_style->i_font_size,
- p_font_style->i_font_color,
- p_font_style->i_font_alpha );
+ p_font_style->i_font_size * i_scale / 1000,
+ (p_font_style->i_font_color & 0xffffff) |
+ ((p_font_style->i_font_alpha & 0xff) << 24) );
if( p_font_style->i_style_flags & STYLE_BOLD )
b_bold = VLC_TRUE;
rv = PushFont( &p_fonts,
p_sys->psz_font_name,
p_sys->i_font_size,
- p_sys->i_font_color, 0 );
+ p_sys->i_font_color );
}
if( rv != VLC_SUCCESS )
return rv;
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 ) )
- {
- 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 );
- }
- }
- 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 ) )
{
uint32_t i_string_length;
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),
(uint8_t *) p_region_in->psz_html,
strlen( p_region_in->psz_html ),
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 )
{
UniChar *psz_text;
uint32_t *pi_run_lengths = NULL;
ATSUStyle *pp_styles = NULL;
- psz_text = (UniChar *) calloc( strlen( p_region_in->psz_html ), sizeof( UniChar ) );
+ psz_text = (UniChar *) malloc( strlen( p_region_in->psz_html ) *
+ sizeof( UniChar ) );
if( psz_text )
{
uint32_t k;
- ProcessNodes( p_filter, p_xml_reader, p_region_in->p_style, psz_text,
- &i_len, &i_runs, &pi_run_lengths, &pp_styles );
+ rv = ProcessNodes( p_filter, p_xml_reader,
+ p_region_in->p_style, psz_text, &i_len,
+ &i_runs, &pi_run_lengths, &pp_styles );
p_region_out->i_x = p_region_in->i_x;
p_region_out->i_y = p_region_in->i_y;
- RenderYUVA( p_filter, p_region_out, psz_text, i_len, i_runs, pi_run_lengths, pp_styles);
+ if(( rv == VLC_SUCCESS ) && ( i_len > 0 ))
+ {
+ RenderYUVA( p_filter, p_region_out, psz_text, i_len, i_runs,
+ pi_run_lengths, pp_styles);
+ }
for( k=0; k<i_runs; k++)
ATSUDisposeStyle( pp_styles[k] );
free( pp_styles );
free( pi_run_lengths );
-
free( psz_text );
}
return p_offScreen;
}
+static int GetFontSize( filter_t *p_filter )
+{
+ return p_filter->fmt_out.video.i_height / DEFAULT_REL_FONT_SIZE;
+}
+
static int RenderYUVA( filter_t *p_filter, subpicture_region_t *p_region, UniChar *psz_utf16_str,
uint32_t i_text_len, uint32_t i_runs, uint32_t *pi_run_lengths, ATSUStyle *pp_styles )
{
projects / vlc / blobdiff