/*****************************************************************************
* quartztext.c : Put text on the video, using Mac OS X Quartz Engine
*****************************************************************************
- * Copyright (C) 2007 the VideoLAN team
+ * Copyright (C) 2007, 2009 the VideoLAN team
* $Id$
*
* Authors: Bernie Purcell <bitmap@videolan.org>
//////////////////////////////////////////////////////////////////////////////
// Preamble
//////////////////////////////////////////////////////////////////////////////
-#include <stdlib.h> // malloc(), free()
-#include <string.h>
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#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
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,
- vlc_bool_t b_bold, vlc_bool_t b_italic,
- vlc_bool_t b_uline );
+ uint32_t i_font_color,
+ 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;
- int i_color;
- int i_alpha;
-
- 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_size = p_filter->fmt_out.video.i_height / DEFAULT_REL_FONT_SIZE;
+ 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;
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 );
}
p_input = (input_thread_t *)vlc_object_find( p_filter, VLC_OBJECT_INPUT, FIND_PARENT );
if( ! p_input )
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_fonts = 0;
p_sys->p_fonts = malloc( i_attachments_cnt * sizeof( ATSFontContainerRef ) );
}
vlc_input_attachment_Delete( p_attach );
}
- free( pp_attachments );
+ free( pp_attachments );
+
+ vlc_object_release(p_input);
return rv;
}
// Original version of these functions available on:
// http://developer.apple.com/documentation/Carbon/Conceptual/QuickDrawToQuartz2D/tq_color/chapter_4_section_3.html
-#define kGenericRGBProfilePathStr "/System/Library/ColorSync/Profiles/Generic RGB Profile.icc"
-
+#define kGenericRGBProfilePathStr "/System/Library/ColorSync/Profiles/Generic RGB Profile.icc"
+
static CMProfileRef OpenGenericProfile( void )
{
static CMProfileRef cached_rgb_prof = NULL;
-
+
// Create the profile reference only once
if( cached_rgb_prof == NULL )
{
OSStatus err;
CMProfileLocation loc;
-
+
loc.locType = cmPathBasedProfile;
strcpy( loc.u.pathLoc.path, kGenericRGBProfilePathStr );
-
+
err = CMOpenProfile( &cached_rgb_prof, &loc );
-
+
if( err != noErr )
{
cached_rgb_prof = NULL;
}
}
-
+
if( cached_rgb_prof )
{
- // Clone the profile reference so that the caller has
+ // Clone the profile reference so that the caller has
// their own reference, not our cached one.
- CMCloneProfileRef( cached_rgb_prof );
+ CMCloneProfileRef( cached_rgb_prof );
}
-
+
return cached_rgb_prof;
}
static CGColorSpaceRef CreateGenericRGBColorSpace( void )
{
static CGColorSpaceRef p_generic_rgb_cs = NULL;
-
+
if( p_generic_rgb_cs == NULL )
{
CMProfileRef generic_rgb_prof = OpenGenericProfile();
-
+
if( generic_rgb_prof )
{
p_generic_rgb_cs = CGColorSpaceCreateWithPlatformColorSpace( generic_rgb_prof );
-
- CMCloseProfile( generic_rgb_prof );
+
+ CMCloseProfile( generic_rgb_prof );
}
}
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 )
*ppsz_utf16_str = (UniChar *) calloc( i_string_length, sizeof( UniChar ) );
CFStringGetCharacters( p_cfString, CFRangeMake( 0, i_string_length ), *ppsz_utf16_str );
-
+
CFRelease( p_cfString );
}
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( !i_font_alpha ) i_font_alpha = 255 - p_sys->i_font_opacity;
-
+
ConvertToUTF16( EliminateCRLF( psz_string ), &i_string_length, &psz_utf16_str );
p_region_out->i_x = p_region_in->i_x;
if( psz_utf16_str != NULL )
{
ATSUStyle p_style = CreateStyle( p_sys->psz_font_name, i_font_size,
- i_font_color, i_font_alpha,
- VLC_FALSE, VLC_FALSE, VLC_FALSE );
+ (i_font_color & 0xffffff) |
+ ((i_font_alpha & 0xff) << 24),
+ 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, int i_font_color, int i_font_alpha,
- vlc_bool_t b_bold, vlc_bool_t b_italic, vlc_bool_t b_uline )
+static ATSUStyle CreateStyle( char *psz_fontname, int i_font_size, uint32_t i_font_color,
+ bool b_bold, bool b_italic, bool b_uline )
{
ATSUStyle p_style;
OSStatus status;
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 );
return NULL;
}
-static int PushFont( font_stack_t **p_font, const char *psz_name, int i_size,
- int i_color, int i_alpha )
-{
- font_stack_t *p_new;
-
- if( !p_font )
- return VLC_EGENERIC;
-
- p_new = malloc( sizeof( font_stack_t ) );
- 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;
- p_new->i_alpha = i_alpha;
-
- 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,
- int *i_color, int *i_alpha )
-{
- 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;
- *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, bool b_bold, bool b_italic,
+ bool 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;
+ 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_alpha ) )
+ if( VLC_SUCCESS == PeekFont( p_fonts, &psz_fontname, &i_font_size,
+ &i_font_color, &i_karaoke_bg_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 void 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 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 )
{
- filter_sys_t *p_sys = p_filter->p_sys;
- UniChar *psz_text_orig = psz_text;
- font_stack_t *p_fonts = NULL;
+ uint32_t i_string_length = 0;
- char *psz_node = NULL;
+ ConvertToUTF16( psz_text_in, &i_string_length, psz_text_out );
+ *psz_text_out += i_string_length;
- vlc_bool_t b_italic = VLC_FALSE;
- vlc_bool_t b_bold = VLC_FALSE;
- vlc_bool_t b_uline = VLC_FALSE;
-
- if( p_font_style )
+ if( ppp_styles && ppi_run_lengths )
{
- 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 );
-
- 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
- {
- PushFont( &p_fonts, p_sys->psz_font_name, p_sys->i_font_size, p_sys->i_font_color, 0 );
- }
-
- 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 ) )
- {
- 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 );
- }
- 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)++;
-
- if( *ppp_styles )
- *ppp_styles = (ATSUStyle *) realloc( *ppp_styles, *pi_runs * sizeof( ATSUStyle ) );
- else
- *ppp_styles = (ATSUStyle *) malloc( *pi_runs * sizeof( ATSUStyle ) );
+ (*pi_runs)++;
- (*ppp_styles)[ *pi_runs - 1 ] = GetStyleFromFontStack( p_sys, &p_fonts, b_bold, b_italic, b_uline );
+ if( *ppp_styles )
+ *ppp_styles = (ATSUStyle *) realloc( *ppp_styles, *pi_runs * sizeof( ATSUStyle ) );
+ else
+ *ppp_styles = (ATSUStyle *) malloc( *pi_runs * sizeof( ATSUStyle ) );
- 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 ) );
+ (*ppp_styles)[ *pi_runs - 1 ] = p_style;
- (*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;
+ 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 ) );
- // 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 ) );
}
static int RenderHtml( filter_t *p_filter, subpicture_region_t *p_region_out,
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 ),
- VLC_TRUE );
+ true );
if( p_sub )
{
p_xml = xml_Create( p_filter );
if( p_xml )
{
+ bool b_karaoke = 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", true );
+ b_karaoke = true;
+ }
+ else if( !strcasecmp( "text", psz_node ) )
+ {
+ b_karaoke = 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;
- int i_len;
+ 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 *) 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,
+ /* 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;
- 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 );
}
p_bitmap->p_data = calloc( i_height, p_bitmap->i_bytesPerRow );
-#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_4
*pp_colorSpace = CGColorSpaceCreateWithName( kCGColorSpaceGenericRGB );
-#else
- *pp_colorSpace = CreateGenericRGBColorSpace();
-#endif
if( p_bitmap->p_data && *pp_colorSpace )
{
}
if( p_context )
{
-#if MAC_OS_X_VERSION_MIN_REQUIRED > MAC_OS_X_VERSION_10_1
- // OS X 10.1 doesn't support weak linking of this call which is only available
- // int 10.4 and later
if( CGContextSetAllowsAntialiasing != NULL )
{
CGContextSetAllowsAntialiasing( p_context, true );
}
-#endif
}
*pp_memory = p_bitmap;
}
offscreen_bitmap_t *p_offScreen = NULL;
CGColorSpaceRef p_colorSpace = NULL;
CGContextRef p_context = NULL;
-
+
p_context = CreateOffScreenContext( i_width, i_height, &p_offScreen, &p_colorSpace );
if( p_context )
{
alignment = kATSUEndAlignment;
}
- else if( i_text_align != SUBPICTURE_ALIGN_LEFT )
+ else if( i_text_align != SUBPICTURE_ALIGN_LEFT )
{
alignment = kATSUCenterAlignment;
}
uint32_t i_start = 0;
uint32_t i_end = i_text_len;
- // Set up black outlining of the text --
+ // 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
return p_offScreen;
}
+static int GetFontSize( filter_t *p_filter )
+{
+ 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,
uint32_t i_text_len, uint32_t i_runs, uint32_t *pi_run_lengths, ATSUStyle *pp_styles )
{
int i_width = p_filter->fmt_out.video.i_visible_width;
int i_height = p_filter->fmt_out.video.i_visible_height;
+ int i_text_align = p_region->i_align & 0x3;
- if( psz_utf16_str != NULL )
+ if( !psz_utf16_str )
{
- int i_text_align = p_region->i_align & 0x3;
+ msg_Err( p_filter, "Invalid argument to RenderYUVA" );
+ return VLC_EGENERIC;
+ }
+
+ p_offScreen = Compose( i_text_align, psz_utf16_str, i_text_len,
+ i_runs, pi_run_lengths, pp_styles,
+ i_width, i_height, &i_textblock_height );
- p_offScreen = Compose( i_text_align, psz_utf16_str, i_text_len,
- i_runs, pi_run_lengths, pp_styles,
- i_width, i_height, &i_textblock_height );
+ if( !p_offScreen )
+ {
+ msg_Err( p_filter, "No offscreen buffer" );
+ return VLC_EGENERIC;
}
uint8_t *p_dst_y,*p_dst_u,*p_dst_v,*p_dst_a;
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_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;
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++)
projects / vlc / blobdiff