X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fmisc%2Ffreetype.c;h=a397304ddfc8822d91b9d259fbcd8aff201e842b;hb=6c12fccf36421378a439879c4f765625182bae00;hp=d69d5e678c9a44482f38197aeb8370860396a495;hpb=43b0f24c15b32026b1ba620dd7810598821e270a;p=vlc diff --git a/modules/misc/freetype.c b/modules/misc/freetype.c index d69d5e678c..a397304ddf 100644 --- a/modules/misc/freetype.c +++ b/modules/misc/freetype.c @@ -1,11 +1,12 @@ /***************************************************************************** * freetype.c : Put text on the video, using freetype2 ***************************************************************************** - * Copyright (C) 2002 - 2005 the VideoLAN team + * Copyright (C) 2002 - 2007 the VideoLAN team * $Id$ * * Authors: Sigmund Augdal Helberg * Gildas Bazin + * Bernie Purcell * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -25,26 +26,22 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include /* malloc(), free() */ -#include -#ifdef HAVE_LINUX_LIMITS_H -# include +#ifdef HAVE_CONFIG_H +# include "config.h" #endif -#include -#include +#include +#include #include -#include #include #include #include +#include +#include #include - -#ifdef HAVE_ERRNO_H -# include -#endif +#include #include #include FT_FREETYPE_H @@ -75,30 +72,14 @@ #include #endif -typedef struct line_desc_t line_desc_t; +#include /***************************************************************************** - * Local prototypes + * Module descriptor *****************************************************************************/ static int Create ( vlc_object_t * ); static void Destroy( vlc_object_t * ); -/* The RenderText call maps to pf_render_string, defined in vlc_filter.h */ -static int RenderText( filter_t *, subpicture_region_t *, - subpicture_region_t * ); -#ifdef HAVE_FONTCONFIG -static int RenderHtml( filter_t *, subpicture_region_t *, - subpicture_region_t * ); -static char *FontConfig_Select( FcConfig *, const char *, - vlc_bool_t, vlc_bool_t, int * ); -#endif -static line_desc_t *NewLine( byte_t * ); - -static int SetFontSize( filter_t *, int ); - -/***************************************************************************** - * Module descriptor - *****************************************************************************/ #define FONT_TEXT N_("Font") #define FONT_LONGTEXT N_("Filename for the font you want to use") #define FONTSIZE_TEXT N_("Font size in pixels") @@ -120,9 +101,9 @@ static int SetFontSize( filter_t *, int ); "fonts that will be rendered on the video. If absolute font size is set, "\ "relative size will be overriden." ) -static int pi_sizes[] = { 20, 18, 16, 12, 6 }; -static char *ppsz_sizes_text[] = { N_("Smaller"), N_("Small"), N_("Normal"), - N_("Large"), N_("Larger") }; +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") }; #define YUVP_TEXT N_("Use YUVP renderer") #define YUVP_LONGTEXT N_("This renders the font using \"paletized YUV\". " \ "This option is only needed if you want to encode into DVB subtitles" ) @@ -130,58 +111,83 @@ static char *ppsz_sizes_text[] = { N_("Smaller"), N_("Small"), N_("Normal"), #define EFFECT_LONGTEXT N_("It is possible to apply effects to the rendered " \ "text to improve its readability." ) -#define EFFECT_BACKGROUND 1 +#define EFFECT_BACKGROUND 1 #define EFFECT_OUTLINE 2 #define EFFECT_OUTLINE_FAT 3 -static int pi_effects[] = { 1, 2, 3 }; -static char *ppsz_effects_text[] = { N_("Background"),N_("Outline"), - N_("Fat Outline") }; -static int pi_color_values[] = { +static int const pi_effects[] = { 1, 2, 3 }; +static const char *const ppsz_effects_text[] = { + N_("Background"),N_("Outline"), N_("Fat Outline") }; +static const int pi_color_values[] = { 0x00000000, 0x00808080, 0x00C0C0C0, 0x00FFFFFF, 0x00800000, - 0x00FF0000, 0x00FF00FF, 0x00FFFF00, 0x00808000, 0x00008000, 0x00008080, - 0x0000FF00, 0x00800080, 0x00000080, 0x000000FF, 0x0000FFFF }; + 0x00FF0000, 0x00FF00FF, 0x00FFFF00, 0x00808000, 0x00008000, 0x00008080, + 0x0000FF00, 0x00800080, 0x00000080, 0x000000FF, 0x0000FFFF }; -static char *ppsz_color_descriptions[] = { +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") }; -vlc_module_begin(); - set_shortname( _("Text renderer")); - set_description( _("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, - VLC_FALSE ); + false ); add_integer( "freetype-fontsize", 0, NULL, FONTSIZE_TEXT, - FONTSIZE_LONGTEXT, VLC_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, VLC_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, VLC_FALSE ); - change_integer_list( pi_color_values, ppsz_color_descriptions, 0 ); + COLOR_LONGTEXT, false ); + change_integer_list( pi_color_values, ppsz_color_descriptions, NULL ); add_integer( "freetype-rel-fontsize", 16, NULL, FONTSIZER_TEXT, - FONTSIZER_LONGTEXT, VLC_FALSE ); - change_integer_list( pi_sizes, ppsz_sizes_text, 0 ); + FONTSIZER_LONGTEXT, false ); + change_integer_list( pi_sizes, ppsz_sizes_text, NULL ); add_integer( "freetype-effect", 2, NULL, EFFECT_TEXT, - EFFECT_LONGTEXT, VLC_FALSE ); - change_integer_list( pi_effects, ppsz_effects_text, 0 ); + EFFECT_LONGTEXT, false ); + change_integer_list( pi_effects, ppsz_effects_text, NULL ); add_bool( "freetype-yuvp", 0, NULL, YUVP_TEXT, - YUVP_LONGTEXT, VLC_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 () + + + +/***************************************************************************** + * Local prototypes + *****************************************************************************/ + +/* The RenderText call maps to pf_render_string, defined in vlc_filter.h */ +static int RenderText( filter_t *, subpicture_region_t *, + subpicture_region_t * ); +#ifdef HAVE_FONTCONFIG +static int RenderHtml( filter_t *, subpicture_region_t *, + subpicture_region_t * ); +static char *FontConfig_Select( FcConfig *, const char *, + bool, bool, int * ); +#endif + + +static int LoadFontsFromAttachments( filter_t *p_filter ); +static int GetFontSize( filter_t *p_filter ); +static int SetFontSize( filter_t *, int ); +static void YUVFromRGB( uint32_t i_argb, + uint8_t *pi_y, uint8_t *pi_u, uint8_t *pi_v ); + +typedef struct line_desc_t line_desc_t; struct line_desc_t { /** NULL-terminated list of glyphs making the string */ @@ -192,8 +198,10 @@ struct line_desc_t * -- if the rendering mode supports it (RenderYUVA) and * b_new_color_mode is set, then it becomes possible to * have multicoloured text within the subtitles. */ - uint32_t *p_rgb; - vlc_bool_t b_new_color_mode; + uint32_t *p_fg_rgb; + uint32_t *p_bg_rgb; + uint8_t *p_fg_bg_ratio; /* 0x00=100% FG --> 0x7F=100% BG */ + bool b_new_color_mode; /** underline information -- only supplied if text should be underlined */ uint16_t *pi_underline_offset; uint16_t *pi_underline_thickness; @@ -205,22 +213,33 @@ struct line_desc_t line_desc_t *p_next; }; +static line_desc_t *NewLine( int ); -typedef struct font_stack_t font_stack_t; -struct font_stack_t +typedef struct { - char *psz_name; - int i_size; - int i_color; - int i_alpha; - - font_stack_t *p_next; -}; + int i_font_size; + uint32_t i_font_color; /* ARGB */ + uint32_t i_karaoke_bg_color; /* ARGB */ + bool b_italic; + bool b_bold; + bool b_underline; + char *psz_fontname; +} ft_style_t; static int Render( filter_t *, subpicture_region_t *, line_desc_t *, int, int); static void FreeLines( line_desc_t * ); static void FreeLine( line_desc_t * ); +#ifdef HAVE_FONTCONFIG +static vlc_object_t *FontBuilderAttach( filter_t *p_filter ); +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 ***************************************************************************** @@ -231,7 +250,7 @@ struct filter_sys_t { FT_Library p_library; /* handle to library */ FT_Face p_face; /* handle to face object */ - vlc_bool_t i_use_kerning; + bool i_use_kerning; uint8_t i_font_opacity; int i_font_color; int i_font_size; @@ -240,10 +259,22 @@ struct filter_sys_t int i_default_font_size; int i_display_height; #ifdef HAVE_FONTCONFIG + bool b_fontconfig_ok; FcConfig *p_fontconfig; #endif + + input_attachment_t **pp_font_attachments; + int i_font_attachments; + + vlc_object_t *p_fontbuilder; }; +#define UCHAR uint32_t +#define TR_DEFAULT_FONT FC_DEFAULT_FONT +#define TR_FONT_STYLE_PTR ft_style_t * + +#include "text_renderer.h" + /***************************************************************************** * Create: allocates osd-text video thread output method ***************************************************************************** @@ -251,19 +282,16 @@ struct filter_sys_t *****************************************************************************/ static int Create( vlc_object_t *p_this ) { - filter_t *p_filter = (filter_t *)p_this; - filter_sys_t *p_sys; - char *psz_fontfile = NULL; - int i_error; - vlc_value_t val; + filter_t *p_filter = (filter_t *)p_this; + filter_sys_t *p_sys; + char *psz_fontfile = NULL; + int i_error; + vlc_value_t val; /* 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->p_face = 0; p_sys->p_library = 0; p_sys->i_font_size = 0; @@ -286,18 +314,20 @@ static int Create( vlc_object_t *p_this ) 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 ) { - if( psz_fontfile ) free( psz_fontfile ); + free( psz_fontfile ); psz_fontfile = (char *)malloc( PATH_MAX + 1 ); + if( !psz_fontfile ) + goto error; #ifdef WIN32 GetWindowsDirectory( psz_fontfile, PATH_MAX + 1 ); strcat( psz_fontfile, "\\fonts\\arial.ttf" ); -#elif __APPLE__ +#elif defined(__APPLE__) strcpy( psz_fontfile, DEFAULT_FONT ); #else msg_Err( p_filter, "user didn't specify a font" ); @@ -305,19 +335,12 @@ static int Create( vlc_object_t *p_this ) #endif } -#ifdef HAVE_FONTCONFIG - if( FcInit() ) - p_sys->p_fontconfig = FcConfigGetCurrent(); - else - p_sys->p_fontconfig = NULL; -#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 ); if( i_error == FT_Err_Unknown_File_Format ) @@ -338,25 +361,38 @@ static int Create( vlc_object_t *p_this ) goto error; } +#ifdef HAVE_FONTCONFIG + p_sys->b_fontconfig_ok = false; + p_sys->p_fontconfig = NULL; + p_sys->p_fontbuilder = FontBuilderAttach( p_filter ); +#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; - if( psz_fontfile ) free( psz_fontfile ); + 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; #else p_filter->pf_render_html = NULL; #endif + + LoadFontsFromAttachments( p_filter ); + return VLC_SUCCESS; error: if( p_sys->p_face ) FT_Done_Face( p_sys->p_face ); if( p_sys->p_library ) FT_Done_FreeType( p_sys->p_library ); - if( psz_fontfile ) free( psz_fontfile ); + free( psz_fontfile ); free( p_sys ); return VLC_EGENERIC; } @@ -371,18 +407,237 @@ static void Destroy( vlc_object_t *p_this ) filter_t *p_filter = (filter_t *)p_this; filter_sys_t *p_sys = p_filter->p_sys; + if( p_sys->pp_font_attachments ) + { + int k; + + for( k = 0; k < p_sys->i_font_attachments; k++ ) + vlc_input_attachment_Delete( p_sys->pp_font_attachments[k] ); + + free( p_sys->pp_font_attachments ); + } + #ifdef HAVE_FONTCONFIG - FcConfigDestroy( p_sys->p_fontconfig ); - p_sys->p_fontconfig = NULL; + FontBuilderDetach( p_filter, p_sys->p_fontbuilder ); +#endif + /* FcFini asserts calling the subfunction FcCacheFini() * even if no other library functions have been made since FcInit(), * so don't call it. */ -#endif + FT_Done_Face( p_sys->p_face ); FT_Done_FreeType( p_sys->p_library ); free( p_sys ); } +#ifdef HAVE_FONTCONFIG +static vlc_mutex_t fb_lock = VLC_STATIC_MUTEX; + +static vlc_object_t *FontBuilderAttach( filter_t *p_filter ) +{ + /* Check for an existing Fontbuilder thread */ + vlc_mutex_lock( &fb_lock ); + 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 ) ) + { + msg_Warn( p_filter, "fontconfig database builder thread can't " + "be launched. Font styling support will be limited." ); + } + } + } + else + vlc_object_hold( p_fontbuilder ); + if( p_fontbuilder ) + { + var_AddCallback( p_fontbuilder, "build-done", FontBuilderDone, p_filter ); + FontBuilderGetFcConfig( p_filter, p_fontbuilder ); + } + vlc_mutex_unlock( &fb_lock ); + return p_fontbuilder; +} +static void FontBuilderDetach( filter_t *p_filter, vlc_object_t *p_fontbuilder ) +{ + vlc_mutex_lock( &fb_lock ); + 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( &fb_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( &fb_lock ); + } + vlc_object_release( p_fontbuilder ); + } + vlc_mutex_unlock( &fb_lock ); +} +static void* FontBuilderThread( vlc_object_t *p_this ) +{ + FcConfig *p_fontconfig = FcInitLoadConfig(); + + 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_lock( &fb_lock ); + p_this->p_private = p_fontconfig; + vlc_mutex_unlock( &fb_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_lock( &fb_lock ); + + FontBuilderGetFcConfig( p_filter, p_this ); + + vlc_mutex_unlock( &fb_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 LoadFontsFromAttachments( filter_t *p_filter ) +{ + filter_sys_t *p_sys = p_filter->p_sys; + input_thread_t *p_input; + input_attachment_t **pp_attachments; + int i_attachments_cnt; + int k; + int rv = VLC_SUCCESS; + + 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_font_attachments = 0; + p_sys->pp_font_attachments = malloc( i_attachments_cnt * sizeof( input_attachment_t * )); + if(! p_sys->pp_font_attachments ) + rv = VLC_ENOMEM; + + for( k = 0; k < i_attachments_cnt; k++ ) + { + input_attachment_t *p_attach = pp_attachments[k]; + + if( p_sys->pp_font_attachments ) + { + if(( !strcmp( p_attach->psz_mime, "application/x-truetype-font" ) || // TTF + !strcmp( p_attach->psz_mime, "application/x-font-otf" ) ) && // OTF + ( p_attach->i_data > 0 ) && + ( p_attach->p_data != NULL ) ) + { + p_sys->pp_font_attachments[ p_sys->i_font_attachments++ ] = p_attach; + } + else + { + vlc_input_attachment_Delete( p_attach ); + } + } + else + { + vlc_input_attachment_Delete( p_attach ); + } + } + free( pp_attachments ); + + vlc_object_release(p_input); + + return rv; +} + /***************************************************************************** * Render: place string in picture ***************************************************************************** @@ -391,7 +646,7 @@ static void Destroy( vlc_object_t *p_this ) static int Render( filter_t *p_filter, subpicture_region_t *p_region, line_desc_t *p_line, int i_width, int i_height ) { - static uint8_t pi_gamma[16] = + static const uint8_t pi_gamma[16] = {0x00, 0x52, 0x84, 0x96, 0xb8, 0xca, 0xdc, 0xee, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; @@ -400,7 +655,6 @@ static int Render( filter_t *p_filter, subpicture_region_t *p_region, int i, x, y, i_pitch; uint8_t i_y; /* YUV values, derived from incoming RGB */ int8_t i_u, i_v; - subpicture_region_t *p_region_tmp; /* Create a new subpicture region */ memset( &fmt, 0, sizeof(video_format_t) ); @@ -408,17 +662,17 @@ static int Render( filter_t *p_filter, subpicture_region_t *p_region, fmt.i_aspect = 0; fmt.i_width = fmt.i_visible_width = i_width + 4; fmt.i_height = fmt.i_visible_height = i_height + 4; + if( p_region->fmt.i_visible_width > 0 ) + fmt.i_visible_width = p_region->fmt.i_visible_width; + if( p_region->fmt.i_visible_height > 0 ) + fmt.i_visible_height = p_region->fmt.i_visible_height; 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" ); - return VLC_EGENERIC; - } - p_region->fmt = p_region_tmp->fmt; - p_region->picture = p_region_tmp->picture; - free( p_region_tmp ); + assert( !p_region->p_picture ); + 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 = fmt; /* Calculate text color components */ i_y = (uint8_t)(( 66 * p_line->i_red + 129 * p_line->i_green + @@ -449,8 +703,8 @@ static int Render( filter_t *p_filter, subpicture_region_t *p_region, (int)fmt.p_palette->palette[i][3] * (255 - p_line->i_alpha) / 255; } - p_dst = p_region->picture.Y_PIXELS; - i_pitch = p_region->picture.Y_PITCH; + p_dst = p_region->p_picture->Y_PIXELS; + i_pitch = p_region->p_picture->Y_PITCH; /* Initialize the region pixels */ memset( p_dst, 0, i_pitch * p_region->fmt.i_height ); @@ -467,13 +721,11 @@ static int Render( filter_t *p_filter, subpicture_region_t *p_region, if( p_line->i_width < i_width ) { - if( ( p_region->p_style && p_region->p_style->i_text_align == SUBPICTURE_ALIGN_RIGHT ) || - ( !p_region->p_style && (p_region->i_align & 0x3) == SUBPICTURE_ALIGN_RIGHT ) ) + if( (p_region->i_align & 0x3) == SUBPICTURE_ALIGN_RIGHT ) { i_align_offset = i_width - p_line->i_width; } - else if( ( p_region->p_style && p_region->p_style->i_text_align != SUBPICTURE_ALIGN_LEFT ) || - ( !p_region->p_style && (p_region->i_align & 0x3) != SUBPICTURE_ALIGN_LEFT ) ) + else if( (p_region->i_align & 0x3) != SUBPICTURE_ALIGN_LEFT ) { i_align_offset = ( i_width - p_line->i_width ) / 2; } @@ -504,21 +756,21 @@ static int Render( filter_t *p_filter, subpicture_region_t *p_region, /* Outlining (find something better than nearest neighbour filtering ?) */ if( 1 ) { - uint8_t *p_dst = p_region->picture.Y_PIXELS; + uint8_t *p_dst = p_region->p_picture->Y_PIXELS; uint8_t *p_top = p_dst; /* Use 1st line as a cache */ uint8_t left, current; for( y = 1; y < (int)fmt.i_height - 1; y++ ) { if( y > 1 ) memcpy( p_top, p_dst, fmt.i_width ); - p_dst += p_region->picture.Y_PITCH; + p_dst += p_region->p_picture->Y_PITCH; left = 0; for( x = 1; x < (int)fmt.i_width - 1; x++ ) { current = p_dst[x]; p_dst[x] = ( 8 * (int)p_dst[x] + left + p_dst[x+1] + p_top[x -1]+ p_top[x] + p_top[x+1] + - p_dst[x -1 + p_region->picture.Y_PITCH ] + p_dst[x + p_region->picture.Y_PITCH] + p_dst[x + 1 + p_region->picture.Y_PITCH]) / 16; + p_dst[x -1 + p_region->p_picture->Y_PITCH ] + p_dst[x + p_region->p_picture->Y_PITCH] + p_dst[x + 1 + p_region->p_picture->Y_PITCH]) / 16; left = current; } } @@ -528,22 +780,22 @@ static int Render( filter_t *p_filter, subpicture_region_t *p_region, return VLC_SUCCESS; } -static void UnderlineGlyphYUVA( int i_line_thickness, int i_line_offset, vlc_bool_t b_ul_next_char, +static void UnderlineGlyphYUVA( int i_line_thickness, int i_line_offset, bool b_ul_next_char, FT_BitmapGlyph p_this_glyph, FT_Vector *p_this_glyph_pos, FT_BitmapGlyph p_next_glyph, FT_Vector *p_next_glyph_pos, int i_glyph_tmax, int i_align_offset, - uint8_t i_y, uint8_t i_u, uint8_t i_v, uint8_t i_alpha, + uint8_t i_y, uint8_t i_u, uint8_t i_v, subpicture_region_t *p_region) { int y, x, z; int i_pitch; uint8_t *p_dst_y,*p_dst_u,*p_dst_v,*p_dst_a; - 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_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; int i_offset = ( p_this_glyph_pos->y + i_glyph_tmax + i_line_offset + 3 ) * i_pitch + p_this_glyph_pos->x + p_this_glyph->left + 3 + i_align_offset; @@ -551,7 +803,7 @@ static void UnderlineGlyphYUVA( int i_line_thickness, int i_line_offset, vlc_boo for( y = 0; y < i_line_thickness; y++ ) { int i_extra = p_this_glyph->bitmap.width; - + if( b_ul_next_char ) { i_extra = (p_next_glyph_pos->x + p_next_glyph->left) - @@ -559,7 +811,7 @@ static void UnderlineGlyphYUVA( int i_line_thickness, int i_line_offset, vlc_boo } for( x = 0; x < i_extra; x++ ) { - vlc_bool_t b_ok = VLC_TRUE; + bool b_ok = true; /* break the underline around the tails of any glyphs which cross it */ for( z = x - i_line_thickness; @@ -573,7 +825,7 @@ static void UnderlineGlyphYUVA( int i_line_thickness, int i_line_offset, vlc_boo if( ( p_next_glyph->bitmap.rows > i_row ) && p_next_glyph->bitmap.buffer[p_next_glyph->bitmap.width * i_row + z-i_extra] ) { - b_ok = VLC_FALSE; + b_ok = false; } } else if ((z > 0 ) && (z < p_this_glyph->bitmap.width)) @@ -583,7 +835,7 @@ static void UnderlineGlyphYUVA( int i_line_thickness, int i_line_offset, vlc_boo if( ( p_this_glyph->bitmap.rows > i_row ) && p_this_glyph->bitmap.buffer[p_this_glyph->bitmap.width * i_row + z] ) { - b_ok = VLC_FALSE; + b_ok = false; } } } @@ -602,8 +854,8 @@ static void UnderlineGlyphYUVA( int i_line_thickness, int i_line_offset, vlc_boo static void DrawBlack( line_desc_t *p_line, int i_width, subpicture_region_t *p_region, int xoffset, int yoffset ) { - uint8_t *p_dst = p_region->picture.A_PIXELS; - int i_pitch = p_region->picture.A_PITCH; + uint8_t *p_dst = p_region->p_picture->A_PIXELS; + int i_pitch = p_region->p_picture->A_PITCH; int x,y; for( ; p_line != NULL; p_line = p_line->p_next ) @@ -618,13 +870,11 @@ static void DrawBlack( line_desc_t *p_line, int i_width, subpicture_region_t *p_ if( p_line->i_width < i_width ) { - if( ( p_region->p_style && p_region->p_style->i_text_align == SUBPICTURE_ALIGN_RIGHT ) || - ( !p_region->p_style && (p_region->i_align & 0x3) == SUBPICTURE_ALIGN_RIGHT ) ) + if( (p_region->i_align & 0x3) == SUBPICTURE_ALIGN_RIGHT ) { i_align_offset = i_width - p_line->i_width; } - else if( ( p_region->p_style && p_region->p_style->i_text_align != SUBPICTURE_ALIGN_LEFT ) || - ( !p_region->p_style && (p_region->i_align & 0x3) != SUBPICTURE_ALIGN_LEFT ) ) + else if( (p_region->i_align & 0x3) != SUBPICTURE_ALIGN_LEFT ) { i_align_offset = ( i_width - p_line->i_width ) / 2; } @@ -653,7 +903,7 @@ static void DrawBlack( line_desc_t *p_line, int i_width, subpicture_region_t *p_ } } } - + } /***************************************************************************** @@ -668,7 +918,6 @@ static int RenderYUVA( filter_t *p_filter, subpicture_region_t *p_region, video_format_t fmt; int i, x, y, i_pitch, i_alpha; uint8_t i_y, i_u, i_v; /* YUV values, derived from incoming RGB */ - subpicture_region_t *p_region_tmp; if( i_width == 0 || i_height == 0 ) return VLC_SUCCESS; @@ -679,32 +928,29 @@ static int RenderYUVA( filter_t *p_filter, subpicture_region_t *p_region, 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_region->fmt.i_visible_width > 0 ) + fmt.i_visible_width = p_region->fmt.i_visible_width; + if( p_region->fmt.i_visible_height > 0 ) + fmt.i_visible_height = p_region->fmt.i_visible_height; 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" ); - return VLC_EGENERIC; - } - p_region->fmt = p_region_tmp->fmt; - p_region->picture = p_region_tmp->picture; - free( p_region_tmp ); + 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 = fmt; /* Calculate text color components */ - i_y = (uint8_t)__MIN(abs( 2104 * p_line->i_red + 4130 * p_line->i_green + - 802 * p_line->i_blue + 4096 + 131072 ) >> 13, 235); - i_u = (uint8_t)__MIN(abs( -1214 * p_line->i_red + -2384 * p_line->i_green + - 3598 * p_line->i_blue + 4096 + 1048576) >> 13, 240); - i_v = (uint8_t)__MIN(abs( 3598 * p_line->i_red + -3013 * p_line->i_green + - -585 * p_line->i_blue + 4096 + 1048576) >> 13, 240); + YUVFromRGB( (p_line->i_red << 16) | + (p_line->i_green << 8) | + (p_line->i_blue ), + &i_y, &i_u, &i_v); i_alpha = p_line->i_alpha; - 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_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; /* Initialize the region pixels */ if( p_filter->p_sys->i_effect != EFFECT_BACKGROUND ) @@ -766,13 +1012,11 @@ static int RenderYUVA( filter_t *p_filter, subpicture_region_t *p_region, if( p_line->i_width < i_width ) { - if( ( p_region->p_style && p_region->p_style->i_text_align == SUBPICTURE_ALIGN_RIGHT ) || - ( !p_region->p_style && (p_region->i_align & 0x3) == SUBPICTURE_ALIGN_RIGHT ) ) + if( (p_region->i_align & 0x3) == SUBPICTURE_ALIGN_RIGHT ) { i_align_offset = i_width - p_line->i_width; } - else if( ( p_region->p_style && p_region->p_style->i_text_align != SUBPICTURE_ALIGN_LEFT ) || - ( !p_region->p_style && (p_region->i_align & 0x3) != SUBPICTURE_ALIGN_LEFT ) ) + else if( (p_region->i_align & 0x3) != SUBPICTURE_ALIGN_LEFT ) { i_align_offset = ( i_width - p_line->i_width ) / 2; } @@ -790,22 +1034,29 @@ static int RenderYUVA( filter_t *p_filter, subpicture_region_t *p_region, if( p_line->b_new_color_mode ) { /* Every glyph can (and in fact must) have its own color */ - int i_red = ( p_line->p_rgb[ i ] & 0x00ff0000 ) >> 16; - int i_green = ( p_line->p_rgb[ i ] & 0x0000ff00 ) >> 8; - int i_blue = ( p_line->p_rgb[ i ] & 0x000000ff ); - - i_y = (uint8_t)__MIN(abs( 2104 * i_red + 4130 * i_green + - 802 * i_blue + 4096 + 131072 ) >> 13, 235); - i_u = (uint8_t)__MIN(abs( -1214 * i_red + -2384 * i_green + - 3598 * i_blue + 4096 + 1048576) >> 13, 240); - i_v = (uint8_t)__MIN(abs( 3598 * i_red + -3013 * i_green + - -585 * i_blue + 4096 + 1048576) >> 13, 240); + YUVFromRGB( p_line->p_fg_rgb[ i ], &i_y, &i_u, &i_v ); } for( y = 0, i_bitmap_offset = 0; y < p_glyph->bitmap.rows; y++ ) { for( x = 0; x < p_glyph->bitmap.width; x++, i_bitmap_offset++ ) { + uint8_t i_y_local = i_y; + uint8_t i_u_local = i_u; + uint8_t i_v_local = i_v; + + if( p_line->p_fg_bg_ratio != 0x00 ) + { + int i_split = p_glyph->bitmap.width * + p_line->p_fg_bg_ratio[ i ] / 0x7f; + + if( x > i_split ) + { + YUVFromRGB( p_line->p_bg_rgb[ i ], + &i_y_local, &i_u_local, &i_v_local ); + } + } + if( p_glyph->bitmap.buffer[i_bitmap_offset] ) { p_dst_y[i_offset+x] = ((p_dst_y[i_offset+x] *(255-(int)p_glyph->bitmap.buffer[i_bitmap_offset])) + @@ -829,7 +1080,7 @@ static int RenderYUVA( filter_t *p_filter, subpicture_region_t *p_region, p_line->pp_glyphs[i], &(p_line->p_glyph_pos[i]), p_line->pp_glyphs[i+1], &(p_line->p_glyph_pos[i+1]), i_glyph_tmax, i_align_offset, - i_y, i_u, i_v, i_alpha, + i_y, i_u, i_v, p_region); } } @@ -852,13 +1103,15 @@ static int RenderText( filter_t *p_filter, subpicture_region_t *p_region_out, subpicture_region_t *p_region_in ) { filter_sys_t *p_sys = p_filter->p_sys; - line_desc_t *p_lines = 0, *p_line = 0, *p_next = 0, *p_prev = 0; + line_desc_t *p_lines = NULL, *p_line = NULL, *p_next = NULL, *p_prev = NULL; int i, i_pen_y, i_pen_x, i_error, i_glyph_index, i_previous; - uint32_t *psz_unicode, *psz_unicode_orig = 0, i_char, *psz_line_start; + uint32_t *psz_unicode, *psz_unicode_orig = NULL, i_char, *psz_line_start; int i_string_length; char *psz_string; vlc_iconv_t iconv_handle = (vlc_iconv_t)(-1); int i_font_color, i_font_alpha, i_font_size, i_red, i_green, i_blue; + vlc_value_t val; + int i_scale = 1000; FT_BBox line; FT_BBox glyph_size; @@ -870,17 +1123,20 @@ static int RenderText( filter_t *p_filter, subpicture_region_t *p_region_out, 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 { i_font_color = p_sys->i_font_color; i_font_alpha = 255 - p_sys->i_font_opacity; - i_font_size = p_sys->i_default_font_size; + i_font_size = p_sys->i_default_font_size * i_scale / 1000; } if( i_font_color == 0xFFFFFF ) i_font_color = p_sys->i_font_color; @@ -897,10 +1153,7 @@ static int RenderText( filter_t *p_filter, subpicture_region_t *p_region_out, psz_unicode = psz_unicode_orig = malloc( ( strlen(psz_string) + 1 ) * sizeof(uint32_t) ); if( psz_unicode == NULL ) - { - msg_Err( p_filter, "out of memory" ); goto error; - } #if defined(WORDS_BIGENDIAN) iconv_handle = vlc_iconv_open( "UCS-4BE", "UTF-8" ); #else @@ -920,15 +1173,16 @@ static int RenderText( filter_t *p_filter, subpicture_region_t *p_region_out, i_out_bytes = i_in_bytes * sizeof( uint32_t ); i_out_bytes_left = i_out_bytes; p_out_buffer = (char *)psz_unicode; - i_ret = vlc_iconv( iconv_handle, (const char**)&p_in_buffer, &i_in_bytes, + i_ret = vlc_iconv( iconv_handle, (const char**)&p_in_buffer, + &i_in_bytes, &p_out_buffer, &i_out_bytes_left ); vlc_iconv_close( iconv_handle ); if( i_in_bytes ) { - msg_Warn( p_filter, "failed to convert string to unicode (%s), " - "bytes left %d", strerror(errno), (int)i_in_bytes ); + msg_Warn( p_filter, "failed to convert string to unicode (%m), " + "bytes left %u", (unsigned)i_in_bytes ); goto error; } *(uint32_t*)p_out_buffer = 0; @@ -938,14 +1192,17 @@ static int RenderText( filter_t *p_filter, subpicture_region_t *p_region_out, #if defined(HAVE_FRIBIDI) { uint32_t *p_fribidi_string; - int start_pos, pos = 0; + int32_t start_pos, pos = 0; p_fribidi_string = malloc( (i_string_length + 1) * sizeof(uint32_t) ); + if( !p_fribidi_string ) + goto error; /* Do bidi conversion line-by-line */ - while(pos < i_string_length) + while( pos < i_string_length ) { - while(pos < i_string_length) { + while( pos < i_string_length ) + { i_char = psz_unicode[pos]; if (i_char != '\r' && i_char != '\n') break; @@ -953,7 +1210,8 @@ static int RenderText( filter_t *p_filter, subpicture_region_t *p_region_out, ++pos; } start_pos = pos; - while(pos < i_string_length) { + while( pos < i_string_length ) + { i_char = psz_unicode[pos]; if (i_char == '\r' || i_char == '\n') break; @@ -962,8 +1220,11 @@ static int RenderText( filter_t *p_filter, subpicture_region_t *p_region_out, if (pos > start_pos) { FriBidiCharType base_dir = FRIBIDI_TYPE_LTR; - fribidi_log2vis((FriBidiChar*)psz_unicode + start_pos, pos - start_pos, - &base_dir, (FriBidiChar*)p_fribidi_string + start_pos, 0, 0, 0); + fribidi_log2vis((FriBidiChar*)psz_unicode + start_pos, + pos - start_pos, + &base_dir, + (FriBidiChar*)p_fribidi_string + start_pos, + 0, 0, 0); } } @@ -975,11 +1236,8 @@ static int RenderText( filter_t *p_filter, subpicture_region_t *p_region_out, /* Calculate relative glyph positions and a bounding box for the * entire string */ - if( !(p_line = NewLine( (byte_t *)psz_string )) ) - { - msg_Err( p_filter, "out of memory" ); + if( !(p_line = NewLine( strlen( psz_string ))) ) goto error; - } p_lines = p_line; i_pen_x = i_pen_y = 0; i_previous = i = 0; @@ -999,11 +1257,8 @@ static int RenderText( filter_t *p_filter, subpicture_region_t *p_region_out, if( i_char == '\n' ) { psz_line_start = psz_unicode; - if( !(p_next = NewLine( (byte_t *)psz_string )) ) - { - msg_Err( p_filter, "out of memory" ); + if( !(p_next = NewLine( strlen( psz_string ))) ) goto error; - } p_line->p_next = p_next; p_line->i_width = line.xMax; p_line->i_height = face->size->metrics.height >> 6; @@ -1066,17 +1321,29 @@ static int RenderText( filter_t *p_filter, subpicture_region_t *p_region_out, glyph_size.xMin + ((FT_BitmapGlyph)tmp_glyph)->left; if( line.xMax > (int)p_filter->fmt_out.video.i_visible_width - 20 ) { + FT_Done_Glyph( (FT_Glyph)p_line->pp_glyphs[ i ] ); p_line->pp_glyphs[ i ] = NULL; FreeLine( p_line ); - p_line = NewLine( (byte_t *)psz_string ); + p_line = NewLine( strlen( psz_string )); if( p_prev ) p_prev->p_next = p_line; else p_lines = p_line; + uint32_t *psz_unicode_saved = psz_unicode; while( psz_unicode > psz_line_start && *psz_unicode != ' ' ) { psz_unicode--; } if( psz_unicode == psz_line_start ) + { /* try harder to break that line */ + psz_unicode = psz_unicode_saved; + while( psz_unicode > psz_line_start && + *psz_unicode != '_' && *psz_unicode != '/' && + *psz_unicode != '\\' && *psz_unicode != '.' ) + { + psz_unicode--; + } + } + if( psz_unicode == psz_line_start ) { msg_Warn( p_filter, "unbreakable string" ); goto error; @@ -1120,178 +1387,150 @@ static int RenderText( filter_t *p_filter, subpicture_region_t *p_region_out, else RenderYUVA( p_filter, p_region_out, p_lines, result.x, result.y ); - if( psz_unicode_orig ) free( psz_unicode_orig ); + free( psz_unicode_orig ); FreeLines( p_lines ); return VLC_SUCCESS; error: - if( psz_unicode_orig ) free( psz_unicode_orig ); + free( psz_unicode_orig ); FreeLines( p_lines ); return VLC_EGENERIC; } #ifdef HAVE_FONTCONFIG -static int PushFont( font_stack_t **p_font, char *psz_name, int i_size, - int i_color, int i_alpha ) +static ft_style_t *CreateStyle( char *psz_fontname, int i_font_size, + uint32_t i_font_color, uint32_t i_karaoke_bg_color, bool b_bold, + bool b_italic, bool b_uline ) { - 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; + ft_style_t *p_style = malloc( sizeof( ft_style_t )); - if( !*p_font ) + if( p_style ) { - *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; + p_style->i_font_size = i_font_size; + p_style->i_font_color = i_font_color; + p_style->i_karaoke_bg_color = i_karaoke_bg_color; + p_style->b_italic = b_italic; + p_style->b_bold = b_bold; + p_style->b_underline = b_uline; + + p_style->psz_fontname = strdup( psz_fontname ); } - return VLC_SUCCESS; + return p_style; } -static int PopFont( font_stack_t **p_font ) +static void DeleteStyle( ft_style_t *p_style ) { - 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 ) + if( p_style ) { - p_next_to_last = p_last; + free( p_style->psz_fontname ); + free( p_style ); } - - 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 ) +static bool StyleEquals( ft_style_t *s1, ft_style_t *s2 ) { - 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; + if( !s1 || !s2 ) + return false; + if( s1 == s2 ) + return true; + + if(( s1->i_font_size == s2->i_font_size ) && + ( s1->i_font_color == s2->i_font_color ) && + ( s1->b_italic == s2->b_italic ) && + ( s1->b_bold == s2->b_bold ) && + ( s1->b_underline == s2->b_underline ) && + ( !strcmp( s1->psz_fontname, s2->psz_fontname ))) + { + return true; + } + return false; } -static uint32_t *IconvText( filter_t *p_filter, char *psz_string ) +static void IconvText( filter_t *p_filter, const char *psz_string, + uint32_t *i_string_length, uint32_t **ppsz_unicode ) { vlc_iconv_t iconv_handle = (vlc_iconv_t)(-1); - uint32_t *psz_unicode; - int i_string_length; - psz_unicode = - malloc( ( strlen( psz_string ) + 1 ) * sizeof( uint32_t ) ); - if( psz_unicode == NULL ) + /* If memory hasn't been allocated for our output string, allocate it here + * - the calling function must now be responsible for freeing it. + */ + if( !*ppsz_unicode ) + *ppsz_unicode = (uint32_t *) + malloc( (strlen( psz_string ) + 1) * sizeof( uint32_t )); + + /* We don't need to handle a NULL pointer in *ppsz_unicode + * if we are instead testing for a non NULL value like we are here */ + + if( *ppsz_unicode ) { - msg_Err( p_filter, "out of memory" ); - return NULL;; - } #if defined(WORDS_BIGENDIAN) - iconv_handle = vlc_iconv_open( "UCS-4BE", "UTF-8" ); + iconv_handle = vlc_iconv_open( "UCS-4BE", "UTF-8" ); #else - iconv_handle = vlc_iconv_open( "UCS-4LE", "UTF-8" ); + iconv_handle = vlc_iconv_open( "UCS-4LE", "UTF-8" ); #endif - if( iconv_handle == (vlc_iconv_t)-1 ) - { - msg_Warn( p_filter, "unable to do conversion" ); - free( psz_unicode ); - return NULL;; + if( iconv_handle != (vlc_iconv_t)-1 ) + { + char *p_in_buffer, *p_out_buffer; + size_t i_in_bytes, i_out_bytes, i_out_bytes_left, i_ret; + i_in_bytes = strlen( psz_string ); + i_out_bytes = i_in_bytes * sizeof( uint32_t ); + i_out_bytes_left = i_out_bytes; + p_in_buffer = (char *) psz_string; + p_out_buffer = (char *) *ppsz_unicode; + i_ret = vlc_iconv( iconv_handle, (const char**)&p_in_buffer, + &i_in_bytes, &p_out_buffer, &i_out_bytes_left ); + + vlc_iconv_close( iconv_handle ); + + if( i_in_bytes ) + { + msg_Warn( p_filter, "failed to convert string to unicode (%m), " + "bytes left %u", (unsigned)i_in_bytes ); + } + else + { + *(uint32_t*)p_out_buffer = 0; + *i_string_length = + (i_out_bytes - i_out_bytes_left) / sizeof(uint32_t); + } + } + else + { + msg_Warn( p_filter, "unable to do conversion" ); + } } +} - { - char *p_in_buffer, *p_out_buffer; - size_t i_in_bytes, i_out_bytes, i_out_bytes_left, i_ret; - i_in_bytes = strlen( psz_string ); - i_out_bytes = i_in_bytes * sizeof( uint32_t ); - i_out_bytes_left = i_out_bytes; - p_in_buffer = psz_string; - p_out_buffer = (char *)psz_unicode; - i_ret = vlc_iconv( iconv_handle, (const char**)&p_in_buffer, &i_in_bytes, - &p_out_buffer, &i_out_bytes_left ); +static ft_style_t *GetStyleFromFontStack( filter_sys_t *p_sys, + font_stack_t **p_fonts, bool b_bold, bool b_italic, + bool b_uline ) +{ + ft_style_t *p_style = NULL; - vlc_iconv_close( iconv_handle ); + char *psz_fontname = NULL; + 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; - if( i_in_bytes ) - { - msg_Warn( p_filter, "failed to convert string to unicode (%s), " - "bytes left %d", strerror(errno), (int)i_in_bytes ); - free( psz_unicode ); - return NULL;; - } - *(uint32_t*)p_out_buffer = 0; - i_string_length = (i_out_bytes - i_out_bytes_left) / sizeof(uint32_t); + 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_karaoke_bg_color, b_bold, b_italic, b_uline ); } - -#if defined(HAVE_FRIBIDI) - { - uint32_t *p_fribidi_string; - - p_fribidi_string = malloc( (i_string_length + 1) * sizeof(uint32_t) ); - - /* Do bidi conversion line-by-line */ - FriBidiCharType base_dir = FRIBIDI_TYPE_LTR; - fribidi_log2vis((FriBidiChar*)psz_unicode, i_string_length, - &base_dir, (FriBidiChar*)p_fribidi_string, 0, 0, 0); - - free( psz_unicode ); - psz_unicode = p_fribidi_string; - p_fribidi_string[ i_string_length ] = 0; - } -#endif - return psz_unicode; -} + return p_style; +} static int RenderTag( filter_t *p_filter, FT_Face p_face, int i_font_color, - vlc_bool_t b_uline, line_desc_t *p_line, uint32_t *psz_unicode, + bool b_uline, int i_karaoke_bgcolor, + line_desc_t *p_line, uint32_t *psz_unicode, int *pi_pen_x, int i_pen_y, int *pi_start, FT_Vector *p_result ) { FT_BBox line; int i_yMin, i_yMax; int i; + bool b_first_on_line = true; int i_previous = 0; int i_pen_x_start = *pi_pen_x; @@ -1305,8 +1544,9 @@ static int RenderTag( filter_t *p_filter, FT_Face p_face, int i_font_color, { FT_BBox glyph_size; - FT_Glyph_Get_CBox( p_line->pp_glyphs[ i ], ft_glyph_bbox_pixels, &glyph_size ); - + FT_Glyph_Get_CBox( (FT_Glyph) p_line->pp_glyphs[ i ], + ft_glyph_bbox_pixels, &glyph_size ); + line.xMax = p_line->p_glyph_pos[ i ].x + glyph_size.xMax - glyph_size.xMin + p_line->pp_glyphs[ i ]->left; line.yMax = __MAX( line.yMax, glyph_size.yMax ); @@ -1315,7 +1555,10 @@ static int RenderTag( filter_t *p_filter, FT_Face p_face, int i_font_color, i_yMin = line.yMin; i_yMax = line.yMax; - while( *psz_unicode && ( *psz_unicode != 0xffff ) ) + if( line.xMax > 0 ) + b_first_on_line = false; + + while( *psz_unicode && ( *psz_unicode != '\n' ) ) { FT_BBox glyph_size; FT_Glyph tmp_glyph; @@ -1336,14 +1579,16 @@ static int RenderTag( filter_t *p_filter, FT_Face p_face, int i_font_color, i_error = FT_Load_Glyph( p_face, i_glyph_index, FT_LOAD_DEFAULT ); if( i_error ) { - msg_Err( p_filter, "unable to render text FT_Load_Glyph returned %d", i_error ); + msg_Err( p_filter, + "unable to render text FT_Load_Glyph returned %d", i_error ); p_line->pp_glyphs[ i ] = NULL; return VLC_EGENERIC; } i_error = FT_Get_Glyph( p_face->glyph, &tmp_glyph ); if( i_error ) { - msg_Err( p_filter, "unable to render text FT_Get_Glyph returned %d", i_error ); + msg_Err( p_filter, + "unable to render text FT_Get_Glyph returned %d", i_error ); p_line->pp_glyphs[ i ] = NULL; return VLC_EGENERIC; } @@ -1356,23 +1601,28 @@ static int RenderTag( filter_t *p_filter, FT_Face p_face, int i_font_color, } if( b_uline ) { - float aOffset = FT_FLOOR(FT_MulFix(p_face->underline_position, p_face->size->metrics.y_scale)); - float aSize = FT_CEIL(FT_MulFix(p_face->underline_thickness, p_face->size->metrics.y_scale)); - - p_line->pi_underline_offset[ i ] = ( aOffset < 0 ) ? -aOffset : aOffset; - p_line->pi_underline_thickness[ i ] = ( aSize < 0 ) ? -aSize : aSize; + float aOffset = FT_FLOOR(FT_MulFix(p_face->underline_position, + p_face->size->metrics.y_scale)); + float aSize = FT_CEIL(FT_MulFix(p_face->underline_thickness, + p_face->size->metrics.y_scale)); + + p_line->pi_underline_offset[ i ] = + ( aOffset < 0 ) ? -aOffset : aOffset; + p_line->pi_underline_thickness[ i ] = + ( aSize < 0 ) ? -aSize : aSize; } p_line->pp_glyphs[ i ] = (FT_BitmapGlyph)tmp_glyph; - p_line->p_rgb[ i ] = i_font_color & 0x00ffffff; + p_line->p_fg_rgb[ i ] = i_font_color & 0x00ffffff; + p_line->p_bg_rgb[ i ] = i_karaoke_bgcolor & 0x00ffffff; + p_line->p_fg_bg_ratio[ i ] = 0x00; line.xMax = p_line->p_glyph_pos[i].x + glyph_size.xMax - - glyph_size.xMin + ((FT_BitmapGlyph)tmp_glyph)->left; + glyph_size.xMin + ((FT_BitmapGlyph)tmp_glyph)->left; if( line.xMax > (int)p_filter->fmt_out.video.i_visible_width - 20 ) { - while( --i > *pi_start ) - { + for( ; i >= *pi_start; i-- ) FT_Done_Glyph( (FT_Glyph)p_line->pp_glyphs[ i ] ); - } + i = *pi_start; while( psz_unicode > psz_unicode_start && *psz_unicode != ' ' ) { @@ -1380,18 +1630,32 @@ static int RenderTag( filter_t *p_filter, FT_Face p_face, int i_font_color, } if( psz_unicode == psz_unicode_start ) { - msg_Warn( p_filter, "unbreakable string" ); + if( b_first_on_line ) + { + msg_Warn( p_filter, "unbreakable string" ); + p_line->pp_glyphs[ i ] = NULL; + return VLC_EGENERIC; + } + *pi_pen_x = i_pen_x_start; + + p_line->i_width = line.xMax; + p_line->i_height = __MAX( p_line->i_height, + p_face->size->metrics.height >> 6 ); p_line->pp_glyphs[ i ] = NULL; - return VLC_EGENERIC; + + p_result->x = __MAX( p_result->x, line.xMax ); + p_result->y = __MAX( p_result->y, __MAX( p_line->i_height, + i_yMax - i_yMin ) ); + return VLC_SUCCESS; } else { - *psz_unicode = 0xffff; + *psz_unicode = '\n'; } psz_unicode = psz_unicode_start; *pi_pen_x = i_pen_x_start; i_previous = 0; - + line.yMax = i_yMax; line.yMin = i_yMin; @@ -1405,11 +1669,13 @@ static int RenderTag( filter_t *p_filter, FT_Face p_face, int i_font_color, i++; } p_line->i_width = line.xMax; - p_line->i_height = __MAX( p_line->i_height, p_face->size->metrics.height >> 6 ); + p_line->i_height = __MAX( p_line->i_height, + p_face->size->metrics.height >> 6 ); p_line->pp_glyphs[ i ] = NULL; p_result->x = __MAX( p_result->x, line.xMax ); - p_result->y = __MAX( p_result->y, __MAX( p_line->i_height, line.yMax - line.yMin ) ); + p_result->y = __MAX( p_result->y, __MAX( p_line->i_height, + line.yMax - line.yMin ) ); *pi_start = i; @@ -1420,9 +1686,8 @@ static int RenderTag( filter_t *p_filter, FT_Face p_face, int i_font_color, { *psz_unicode_start = '\0'; } - else + else if( psz_unicode > psz_unicode_start ) { - psz_unicode++; for( i=0; psz_unicode[ i ]; i++ ) psz_unicode_start[ i ] = psz_unicode[ i ]; psz_unicode_start[ i ] = '\0'; @@ -1431,285 +1696,536 @@ static int RenderTag( filter_t *p_filter, FT_Face p_face, int i_font_color, return VLC_SUCCESS; } -static int ProcessNodes( filter_t *p_filter, xml_reader_t *p_xml_reader, char *psz_html, text_style_t *p_font_style, line_desc_t **p_lines, FT_Vector *p_result ) +static void SetupLine( filter_t *p_filter, const char *psz_text_in, + uint32_t **psz_text_out, uint32_t *pi_runs, + uint32_t **ppi_run_lengths, ft_style_t ***ppp_styles, + ft_style_t *p_style ) { - filter_sys_t *p_sys = p_filter->p_sys; + uint32_t i_string_length = 0; - FT_Vector tmp_result; + IconvText( p_filter, psz_text_in, &i_string_length, psz_text_out ); + *psz_text_out += i_string_length; - font_stack_t *p_fonts = NULL; - vlc_bool_t b_italic = VLC_FALSE; - vlc_bool_t b_bold = VLC_FALSE; - vlc_bool_t b_uline = VLC_FALSE; + if( ppp_styles && ppi_run_lengths ) + { + (*pi_runs)++; - line_desc_t *p_line = NULL; - line_desc_t *p_prev = NULL; + if( *ppp_styles ) + { + *ppp_styles = (ft_style_t **) + realloc( *ppp_styles, *pi_runs * sizeof( ft_style_t * ) ); + } + else if( *pi_runs == 1 ) + { + *ppp_styles = (ft_style_t **) + malloc( *pi_runs * sizeof( ft_style_t * ) ); + } - char *psz_node = NULL; + /* We have just malloc'ed this memory successfully - + * *pi_runs HAS to be within the memory area of *ppp_styles */ + if( *ppp_styles ) + { + (*ppp_styles)[ *pi_runs - 1 ] = p_style; + p_style = NULL; + } - int i_pen_x = 0; - int i_pen_y = 0; - int i_posn = 0; + if( *ppi_run_lengths ) + { + *ppi_run_lengths = (uint32_t *) + realloc( *ppi_run_lengths, *pi_runs * sizeof( uint32_t ) ); + } + else if( *pi_runs == 1 ) + { + *ppi_run_lengths = (uint32_t *) + malloc( *pi_runs * sizeof( uint32_t ) ); + } - int rv = VLC_SUCCESS; + /* same remarks here */ + if( *ppi_run_lengths ) + { + (*ppi_run_lengths)[ *pi_runs - 1 ] = i_string_length; + } + } + /* If we couldn't use the p_style argument due to memory allocation + * problems above, release it here. + */ + if( p_style ) DeleteStyle( p_style ); +} - p_result->x = p_result->y = 0; - tmp_result.x = tmp_result.y = 0; +static int CheckForEmbeddedFont( filter_sys_t *p_sys, FT_Face *pp_face, ft_style_t *p_style ) +{ + int k; - if( p_font_style ) + for( k=0; k < p_sys->i_font_attachments; k++ ) { - 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; + input_attachment_t *p_attach = p_sys->pp_font_attachments[k]; + int i_font_idx = 0; + FT_Face p_face = NULL; + + while( 0 == FT_New_Memory_Face( p_sys->p_library, + p_attach->p_data, + p_attach->i_data, + i_font_idx, + &p_face )) + { + if( p_face ) + { + bool match = !strcasecmp( p_face->family_name, + p_style->psz_fontname ); + + if( p_face->style_flags & FT_STYLE_FLAG_BOLD ) + match = match && p_style->b_bold; + else + match = match && !p_style->b_bold; + + if( p_face->style_flags & FT_STYLE_FLAG_ITALIC ) + match = match && p_style->b_italic; + else + match = match && !p_style->b_italic; + + if( match ) + { + *pp_face = p_face; + return VLC_SUCCESS; + } + + FT_Done_Face( p_face ); + } + i_font_idx++; + } } - else + return VLC_EGENERIC; +} + +static int ProcessLines( filter_t *p_filter, + uint32_t *psz_text, + int i_len, + + uint32_t i_runs, + uint32_t *pi_run_lengths, + ft_style_t **pp_styles, + line_desc_t **pp_lines, + + FT_Vector *p_result, + + bool b_karaoke, + uint32_t i_k_runs, + uint32_t *pi_k_run_lengths, + uint32_t *pi_k_durations ) +{ + filter_sys_t *p_sys = p_filter->p_sys; + ft_style_t **pp_char_styles; + int *p_new_positions = NULL; + int8_t *p_levels = NULL; + uint8_t *pi_karaoke_bar = NULL; + uint32_t i, j, k; + int i_prev; + + /* Assign each character in the text string its style explicitly, so that + * after the characters have been shuffled around by Fribidi, we can re-apply + * the styles, and to simplify the calculation of runs within a line. + */ + pp_char_styles = (ft_style_t **) malloc( i_len * sizeof( ft_style_t * )); + if( !pp_char_styles ) + return VLC_ENOMEM; + + if( b_karaoke ) { - PushFont( &p_fonts, FC_DEFAULT_FONT, 24, 0xffffff, 0 ); + pi_karaoke_bar = (uint8_t *) malloc( i_len * sizeof( uint8_t )); + /* If we can't allocate sufficient memory for karaoke, continue anyway - + * we just won't be able to display the progress bar; at least we'll + * get the text. + */ } - while ( ( xml_ReaderRead( p_xml_reader ) == 1 ) && ( rv == VLC_SUCCESS ) ) + i = 0; + for( j = 0; j < i_runs; j++ ) + for( k = 0; k < pi_run_lengths[ j ]; k++ ) + pp_char_styles[ i++ ] = pp_styles[ j ]; + +#if defined(HAVE_FRIBIDI) { - switch ( xml_ReaderNodeType( p_xml_reader ) ) + ft_style_t **pp_char_styles_new; + int *p_old_positions; + uint32_t *p_fribidi_string; + int start_pos, pos = 0; + + pp_char_styles_new = (ft_style_t **) + malloc( i_len * sizeof( ft_style_t * )); + + p_fribidi_string = (uint32_t *) + malloc( (i_len + 1) * sizeof(uint32_t) ); + p_old_positions = (int *) + malloc( (i_len + 1) * sizeof( int ) ); + p_new_positions = (int *) + malloc( (i_len + 1) * sizeof( int ) ); + p_levels = (int8_t *) + malloc( (i_len + 1) * sizeof( int8_t ) ); + + if( ! pp_char_styles_new || + ! p_fribidi_string || + ! p_old_positions || + ! p_new_positions || + ! p_levels ) + { + free( p_levels ); + free( p_old_positions ); + free( p_new_positions ); + free( p_fribidi_string ); + free( pp_char_styles_new ); + free( pi_karaoke_bar ); + + free( pp_char_styles ); + return VLC_ENOMEM; + } + + /* Do bidi conversion line-by-line */ + while(pos < i_len) { - case XML_READER_NONE: - break; - case XML_READER_ENDELEM: - psz_node = xml_ReaderName( p_xml_reader ); - - if( psz_node ) + while(pos < i_len) { + if (psz_text[pos] != '\n') + break; + p_fribidi_string[pos] = psz_text[pos]; + pp_char_styles_new[pos] = pp_char_styles[pos]; + p_new_positions[pos] = pos; + p_levels[pos] = 0; + ++pos; + } + start_pos = pos; + while(pos < i_len) { + if (psz_text[pos] == '\n') + break; + ++pos; + } + if (pos > start_pos) + { + FriBidiCharType base_dir = FRIBIDI_TYPE_LTR; + fribidi_log2vis((FriBidiChar*)psz_text + start_pos, + pos - start_pos, &base_dir, + (FriBidiChar*)p_fribidi_string + start_pos, + p_new_positions + start_pos, + p_old_positions, + p_levels + start_pos ); + for( j = (uint32_t) start_pos; j < (uint32_t) pos; j++ ) { - 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 ); + pp_char_styles_new[ j ] = pp_char_styles[ start_pos + + p_old_positions[ j - start_pos ] ]; + p_new_positions[ j ] += start_pos; } - 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; + } + } + free( p_old_positions ); + free( pp_char_styles ); + pp_char_styles = pp_char_styles_new; + psz_text = p_fribidi_string; + p_fribidi_string[ i_len ] = 0; + } +#endif + /* Work out the karaoke */ + if( pi_karaoke_bar ) + { + int64_t i_last_duration = 0; + int64_t i_duration = 0; + int64_t i_start_pos = 0; + int64_t i_elapsed = var_GetTime( p_filter, "spu-elapsed" ) / 1000; - /* 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 ); - } + for( k = 0; k< i_k_runs; k++ ) + { + double fraction = 0.0; + + i_duration += pi_k_durations[ k ]; + + if( i_duration < i_elapsed ) + { + /* Completely finished this run-length - + * let it render normally */ + + fraction = 1.0; + } + else if( i_elapsed < i_last_duration ) + { + /* Haven't got up to this segment yet - + * render it completely in karaoke BG mode */ + + fraction = 0.0; + } + else + { + /* Partway through this run */ + + fraction = (double)(i_elapsed - i_last_duration) / + (double)pi_k_durations[ k ]; + } + for( i = 0; i < pi_k_run_lengths[ k ]; i++ ) + { + double shade = pi_k_run_lengths[ k ] * fraction; + + if( p_new_positions ) + j = p_new_positions[ i_start_pos + i ]; + else + j = i_start_pos + i; + + if( i < (uint32_t)shade ) + pi_karaoke_bar[ j ] = 0xff; + else if( (double)i > shade ) + pi_karaoke_bar[ j ] = 0x00; + else + { + shade -= (int)shade; + pi_karaoke_bar[ j ] = ((int)(shade * 128.0) & 0x7f) | + ((p_levels ? (p_levels[ j ] % 2) : 0 ) << 7); + } + } + + i_last_duration = i_duration; + i_start_pos += pi_k_run_lengths[ k ]; + } + } + free( p_levels ); + free( p_new_positions ); - 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 ) ) - { - 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 ) ) - { - if( p_line ) - { - p_prev = p_line; - if( !(p_line = NewLine( (byte_t *)psz_html )) ) - { - msg_Err( p_filter, "out of memory" ); - free( psz_node ); - rv = VLC_EGENERIC; - break; - } - p_line->b_new_color_mode = VLC_TRUE; - p_result->x = __MAX( p_result->x, tmp_result.x ); - p_result->y += tmp_result.y; - - p_line->p_next = NULL; - i_pen_x = 0; - i_pen_y += tmp_result.y; - i_posn = 0; - p_prev->p_next = p_line; - tmp_result.x = 0; - tmp_result.y = 0; - } - } - free( psz_node ); + FT_Vector tmp_result; + + line_desc_t *p_line = NULL; + line_desc_t *p_prev = NULL; + + int i_pen_x = 0; + int i_pen_y = 0; + int i_posn = 0; + + p_result->x = p_result->y = 0; + tmp_result.x = tmp_result.y = 0; + + i_prev = 0; + for( k = 0; k <= (uint32_t) i_len; k++ ) + { + if( ( k == (uint32_t) i_len ) || + ( ( k > 0 ) && + !StyleEquals( pp_char_styles[ k ], pp_char_styles[ k - 1] ) ) ) + { + ft_style_t *p_style = pp_char_styles[ k - 1 ]; + + /* End of the current style run */ + FT_Face p_face = NULL; + int i_idx = 0; + + /* Look for a match amongst our attachments first */ + CheckForEmbeddedFont( p_sys, &p_face, p_style ); + + if( ! p_face ) + { + char *psz_fontfile = NULL; + + vlc_mutex_lock( &fb_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 ); } - break; - case XML_READER_TEXT: - psz_node = xml_ReaderValue( p_xml_reader ); - if( psz_node ) + vlc_mutex_unlock( &fb_lock ); + + if( psz_fontfile && ! *psz_fontfile ) { - char *psz_fontname = NULL; - int i_font_color = 0xffffff; - int i_font_alpha = 0; - int i_font_size = 24; - FT_Face p_face = NULL; + msg_Warn( p_filter, "Fontconfig was unable to find a font: \"%s\" %s" + " so using default font", p_style->psz_fontname, + ((p_style->b_bold && p_style->b_italic) ? "(Bold,Italic)" : + (p_style->b_bold ? "(Bold)" : + (p_style->b_italic ? "(Italic)" : ""))) ); + free( psz_fontfile ); + psz_fontfile = NULL; + } - if( VLC_SUCCESS == PeekFont( &p_fonts, &psz_fontname, &i_font_size, &i_font_color, &i_font_alpha ) ) + if( psz_fontfile ) + { + if( FT_New_Face( p_sys->p_library, + psz_fontfile, i_idx, &p_face ) ) { - int i_idx = 0; - char *psz_fontfile = FontConfig_Select( p_sys->p_fontconfig, psz_fontname, b_bold, b_italic, &i_idx ); - - if( psz_fontfile ) - { - if( FT_New_Face( p_sys->p_library, psz_fontfile ? psz_fontfile : "", - i_idx, &p_face ) ) - { - free( psz_fontfile ); - free( psz_node ); - rv = VLC_EGENERIC; - break; - } - free( psz_fontfile ); - } + free( psz_fontfile ); + free( pp_char_styles ); +#if defined(HAVE_FRIBIDI) + free( psz_text ); +#endif + free( pi_karaoke_bar ); + return VLC_EGENERIC; } + free( psz_fontfile ); + } + } + if( p_face && + FT_Select_Charmap( p_face, ft_encoding_unicode ) ) + { + /* We've loaded a font face which is unhelpful for actually + * rendering text - fallback to the default one. + */ + FT_Done_Face( p_face ); + p_face = NULL; + } - if( FT_Select_Charmap( p_face ? p_face : p_sys->p_face, ft_encoding_unicode ) || - FT_Set_Pixel_Sizes( p_face ? p_face : p_sys->p_face, 0, i_font_size ) ) - { - free( psz_node ); - rv = VLC_EGENERIC; - break; - } - p_sys->i_use_kerning = FT_HAS_KERNING( ( p_face ? p_face : p_sys->p_face ) ); + if( FT_Select_Charmap( p_face ? p_face : p_sys->p_face, + ft_encoding_unicode ) || + FT_Set_Pixel_Sizes( p_face ? p_face : p_sys->p_face, 0, + p_style->i_font_size ) ) + { + if( p_face ) FT_Done_Face( p_face ); + free( pp_char_styles ); +#if defined(HAVE_FRIBIDI) + free( psz_text ); +#endif + free( pi_karaoke_bar ); + return VLC_EGENERIC; + } + p_sys->i_use_kerning = + FT_HAS_KERNING( ( p_face ? p_face : p_sys->p_face ) ); - uint32_t *psz_unicode = IconvText( p_filter, psz_node ); - if( !psz_unicode ) + uint32_t *psz_unicode = (uint32_t *) + malloc( (k - i_prev + 1) * sizeof( uint32_t )); + if( !psz_unicode ) + { + if( p_face ) FT_Done_Face( p_face ); + free( pp_char_styles ); + free( psz_unicode ); +#if defined(HAVE_FRIBIDI) + free( psz_text ); +#endif + free( pi_karaoke_bar ); + return VLC_ENOMEM; + } + memcpy( psz_unicode, psz_text + i_prev, + sizeof( uint32_t ) * ( k - i_prev ) ); + psz_unicode[ k - i_prev ] = 0; + while( *psz_unicode ) + { + if( !p_line ) + { + if( !(p_line = NewLine( i_len - i_prev)) ) { - free( psz_node ); if( p_face ) FT_Done_Face( p_face ); - rv = VLC_EGENERIC; - break; + free( pp_char_styles ); + free( psz_unicode ); +#if defined(HAVE_FRIBIDI) + free( psz_text ); +#endif + free( pi_karaoke_bar ); + return VLC_ENOMEM; } + /* New Color mode only works in YUVA rendering mode -- + * (RGB mode has palette constraints on it). We therefore + * need to populate the legacy colour fields also. + */ + p_line->b_new_color_mode = true; + p_line->i_alpha = ( p_style->i_font_color & 0xff000000 ) >> 24; + p_line->i_red = ( p_style->i_font_color & 0x00ff0000 ) >> 16; + p_line->i_green = ( p_style->i_font_color & 0x0000ff00 ) >> 8; + p_line->i_blue = ( p_style->i_font_color & 0x000000ff ); + p_line->p_next = NULL; + i_pen_x = 0; + i_pen_y += tmp_result.y; + tmp_result.x = 0; + tmp_result.y = 0; + i_posn = 0; + if( p_prev ) p_prev->p_next = p_line; + else *pp_lines = p_line; + } - while( *psz_unicode ) + if( RenderTag( p_filter, p_face ? p_face : p_sys->p_face, + p_style->i_font_color, p_style->b_underline, + p_style->i_karaoke_bg_color, + p_line, psz_unicode, &i_pen_x, i_pen_y, &i_posn, + &tmp_result ) != VLC_SUCCESS ) + { + if( p_face ) FT_Done_Face( p_face ); + free( pp_char_styles ); + free( psz_unicode ); +#if defined(HAVE_FRIBIDI) + free( psz_text ); +#endif + free( pi_karaoke_bar ); + return VLC_EGENERIC; + } + + if( *psz_unicode ) + { + p_result->x = __MAX( p_result->x, tmp_result.x ); + p_result->y += tmp_result.y; + + p_prev = p_line; + p_line = NULL; + + if( *psz_unicode == '\n') { - if( !p_line ) - { - if( !(p_line = NewLine( (byte_t *)psz_html )) ) - { - msg_Err( p_filter, "out of memory" ); - free( psz_node ); - if( p_face ) FT_Done_Face( p_face ); - rv = VLC_EGENERIC; - break; - } - /* New Color mode only works in YUVA rendering mode -- - * (RGB mode has palette constraints on it). We therefore - * need to populate the legacy colour fields also. - */ - p_line->b_new_color_mode = VLC_TRUE; - p_line->i_alpha = i_font_alpha; - p_line->i_red = ( i_font_color & 0xff0000 ) >> 16; - p_line->i_green = ( i_font_color & 0x00ff00 ) >> 8; - p_line->i_blue = ( i_font_color & 0x0000ff ); - p_line->p_next = NULL; - i_pen_x = 0; - i_pen_y += tmp_result.y; - tmp_result.x = 0; - tmp_result.y = 0; - i_posn = 0; - if( p_prev ) p_prev->p_next = p_line; - else *p_lines = p_line; - } + uint32_t *c_ptr; - if( RenderTag( p_filter, p_face, i_font_color, b_uline, p_line, psz_unicode, &i_pen_x, i_pen_y, &i_posn, &tmp_result ) != VLC_SUCCESS ) + for( c_ptr = psz_unicode; *c_ptr; c_ptr++ ) { - free( psz_node ); - if( p_face ) FT_Done_Face( p_face ); - rv = VLC_EGENERIC; - break; - } - if( *psz_unicode ) - { - p_result->x = __MAX( p_result->x, tmp_result.x ); - p_result->y += tmp_result.y; - - p_prev = p_line; - p_line = NULL; + *c_ptr = *(c_ptr+1); } } - if( rv != VLC_SUCCESS ) break; - - if( p_face ) FT_Done_Face( p_face ); - free( psz_unicode ); - free( psz_node ); } - break; + } + free( psz_unicode ); + if( p_face ) FT_Done_Face( p_face ); + i_prev = k; } } + free( pp_char_styles ); +#if defined(HAVE_FRIBIDI) + free( psz_text ); +#endif if( p_line ) { p_result->x = __MAX( p_result->x, tmp_result.x ); p_result->y += tmp_result.y; } + if( pi_karaoke_bar ) + { + int i = 0; + for( p_line = *pp_lines; p_line; p_line=p_line->p_next ) + { + for( k = 0; p_line->pp_glyphs[ k ]; k++, i++ ) + { + if( (pi_karaoke_bar[ i ] & 0x7f) == 0x7f) + { + /* do nothing */ + } + else if( (pi_karaoke_bar[ i ] & 0x7f) == 0x00) + { + /* 100% BG colour will render faster if we + * instead make it 100% FG colour, so leave + * the ratio alone and copy the value across + */ + p_line->p_fg_rgb[ k ] = p_line->p_bg_rgb[ k ]; + } + else + { + if( pi_karaoke_bar[ i ] & 0x80 ) + { + /* Swap Left and Right sides over for Right aligned + * language text (eg. Arabic, Hebrew) + */ + uint32_t i_tmp = p_line->p_fg_rgb[ k ]; - while( VLC_SUCCESS == PopFont( &p_fonts ) ); + p_line->p_fg_rgb[ k ] = p_line->p_bg_rgb[ k ]; + p_line->p_bg_rgb[ k ] = i_tmp; + } + p_line->p_fg_bg_ratio[ k ] = (pi_karaoke_bar[ i ] & 0x7f); + } + } + /* Jump over the '\n' at the line-end */ + i++; + } + free( pi_karaoke_bar ); + } - return rv; + return VLC_SUCCESS; } - static int RenderHtml( filter_t *p_filter, subpicture_region_t *p_region_out, subpicture_region_t *p_region_in ) { @@ -1721,32 +2237,112 @@ 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), - p_region_in->psz_html, + (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 */ + msg_Dbg( p_filter, "Unsupported top-level tag '%s' ignored.", psz_node ); + xml_ReaderDelete( p_xml, p_xml_reader ); + p_xml_reader = NULL; + rv = VLC_EGENERIC; + } + + free( psz_node ); + } + } + + if( p_xml_reader ) + { + uint32_t *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; + ft_style_t **pp_styles = NULL; FT_Vector result; line_desc_t *p_lines = NULL; - rv = ProcessNodes( p_filter, p_xml_reader, p_region_in->psz_html, p_region_in->p_style, &p_lines, &result ); - - if( rv == VLC_SUCCESS ) + psz_text = (uint32_t *)malloc( strlen( p_region_in->psz_html ) * + sizeof( uint32_t ) ); + if( psz_text ) { + uint32_t k; + + 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 ); + p_region_out->i_x = p_region_in->i_x; p_region_out->i_y = p_region_in->i_y; - if( config_GetInt( p_filter, "freetype-yuvp" ) ) - Render( p_filter, p_region_out, p_lines, result.x, result.y ); - else - RenderYUVA( p_filter, p_region_out, p_lines, result.x, result.y ); + if(( rv == VLC_SUCCESS ) && ( i_len > 0 )) + { + rv = ProcessLines( p_filter, psz_text, i_len, i_runs, + pi_run_lengths, pp_styles, &p_lines, &result, + b_karaoke, i_k_runs, pi_k_run_lengths, + pi_k_durations ); + } + + for( k=0; k 0 )) + { + if( config_GetInt( p_filter, "freetype-yuvp" ) ) + { + Render( p_filter, p_region_out, p_lines, + result.x, result.y ); + } + else + { + RenderYUVA( p_filter, p_region_out, p_lines, + result.x, result.y ); + } + } } FreeLines( p_lines ); @@ -1756,42 +2352,40 @@ static int RenderHtml( filter_t *p_filter, subpicture_region_t *p_region_out, } stream_Delete( p_sub ); } - /* No longer need a HTML version of the text */ - free( p_region_in->psz_html ); - p_region_in->psz_html = NULL; return rv; } -static char* FontConfig_Select( FcConfig* priv, const char* family, vlc_bool_t b_bold, vlc_bool_t b_italic, int *i_idx ) +static char* FontConfig_Select( FcConfig* priv, const char* family, + bool b_bold, bool b_italic, int *i_idx ) { FcResult result; FcPattern *pat, *p_pat; FcChar8* val_s; FcBool val_b; - + pat = FcPatternCreate(); if (!pat) return NULL; - + FcPatternAddString( pat, FC_FAMILY, (const FcChar8*)family ); FcPatternAddBool( pat, FC_OUTLINE, FcTrue ); - FcPatternAddInteger( pat, FC_SLANT, b_italic ? 1000 : 0 ); - FcPatternAddInteger( pat, FC_WEIGHT, b_bold ? 1000 : 0 ); + FcPatternAddInteger( pat, FC_SLANT, b_italic ? FC_SLANT_ITALIC : FC_SLANT_ROMAN ); + FcPatternAddInteger( pat, FC_WEIGHT, b_bold ? FC_WEIGHT_EXTRABOLD : FC_WEIGHT_NORMAL ); FcDefaultSubstitute( pat ); - + if( !FcConfigSubstitute( priv, pat, FcMatchPattern ) ) { FcPatternDestroy( pat ); return NULL; } - + p_pat = FcFontMatch( priv, pat, &result ); FcPatternDestroy( pat ); if( !p_pat ) return NULL; - - if( ( FcResultMatch != FcPatternGetBool( p_pat, FC_OUTLINE, 0, &val_b ) ) || - ( val_b != FcTrue ) ) + + if( ( FcResultMatch != FcPatternGetBool( p_pat, FC_OUTLINE, 0, &val_b ) ) + || ( val_b != FcTrue ) ) { FcPatternDestroy( p_pat ); return NULL; @@ -1800,7 +2394,7 @@ static char* FontConfig_Select( FcConfig* priv, const char* family, vlc_bool_t b { *i_idx = 0; } - + if( FcResultMatch != FcPatternGetString( p_pat, FC_FAMILY, 0, &val_s ) ) { FcPatternDestroy( p_pat ); @@ -1809,7 +2403,8 @@ static char* FontConfig_Select( FcConfig* priv, const char* family, vlc_bool_t b /* if( strcasecmp((const char*)val_s, family ) != 0 ) - msg_Warn( p_filter, "fontconfig: selected font family is not the requested one: '%s' != '%s'\n", + msg_Warn( p_filter, "fontconfig: selected font family is not" + "the requested one: '%s' != '%s'\n", (const char*)val_s, family ); */ @@ -1818,7 +2413,7 @@ static char* FontConfig_Select( FcConfig* priv, const char* family, vlc_bool_t b FcPatternDestroy( p_pat ); return NULL; } - + FcPatternDestroy( p_pat ); return strdup( (const char*)val_s ); } @@ -1833,7 +2428,9 @@ static void FreeLine( line_desc_t *p_line ) } free( p_line->pp_glyphs ); free( p_line->p_glyph_pos ); - free( p_line->p_rgb ); + free( p_line->p_fg_rgb ); + free( p_line->p_bg_rgb ); + free( p_line->p_fg_bg_ratio ); free( p_line->pi_underline_offset ); free( p_line->pi_underline_thickness ); free( p_line ); @@ -1852,9 +2449,8 @@ static void FreeLines( line_desc_t *p_lines ) } } -static line_desc_t *NewLine( byte_t *psz_string ) +static line_desc_t *NewLine( int i_count ) { - int i_count; line_desc_t *p_line = malloc( sizeof(line_desc_t) ); if( !p_line ) return NULL; @@ -1862,65 +2458,78 @@ static line_desc_t *NewLine( byte_t *psz_string ) p_line->i_width = 0; p_line->p_next = NULL; - /* We don't use CountUtf8Characters() here because we are not acutally - * sure the string is utf8. Better be safe than sorry. */ - i_count = strlen( (char *)psz_string ); - p_line->pp_glyphs = malloc( sizeof(FT_BitmapGlyph) * ( i_count + 1 ) ); - p_line->p_glyph_pos = malloc( sizeof( FT_Vector ) * i_count + 1 ); - p_line->p_rgb = malloc( sizeof( uint32_t ) * i_count + 1 ); - p_line->pi_underline_offset = calloc( i_count+ + 1, sizeof( uint16_t ) ); - p_line->pi_underline_thickness = calloc( i_count+ + 1, sizeof( uint16_t ) ); + p_line->p_glyph_pos = malloc( sizeof( FT_Vector ) * ( i_count + 1 ) ); + p_line->p_fg_rgb = malloc( sizeof( uint32_t ) * ( i_count + 1 ) ); + p_line->p_bg_rgb = malloc( sizeof( uint32_t ) * ( i_count + 1 ) ); + p_line->p_fg_bg_ratio = calloc( i_count + 1, sizeof( uint8_t ) ); + p_line->pi_underline_offset = calloc( i_count + 1, sizeof( uint16_t ) ); + p_line->pi_underline_thickness = calloc( i_count + 1, sizeof( uint16_t ) ); if( ( p_line->pp_glyphs == NULL ) || ( p_line->p_glyph_pos == NULL ) || - ( p_line->p_rgb == NULL ) || + ( p_line->p_fg_rgb == NULL ) || + ( p_line->p_bg_rgb == NULL ) || + ( p_line->p_fg_bg_ratio == NULL ) || ( p_line->pi_underline_offset == NULL ) || ( p_line->pi_underline_thickness == NULL ) ) { - if( p_line->pi_underline_thickness ) free( p_line->pi_underline_thickness ); - if( p_line->pi_underline_offset ) free( p_line->pi_underline_offset ); - if( p_line->p_rgb ) free( p_line->p_rgb ); - if( p_line->p_glyph_pos ) free( p_line->p_glyph_pos ); - if( p_line->pp_glyphs ) free( p_line->pp_glyphs ); + free( p_line->pi_underline_thickness ); + free( p_line->pi_underline_offset ); + free( p_line->p_fg_rgb ); + free( p_line->p_bg_rgb ); + free( p_line->p_fg_bg_ratio ); + free( p_line->p_glyph_pos ); + free( p_line->pp_glyphs ); free( p_line ); return NULL; } p_line->pp_glyphs[0] = NULL; - p_line->b_new_color_mode = VLC_FALSE; - + p_line->b_new_color_mode = false; + return p_line; } -static int SetFontSize( filter_t *p_filter, int i_size ) +static int GetFontSize( filter_t *p_filter ) { filter_sys_t *p_sys = p_filter->p_sys; + vlc_value_t val; + int i_size = 0; - if( i_size && i_size == p_sys->i_font_size ) return VLC_SUCCESS; - - if( !i_size ) + if( p_sys->i_default_font_size ) { - vlc_value_t val; - - if( !p_sys->i_default_font_size && - p_sys->i_display_height == (int)p_filter->fmt_out.video.i_height ) - return VLC_SUCCESS; - - if( p_sys->i_default_font_size ) - { - i_size = p_sys->i_default_font_size; - } + if( VLC_SUCCESS == var_Get( p_filter, "scale", &val )) + i_size = p_sys->i_default_font_size * val.i_int / 1000; else + i_size = p_sys->i_default_font_size; + } + else + { + var_Get( p_filter, "freetype-rel-fontsize", &val ); + if( val.i_int > 0 ) { - var_Get( p_filter, "freetype-rel-fontsize", &val ); i_size = (int)p_filter->fmt_out.video.i_height / val.i_int; p_filter->p_sys->i_display_height = p_filter->fmt_out.video.i_height; } - if( i_size <= 0 ) - { - msg_Warn( p_filter, "invalid fontsize, using 12" ); + } + if( i_size <= 0 ) + { + msg_Warn( p_filter, "invalid fontsize, using 12" ); + if( VLC_SUCCESS == var_Get( p_filter, "scale", &val )) + i_size = 12 * val.i_int / 1000; + else i_size = 12; - } + } + return i_size; +} + +static int SetFontSize( filter_t *p_filter, int i_size ) +{ + filter_sys_t *p_sys = p_filter->p_sys; + + if( !i_size ) + { + i_size = GetFontSize( p_filter ); msg_Dbg( p_filter, "using fontsize: %i", i_size ); } @@ -1935,3 +2544,18 @@ static int SetFontSize( filter_t *p_filter, int i_size ) return VLC_SUCCESS; } + +static void YUVFromRGB( uint32_t i_argb, + uint8_t *pi_y, uint8_t *pi_u, uint8_t *pi_v ) +{ + int i_red = ( i_argb & 0x00ff0000 ) >> 16; + int i_green = ( i_argb & 0x0000ff00 ) >> 8; + int i_blue = ( i_argb & 0x000000ff ); + + *pi_y = (uint8_t)__MIN(abs( 2104 * i_red + 4130 * i_green + + 802 * i_blue + 4096 + 131072 ) >> 13, 235); + *pi_u = (uint8_t)__MIN(abs( -1214 * i_red + -2384 * i_green + + 3598 * i_blue + 4096 + 1048576) >> 13, 240); + *pi_v = (uint8_t)__MIN(abs( 3598 * i_red + -3013 * i_green + + -585 * i_blue + 4096 + 1048576) >> 13, 240); +}