# include "config.h"
#endif
-#include <vlc/vlc.h>
+#include <vlc_common.h>
+#include <vlc_plugin.h>
#include <vlc_vout.h>
#include <vlc_osd.h>
#include <vlc_block.h>
#include <vlc_stream.h>
#include <vlc_xml.h>
#include <vlc_input.h>
+#include <vlc_strings.h>
#include <math.h>
#include <Carbon/Carbon.h>
-#define DEFAULT_FONT "Verdana"
+#define DEFAULT_FONT "Arial Black"
#define DEFAULT_FONT_COLOR 0xffffff
#define DEFAULT_REL_FONT_SIZE 16
ATSUStyle *pp_styles );
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 );
+ bool b_bold, bool b_italic,
+ bool b_uline );
//////////////////////////////////////////////////////////////////////////////
// Module descriptor
//////////////////////////////////////////////////////////////////////////////
// RenderText. This module, unlike Freetype, doesn't provide any options to
// override the fallback font selection used when this style information is
// absent.
-vlc_module_begin();
- set_shortname( _("Mac Text renderer"));
- set_description( _("Quartz font renderer") );
- set_category( CAT_VIDEO );
- set_subcategory( SUBCAT_VIDEO_SUBPIC );
-
- set_capability( "text renderer", 120 );
- add_shortcut( "text" );
- set_callbacks( Create, Destroy );
-vlc_module_end();
-
-typedef struct font_stack_t font_stack_t;
-struct font_stack_t
-{
- char *psz_name;
- int i_size;
- uint32_t i_color; // ARGB
-
- font_stack_t *p_next;
-};
+#define FONT_TEXT N_("Font")
+#define FONT_LONGTEXT N_("Name for the font you want to use")
+#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." )
+#define COLOR_TEXT N_("Text default color")
+#define COLOR_LONGTEXT N_("The color of the text that will be rendered on "\
+ "the video. This must be an hexadecimal (like HTML colors). The first two "\
+ "chars are for red, then green, then blue. #000000 = black, #FF0000 = red,"\
+ " #00FF00 = green, #FFFF00 = yellow (red + green), #FFFFFF = white" )
+
+static const int pi_color_values[] = {
+ 0x00000000, 0x00808080, 0x00C0C0C0, 0x00FFFFFF, 0x00800000,
+ 0x00FF0000, 0x00FF00FF, 0x00FFFF00, 0x00808000, 0x00008000, 0x00008080,
+ 0x0000FF00, 0x00800080, 0x00000080, 0x000000FF, 0x0000FFFF };
+
+static const char *const 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") };
+
+static const int pi_sizes[] = { 20, 18, 16, 12, 6 };
+static const char *const ppsz_sizes_text[] = {
+ N_("Smaller"), N_("Small"), N_("Normal"), N_("Large"), N_("Larger") };
+
+vlc_module_begin ()
+ set_shortname( N_("Mac Text renderer"))
+ set_description( N_("Quartz font renderer") )
+ set_category( CAT_VIDEO )
+ set_subcategory( SUBCAT_VIDEO_SUBPIC )
+
+ add_string( "quartztext-font", DEFAULT_FONT, NULL, FONT_TEXT, FONT_LONGTEXT,
+ false )
+ add_integer( "quartztext-rel-fontsize", DEFAULT_REL_FONT_SIZE, NULL, FONTSIZER_TEXT,
+ FONTSIZER_LONGTEXT, false )
+ change_integer_list( pi_sizes, ppsz_sizes_text, NULL );
+ add_integer( "quartztext-color", 0x00FFFFFF, NULL, COLOR_TEXT,
+ COLOR_LONGTEXT, false )
+ change_integer_list( pi_color_values, ppsz_color_descriptions, NULL );
+ set_capability( "text renderer", 150 )
+ add_shortcut( "text" )
+ set_callbacks( Create, Destroy )
+vlc_module_end ()
typedef struct offscreen_bitmap_t offscreen_bitmap_t;
struct offscreen_bitmap_t
int i_fonts;
};
+#define UCHAR UniChar
+#define TR_DEFAULT_FONT p_sys->psz_font_name
+#define TR_FONT_STYLE_PTR ATSUStyle
+
+#include "text_renderer.h"
+
//////////////////////////////////////////////////////////////////////////////
// Create: allocates osd-text video thread output method
//////////////////////////////////////////////////////////////////////////////
// Allocate structure
p_filter->p_sys = p_sys = malloc( sizeof( filter_sys_t ) );
if( !p_sys )
- {
- msg_Err( p_filter, "out of memory" );
return VLC_ENOMEM;
- }
- p_sys->psz_font_name = strdup( DEFAULT_FONT );
+ p_sys->psz_font_name = var_CreateGetString( p_this, "quartztext-font" );
p_sys->i_font_opacity = 255;
- p_sys->i_font_color = DEFAULT_FONT_COLOR;
+ p_sys->i_font_color = __MAX( __MIN( var_CreateGetInteger( p_this, "quartztext-color" ) , 0xFFFFFF ), 0 );
p_sys->i_font_size = GetFontSize( p_filter );
p_filter->pf_render_text = RenderText;
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 );
}
int i_string_length;
p_cfString = CFStringCreateWithCString( NULL, psz_utf8_str, kCFStringEncodingUTF8 );
+ if( !p_cfString )
+ return;
+
i_string_length = CFStringGetLength( p_cfString );
if( pi_strlen )
ATSUStyle p_style = CreateStyle( p_sys->psz_font_name, i_font_size,
(i_font_color & 0xffffff) |
((i_font_alpha & 0xff) << 24),
- VLC_FALSE, VLC_FALSE, VLC_FALSE );
+ false, false, false );
if( p_style )
{
RenderYUVA( p_filter, p_region_out, psz_utf16_str, i_string_length,
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 )
+ bool b_bold, bool b_italic, bool b_uline )
{
ATSUStyle p_style;
OSStatus status;
return NULL;
}
-static int PushFont( font_stack_t **p_font, const char *psz_name, int i_size,
- uint32_t i_color )
-{
- font_stack_t *p_new;
-
- if( !p_font )
- return VLC_EGENERIC;
-
- p_new = malloc( sizeof( font_stack_t ) );
- if( ! p_new )
- return VLC_ENOMEM;
-
- p_new->p_next = NULL;
-
- if( psz_name )
- p_new->psz_name = strdup( psz_name );
- else
- p_new->psz_name = NULL;
-
- p_new->i_size = i_size;
- p_new->i_color = i_color;
-
- if( !*p_font )
- {
- *p_font = p_new;
- }
- else
- {
- font_stack_t *p_last;
-
- for( p_last = *p_font;
- p_last->p_next;
- p_last = p_last->p_next )
- ;
-
- p_last->p_next = p_new;
- }
- return VLC_SUCCESS;
-}
-
-static int PopFont( font_stack_t **p_font )
-{
- font_stack_t *p_last, *p_next_to_last;
-
- if( !p_font || !*p_font )
- return VLC_EGENERIC;
-
- p_next_to_last = NULL;
- for( p_last = *p_font;
- p_last->p_next;
- p_last = p_last->p_next )
- {
- p_next_to_last = p_last;
- }
-
- if( p_next_to_last )
- p_next_to_last->p_next = NULL;
- else
- *p_font = NULL;
-
- free( p_last->psz_name );
- free( p_last );
-
- return VLC_SUCCESS;
-}
-
-static int PeekFont( font_stack_t **p_font, char **psz_name, int *i_size,
- uint32_t *i_color )
-{
- font_stack_t *p_last;
-
- if( !p_font || !*p_font )
- return VLC_EGENERIC;
-
- for( p_last=*p_font;
- p_last->p_next;
- p_last=p_last->p_next )
- ;
-
- *psz_name = p_last->psz_name;
- *i_size = p_last->i_size;
- *i_color = p_last->i_color;
-
- 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 )
+ font_stack_t **p_fonts, bool b_bold, bool b_italic,
+ bool b_uline )
{
ATSUStyle p_style = NULL;
char *psz_fontname = NULL;
uint32_t i_font_color = p_sys->i_font_color;
+ uint32_t i_karaoke_bg_color = i_font_color; /* Use it */
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_color, &i_karaoke_bg_color ))
{
p_style = CreateStyle( psz_fontname, i_font_size, i_font_color,
b_bold, b_italic, b_uline );
return p_style;
}
-static int HandleFontAttributes( xml_reader_t *p_xml_reader,
- font_stack_t **p_fonts, int i_scale )
+static void SetupLine( filter_t *p_filter, const char *psz_text_in,
+ UniChar **psz_text_out, uint32_t *pi_runs,
+ uint32_t **ppi_run_lengths, ATSUStyle **ppp_styles,
+ ATSUStyle p_style )
{
- 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;
+ uint32_t i_string_length = 0;
- while ( xml_ReaderNextAttr( p_xml_reader ) == VLC_SUCCESS )
- {
- char *psz_name = xml_ReaderName( p_xml_reader );
- char *psz_value = xml_ReaderValue( p_xml_reader );
+ ConvertToUTF16( psz_text_in, &i_string_length, psz_text_out );
+ *psz_text_out += i_string_length;
- 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) );
-
- 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;
- 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 )
+ if( ppp_styles && ppi_run_lengths )
{
- 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) );
-
- if( p_font_style->i_style_flags & STYLE_BOLD )
- b_bold = VLC_TRUE;
- if( p_font_style->i_style_flags & STYLE_ITALIC )
- b_italic = VLC_TRUE;
- if( p_font_style->i_style_flags & STYLE_UNDERLINE )
- b_uline = VLC_TRUE;
- }
- else
- {
- rv = PushFont( &p_fonts,
- p_sys->psz_font_name,
- p_sys->i_font_size,
- p_sys->i_font_color );
- }
- 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 = VLC_FALSE;
- else if( !strcasecmp( "i", psz_node ) )
- b_italic = VLC_FALSE;
- else if( !strcasecmp( "u", psz_node ) )
- b_uline = VLC_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 = 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;
-
- ConvertToUTF16( "\n", &i_string_length, &psz_text );
- psz_text += i_string_length;
-
- (*pi_runs)++;
+ (*pi_runs)++;
- if( *ppp_styles )
- *ppp_styles = (ATSUStyle *) realloc( *ppp_styles, *pi_runs * sizeof( ATSUStyle ) );
- else
- *ppp_styles = (ATSUStyle *) malloc( *pi_runs * sizeof( ATSUStyle ) );
+ if( *ppp_styles )
+ *ppp_styles = (ATSUStyle *) realloc( *ppp_styles, *pi_runs * sizeof( ATSUStyle ) );
+ else
+ *ppp_styles = (ATSUStyle *) malloc( *pi_runs * sizeof( ATSUStyle ) );
- (*ppp_styles)[ *pi_runs - 1 ] = GetStyleFromFontStack( p_sys, &p_fonts, b_bold, b_italic, b_uline );
+ (*ppp_styles)[ *pi_runs - 1 ] = p_style;
- if( *ppi_run_lengths )
- *ppi_run_lengths = (uint32_t *) realloc( *ppi_run_lengths, *pi_runs * sizeof( uint32_t ) );
- else
- *ppi_run_lengths = (uint32_t *) malloc( *pi_runs * sizeof( uint32_t ) );
+ if( *ppi_run_lengths )
+ *ppi_run_lengths = (uint32_t *) realloc( *ppi_run_lengths, *pi_runs * sizeof( uint32_t ) );
+ else
+ *ppi_run_lengths = (uint32_t *) malloc( *pi_runs * sizeof( uint32_t ) );
- (*ppi_run_lengths)[ *pi_runs - 1 ] = i_string_length;
- }
- free( psz_node );
- }
- break;
- case XML_READER_TEXT:
- psz_node = xml_ReaderValue( p_xml_reader );
- if( psz_node )
- {
- uint32_t i_string_length;
-
- // 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 " );
- }
-
- ConvertToUTF16( psz_node, &i_string_length, &psz_text );
- psz_text += i_string_length;
-
- (*pi_runs)++;
-
- if( *ppp_styles )
- *ppp_styles = (ATSUStyle *) realloc( *ppp_styles, *pi_runs * sizeof( ATSUStyle ) );
- else
- *ppp_styles = (ATSUStyle *) malloc( *pi_runs * sizeof( ATSUStyle ) );
-
- (*ppp_styles)[ *pi_runs - 1 ] = GetStyleFromFontStack( p_sys, &p_fonts, b_bold, b_italic, b_uline );
-
- if( *ppi_run_lengths )
- *ppi_run_lengths = (uint32_t *) realloc( *ppi_run_lengths, *pi_runs * sizeof( uint32_t ) );
- else
- *ppi_run_lengths = (uint32_t *) malloc( *pi_runs * sizeof( uint32_t ) );
-
- (*ppi_run_lengths)[ *pi_runs - 1 ] = i_string_length;
-
- free( psz_node );
- }
- break;
- }
+ (*ppi_run_lengths)[ *pi_runs - 1 ] = i_string_length;
}
-
- *pi_len = psz_text - psz_text_orig;
-
- while( VLC_SUCCESS == PopFont( &p_fonts ) );
-
- return rv;
}
static int RenderHtml( filter_t *p_filter, subpicture_region_t *p_region_out,
p_sub = stream_MemoryNew( VLC_OBJECT(p_filter),
(uint8_t *) p_region_in->psz_html,
strlen( p_region_in->psz_html ),
- VLC_TRUE );
+ true )
if( p_sub )
{
p_xml = xml_Create( p_filter );
if( p_xml )
{
- vlc_bool_t b_karaoke = VLC_FALSE;
+ bool b_karaoke = false;
p_xml_reader = xml_ReaderCreate( p_xml, p_sub );
if( p_xml_reader )
/* 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;
+ var_SetBool( p_filter, "text-rerender", true );
+ b_karaoke = true;
}
else if( !strcasecmp( "text", psz_node ) )
{
- b_karaoke = VLC_FALSE;
+ b_karaoke = false;
}
else
{
UniChar *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;
ATSUStyle *pp_styles = NULL;
psz_text = (UniChar *) malloc( strlen( p_region_in->psz_html ) *
rv = ProcessNodes( p_filter, p_xml_reader,
p_region_in->p_style, psz_text, &i_len,
- &i_runs, &pi_run_lengths, &pp_styles );
+ &i_runs, &pi_run_lengths, &pp_styles,
+ /* No karaoke support */
+ false, &i_k_runs, &pi_k_run_lengths, &pi_k_durations );
+
+ assert( pi_k_run_lengths == NULL && pi_k_durations == NULL );
p_region_out->i_x = p_region_in->i_x;
p_region_out->i_y = p_region_in->i_y;
// Set up black outlining of the text --
CGContextSetRGBStrokeColor( p_context, 0, 0, 0, 0.5 );
CGContextSetTextDrawingMode( p_context, kCGTextFillStroke );
-
+ CGContextSetShadow( p_context, CGSizeMake( 0, 0 ), 5 );
+ float black_components[4] = {0, 0, 0, 1};
+ CGContextSetShadowWithColor (p_context, CGSizeMake( 0, 0 ), 5, CGColorCreate( CGColorSpaceCreateWithName( kCGColorSpaceGenericRGB ), black_components ));
do
{
// ATSUBreakLine will automatically pick up any manual '\n's also
// you move down the page
y -= ascent;
- // Set the outlining for this line to be dependant on the size of the line -
+ // Set the outlining for this line to be dependent on the size of the line -
// make it about 5% of the ascent, with a minimum at 1.0
float f_thickness = FixedToFloat( ascent ) * 0.05;
- CGContextSetLineWidth( p_context, (( f_thickness > 1.0 ) ? 1.0 : f_thickness ));
-
+ CGContextSetLineWidth( p_context, (( f_thickness < 1.0 ) ? 1.0 : f_thickness ));
ATSUDrawText( p_textLayout, i_start, i_end - i_start, x, y );
// and now prepare for the next line by coming down far enough for our
static int GetFontSize( filter_t *p_filter )
{
- return p_filter->fmt_out.video.i_height / DEFAULT_REL_FONT_SIZE;
+ return p_filter->fmt_out.video.i_height / __MAX(1, var_CreateGetInteger( p_filter, "quartztext-rel-fontsize" ));
}
static int RenderYUVA( filter_t *p_filter, subpicture_region_t *p_region, UniChar *psz_utf16_str,
video_format_t fmt;
int x, y, i_offset, i_pitch;
uint8_t i_y, i_u, i_v; // YUV values, derived from incoming RGB
- subpicture_region_t *p_region_tmp;
// Create a new subpicture region
memset( &fmt, 0, sizeof(video_format_t) );
fmt.i_width = fmt.i_visible_width = i_width;
fmt.i_height = fmt.i_visible_height = i_textblock_height + VERTICAL_MARGIN * 2;
fmt.i_x_offset = fmt.i_y_offset = 0;
- p_region_tmp = spu_CreateRegion( p_filter, &fmt );
- if( !p_region_tmp )
- {
- msg_Err( p_filter, "cannot allocate SPU region" );
+
+ p_region->p_picture = picture_New( fmt.i_chroma, fmt.i_width, fmt.i_height, fmt.i_aspect );
+ if( !p_region->p_picture )
return VLC_EGENERIC;
- }
- p_region->fmt = p_region_tmp->fmt;
- p_region->picture = p_region_tmp->picture;
- free( p_region_tmp );
-
- p_dst_y = p_region->picture.Y_PIXELS;
- p_dst_u = p_region->picture.U_PIXELS;
- p_dst_v = p_region->picture.V_PIXELS;
- p_dst_a = p_region->picture.A_PIXELS;
- i_pitch = p_region->picture.A_PITCH;
+ p_region->fmt = fmt;
+
+ p_dst_y = p_region->p_picture->Y_PIXELS;
+ p_dst_u = p_region->p_picture->U_PIXELS;
+ p_dst_v = p_region->p_picture->V_PIXELS;
+ p_dst_a = p_region->p_picture->A_PIXELS;
+ i_pitch = p_region->p_picture->A_PITCH;
i_offset = VERTICAL_MARGIN *i_pitch;
for( y=0; y<i_textblock_height; y++)