/*****************************************************************************
* freetype.c : Put text on the video, using freetype2
*****************************************************************************
- * Copyright (C) 2002, 2003 VideoLAN
- * $Id: freetype.c,v 1.40 2004/01/25 18:53:07 gbazin Exp $
+ * Copyright (C) 2002 - 2005 the VideoLAN team
+ * $Id$
*
- * Authors: Sigmund Augdal <sigmunau@idi.ntnu.no>
+ * Authors: Sigmund Augdal Helberg <dnumgis@videolan.org>
+ * Gildas Bazin <gbazin@videolan.org>
*
* 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
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
#endif
#include <vlc/vlc.h>
-#include <vlc/vout.h>
-#include <osd.h>
+#include <vlc_vout.h>
+#include <vlc_osd.h>
+#include <vlc_block.h>
+#include <vlc_filter.h>
+#include <vlc_stream.h>
+#include <vlc_xml.h>
+
#include <math.h>
#ifdef HAVE_ERRNO_H
#include <ft2build.h>
#include FT_FREETYPE_H
#include FT_GLYPH_H
+#define FT_FLOOR(X) ((X & -64) >> 6)
+#define FT_CEIL(X) (((X + 63) & -64) >> 6)
+#define FT_MulFix(v, s) (((v)*(s))>>16)
-#ifdef SYS_DARWIN
+#ifdef __APPLE__
#define DEFAULT_FONT "/System/Library/Fonts/LucidaGrande.dfont"
+#define FC_DEFAULT_FONT "Lucida Grande"
#elif defined( SYS_BEOS )
#define DEFAULT_FONT "/boot/beos/etc/fonts/ttfonts/Swiss721.ttf"
+#define FC_DEFAULT_FONT "Swiss"
#elif defined( WIN32 )
#define DEFAULT_FONT "" /* Default font found at run-time */
+#define FC_DEFAULT_FONT "Arial"
#else
#define DEFAULT_FONT "/usr/share/fonts/truetype/freefont/FreeSerifBold.ttf"
+#define FC_DEFAULT_FONT "Serif Bold"
#endif
-#if defined(HAVE_ICONV)
-#include <iconv.h>
-#endif
#if defined(HAVE_FRIBIDI)
#include <fribidi/fribidi.h>
#endif
+#ifdef HAVE_FONTCONFIG
+#include <fontconfig/fontconfig.h>
+#endif
+
typedef struct line_desc_t line_desc_t;
/*****************************************************************************
* Local prototypes
*****************************************************************************/
-static int Create ( vlc_object_t * );
-static void Destroy ( vlc_object_t * );
-
-static void Render ( vout_thread_t *, picture_t *,
- const subpicture_t * );
-static void RenderI420( vout_thread_t *, picture_t *,
- const subpicture_t * );
-static void RenderYUY2( vout_thread_t *, picture_t *,
- const subpicture_t * );
-static void RenderRV32( vout_thread_t *, picture_t *,
- const subpicture_t * );
-static subpicture_t *AddText ( vout_thread_t *, char *, text_style_t *, int,
- int, int, mtime_t, mtime_t );
-
-static void FreeString( subpicture_t * );
-
-#if !defined(HAVE_ICONV)
-static int GetUnicodeCharFromUTF8( byte_t ** );
+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_("Font filename")
+#define FONT_LONGTEXT N_("Filename for the font you want to use")
#define FONTSIZE_TEXT N_("Font size in pixels")
-#define FONTSIZE_LONGTEXT N_("The size of the fonts used by the osd module. " \
+#define FONTSIZE_LONGTEXT N_("This is the default size of the fonts " \
+ "that will be rendered on the video. " \
"If set to something different than 0 this option will override the " \
- "relative font size " )
-#define FONTSIZER_TEXT N_("Font size")
-#define FONTSIZER_LONGTEXT N_("The size of the fonts used by the osd module" )
+ "relative font size." )
+#define OPACITY_TEXT N_("Opacity")
+#define OPACITY_LONGTEXT N_("The opacity (inverse of transparency) of the " \
+ "text that will be rendered on the video. 0 = transparent, " \
+ "255 = totally opaque. " )
+#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" )
+#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." )
static int pi_sizes[] = { 20, 18, 16, 12, 6 };
static char *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" )
+#define EFFECT_TEXT N_("Font Effect")
+#define EFFECT_LONGTEXT N_("It is possible to apply effects to the rendered " \
+"text to improve its readability." )
+
+#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[] = {
+ 0x00000000, 0x00808080, 0x00C0C0C0, 0x00FFFFFF, 0x00800000,
+ 0x00FF0000, 0x00FF00FF, 0x00FFFF00, 0x00808000, 0x00008000, 0x00008080,
+ 0x0000FF00, 0x00800080, 0x00000080, 0x000000FF, 0x0000FFFF };
+
+static char *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_description( _("freetype2 font renderer") );
+ set_shortname( _("Text renderer"));
+ set_description( _("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 );
+
add_integer( "freetype-fontsize", 0, NULL, FONTSIZE_TEXT,
FONTSIZE_LONGTEXT, VLC_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 );
+
+ /* 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 );
+
add_integer( "freetype-rel-fontsize", 16, NULL, FONTSIZER_TEXT,
FONTSIZER_LONGTEXT, VLC_FALSE );
change_integer_list( pi_sizes, ppsz_sizes_text, 0 );
+ add_integer( "freetype-effect", 2, NULL, EFFECT_TEXT,
+ EFFECT_LONGTEXT, VLC_FALSE );
+ change_integer_list( pi_effects, ppsz_effects_text, 0 );
+ 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();
-/**
- * Private data in a subpicture. Describes a string.
- */
-struct subpicture_sys_t
-{
- int i_x_margin;
- int i_y_margin;
- int i_width;
- int i_height;
- int i_flags;
- /** The string associated with this subpicture */
- byte_t *psz_text;
- line_desc_t *p_lines;
-};
-
struct line_desc_t
{
/** NULL-terminated list of glyphs making the string */
FT_BitmapGlyph *pp_glyphs;
/** list of relative positions for the glyphs */
FT_Vector *p_glyph_pos;
+ /** list of RGB information for styled text
+ * -- 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;
+ /** underline information -- only supplied if text should be underlined */
+ uint16_t *pi_underline_offset;
+ uint16_t *pi_underline_thickness;
+
int i_height;
int i_width;
+ int i_red, i_green, i_blue;
+ int i_alpha;
+
line_desc_t *p_next;
};
+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;
+};
+
+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 * );
+
/*****************************************************************************
- * text_renderer_sys_t: freetype local data
+ * filter_sys_t: freetype local data
*****************************************************************************
* This structure is part of the video output thread descriptor.
* It describes the freetype specific properties of an output thread.
*****************************************************************************/
-struct text_renderer_sys_t
+struct filter_sys_t
{
FT_Library p_library; /* handle to library */
FT_Face p_face; /* handle to face object */
- vlc_mutex_t *lock;
vlc_bool_t i_use_kerning;
- uint8_t pi_gamma[256];
+ uint8_t i_font_opacity;
+ int i_font_color;
+ int i_font_size;
+ int i_effect;
+
+ int i_default_font_size;
+ int i_display_height;
+#ifdef HAVE_FONTCONFIG
+ FcConfig *p_fontconfig;
+#endif
};
/*****************************************************************************
*****************************************************************************
* This function allocates and initializes a Clone vout method.
*****************************************************************************/
-#define gamma_value 2.0
static int Create( vlc_object_t *p_this )
{
- vout_thread_t *p_vout = (vout_thread_t *)p_this;
- char *psz_fontfile;
- int i, i_error;
- int i_fontsize = 0;
- double gamma_inv = 1.0f / gamma_value;
+ 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_vout->p_text_renderer_data = malloc( sizeof( text_renderer_sys_t ) );
- if( p_vout->p_text_renderer_data == NULL )
+ p_filter->p_sys = p_sys = malloc( sizeof( filter_sys_t ) );
+ if( !p_sys )
{
- msg_Err( p_vout, "out of memory" );
+ msg_Err( p_filter, "out of memory" );
return VLC_ENOMEM;
}
-
- for (i = 0; i < 256; i++) {
- p_vout->p_text_renderer_data->pi_gamma[i] =
- (uint8_t)( pow( (double)i / 255.0f, gamma_inv) * 255.0f );
- }
-
- var_Create( p_vout, "freetype-font", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
- var_Create( p_vout, "freetype-fontsize",
+ p_sys->p_face = 0;
+ p_sys->p_library = 0;
+ p_sys->i_font_size = 0;
+ p_sys->i_display_height = 0;
+
+ var_Create( p_filter, "freetype-font",
+ VLC_VAR_STRING | VLC_VAR_DOINHERIT );
+ var_Create( p_filter, "freetype-fontsize",
VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
- var_Create( p_vout, "freetype-rel-fontsize",
+ var_Create( p_filter, "freetype-rel-fontsize",
VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
-
+ var_Create( p_filter, "freetype-opacity",
+ VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
+ var_Create( p_filter, "freetype-effect",
+ VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
+ var_Get( p_filter, "freetype-opacity", &val );
+ p_sys->i_font_opacity = __MAX( __MIN( val.i_int, 255 ), 0 );
+ var_Create( p_filter, "freetype-color",
+ VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
+ 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_vout, "freetype-font", &val );
+ var_Get( p_filter, "freetype-font", &val );
psz_fontfile = val.psz_string;
-
if( !psz_fontfile || !*psz_fontfile )
{
if( psz_fontfile ) free( psz_fontfile );
#ifdef WIN32
GetWindowsDirectory( psz_fontfile, PATH_MAX + 1 );
strcat( psz_fontfile, "\\fonts\\arial.ttf" );
-#elif SYS_DARWIN
+#elif __APPLE__
strcpy( psz_fontfile, DEFAULT_FONT );
#else
- msg_Err( p_vout, "user didn't specify a font" );
- free( p_vout->p_text_renderer_data );
- return VLC_EGENERIC;
+ msg_Err( p_filter, "user didn't specify a font" );
+ goto error;
#endif
}
- i_error = FT_Init_FreeType( &p_vout->p_text_renderer_data->p_library );
+#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_vout, "couldn't initialize freetype" );
- free( p_vout->p_text_renderer_data );
- return VLC_EGENERIC;
+ msg_Err( p_filter, "couldn't initialize freetype" );
+ goto error;
}
- i_error = FT_New_Face( p_vout->p_text_renderer_data->p_library,
- psz_fontfile ? psz_fontfile : "", 0,
- &p_vout->p_text_renderer_data->p_face );
+ 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 )
{
- msg_Err( p_vout, "file %s have unknown format", psz_fontfile );
- FT_Done_FreeType( p_vout->p_text_renderer_data->p_library );
- free( p_vout->p_text_renderer_data );
- if( psz_fontfile ) free( psz_fontfile );
- return VLC_EGENERIC;
+ msg_Err( p_filter, "file %s have unknown format", psz_fontfile );
+ goto error;
}
else if( i_error )
{
- msg_Err( p_vout, "failed to load font file %s", psz_fontfile );
- FT_Done_FreeType( p_vout->p_text_renderer_data->p_library );
- free( p_vout->p_text_renderer_data );
- if( psz_fontfile ) free( psz_fontfile );
- return VLC_EGENERIC;
+ msg_Err( p_filter, "failed to load font file %s", psz_fontfile );
+ goto error;
}
- if( psz_fontfile ) free( psz_fontfile );
- i_error = FT_Select_Charmap( p_vout->p_text_renderer_data->p_face,
- ft_encoding_unicode );
+ i_error = FT_Select_Charmap( p_sys->p_face, ft_encoding_unicode );
if( i_error )
{
- msg_Err( p_vout, "Font has no unicode translation table" );
- FT_Done_Face( p_vout->p_text_renderer_data->p_face );
- FT_Done_FreeType( p_vout->p_text_renderer_data->p_library );
- free( p_vout->p_text_renderer_data );
- return VLC_EGENERIC;
+ msg_Err( p_filter, "font has no unicode translation table" );
+ goto error;
}
- p_vout->p_text_renderer_data->i_use_kerning =
- FT_HAS_KERNING(p_vout->p_text_renderer_data->p_face);
+ p_sys->i_use_kerning = FT_HAS_KERNING( p_sys->p_face );
- var_Get( p_vout, "freetype-fontsize", &val );
-
- if( val.i_int )
- {
- i_fontsize = val.i_int;
- }
- else
- {
- var_Get( p_vout, "freetype-rel-fontsize", &val );
- i_fontsize = (int) p_vout->render.i_height / val.i_int;
- }
- msg_Dbg( p_vout, "Using fontsize: %i", i_fontsize);
+ 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;
- i_error = FT_Set_Pixel_Sizes( p_vout->p_text_renderer_data->p_face, 0,
- i_fontsize );
- if( i_error )
- {
- msg_Err( p_vout, "couldn't set font size to %d", i_fontsize );
- free( p_vout->p_text_renderer_data );
- return VLC_EGENERIC;
- }
- p_vout->pf_add_string = AddText;
+ if( psz_fontfile ) free( psz_fontfile );
+ p_filter->pf_render_text = RenderText;
+#ifdef HAVE_FONTCONFIG
+ p_filter->pf_render_html = RenderHtml;
+#else
+ p_filter->pf_render_html = NULL;
+#endif
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( p_sys );
+ return VLC_EGENERIC;
}
/*****************************************************************************
*****************************************************************************/
static void Destroy( vlc_object_t *p_this )
{
- vout_thread_t *p_vout = (vout_thread_t *)p_this;
- FT_Done_Face( p_vout->p_text_renderer_data->p_face );
- FT_Done_FreeType( p_vout->p_text_renderer_data->p_library );
- free( p_vout->p_text_renderer_data );
+ filter_t *p_filter = (filter_t *)p_this;
+ filter_sys_t *p_sys = p_filter->p_sys;
+
+#ifdef HAVE_FONTCONFIG
+ FcConfigDestroy( p_sys->p_fontconfig );
+ p_sys->p_fontconfig = NULL;
+ /* 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 );
}
/*****************************************************************************
*****************************************************************************
* This function merges the previously rendered freetype glyphs into a picture
*****************************************************************************/
-static void Render( vout_thread_t *p_vout, picture_t *p_pic,
- const subpicture_t *p_subpic )
+static int Render( filter_t *p_filter, subpicture_region_t *p_region,
+ line_desc_t *p_line, int i_width, int i_height )
{
- switch( p_vout->output.i_chroma )
- {
- /* I420 target, no scaling */
- case VLC_FOURCC('I','4','2','0'):
- case VLC_FOURCC('I','Y','U','V'):
- case VLC_FOURCC('Y','V','1','2'):
- RenderI420( p_vout, p_pic, p_subpic );
- break;
-#if 0
- /* RV16 target, scaling */
- case VLC_FOURCC('R','V','1','6'):
- RenderRV16( p_vout, p_pic, p_subpic );
- break;
-#endif
- /* RV32 target, scaling */
- case VLC_FOURCC('R','V','2','4'):
- case VLC_FOURCC('R','V','3','2'):
- RenderRV32( p_vout, p_pic, p_subpic );
- break;
- /* NVidia or BeOS overlay, no scaling */
- case VLC_FOURCC('Y','U','Y','2'):
- RenderYUY2( p_vout, p_pic, p_subpic );
- break;
-
- default:
- msg_Err( p_vout, "unknown chroma, can't render SPU" );
- break;
+ static uint8_t pi_gamma[16] =
+ {0x00, 0x52, 0x84, 0x96, 0xb8, 0xca, 0xdc, 0xee, 0xff,
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
+
+ uint8_t *p_dst;
+ video_format_t fmt;
+ 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) );
+ fmt.i_chroma = VLC_FOURCC('Y','U','V','P');
+ fmt.i_aspect = 0;
+ fmt.i_width = fmt.i_visible_width = i_width + 4;
+ fmt.i_height = fmt.i_visible_height = i_height + 4;
+ 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;
}
-}
-/**
- * Draw a string on a i420 (or similar) picture
- */
-static void RenderI420( vout_thread_t *p_vout, picture_t *p_pic,
- const subpicture_t *p_subpic )
-{
- subpicture_sys_t *p_string = p_subpic->p_sys;
- int i_plane, x, y, pen_x, pen_y;
- unsigned int i;
- line_desc_t *p_line;
+ p_region->fmt = p_region_tmp->fmt;
+ p_region->picture = p_region_tmp->picture;
+ free( p_region_tmp );
+
+ /* Calculate text color components */
+ i_y = (uint8_t)(( 66 * p_line->i_red + 129 * p_line->i_green +
+ 25 * p_line->i_blue + 128) >> 8) + 16;
+ i_u = (int8_t)(( -38 * p_line->i_red - 74 * p_line->i_green +
+ 112 * p_line->i_blue + 128) >> 8) + 128;
+ i_v = (int8_t)(( 112 * p_line->i_red - 94 * p_line->i_green -
+ 18 * p_line->i_blue + 128) >> 8) + 128;
+
+ /* Build palette */
+ fmt.p_palette->i_entries = 16;
+ for( i = 0; i < 8; i++ )
+ {
+ fmt.p_palette->palette[i][0] = 0;
+ fmt.p_palette->palette[i][1] = 0x80;
+ fmt.p_palette->palette[i][2] = 0x80;
+ fmt.p_palette->palette[i][3] = pi_gamma[i];
+ fmt.p_palette->palette[i][3] =
+ (int)fmt.p_palette->palette[i][3] * (255 - p_line->i_alpha) / 255;
+ }
+ for( i = 8; i < fmt.p_palette->i_entries; i++ )
+ {
+ fmt.p_palette->palette[i][0] = i * 16 * i_y / 256;
+ fmt.p_palette->palette[i][1] = i_u;
+ fmt.p_palette->palette[i][2] = i_v;
+ fmt.p_palette->palette[i][3] = pi_gamma[i];
+ fmt.p_palette->palette[i][3] =
+ (int)fmt.p_palette->palette[i][3] * (255 - p_line->i_alpha) / 255;
+ }
- for( p_line = p_subpic->p_sys->p_lines; p_line != NULL; p_line = p_line->p_next )
+ p_dst = p_region->picture.Y_PIXELS;
+ i_pitch = p_region->picture.Y_PITCH;
+
+ /* Initialize the region pixels */
+ memset( p_dst, 0, i_pitch * p_region->fmt.i_height );
+
+ for( ; p_line != NULL; p_line = p_line->p_next )
{
- for( i_plane = 0 ; i_plane < p_pic->i_planes ; i_plane++ )
+ int i_glyph_tmax = 0;
+ int i_bitmap_offset, i_offset, i_align_offset = 0;
+ for( i = 0; p_line->pp_glyphs[i] != NULL; i++ )
+ {
+ FT_BitmapGlyph p_glyph = p_line->pp_glyphs[ i ];
+ i_glyph_tmax = __MAX( i_glyph_tmax, p_glyph->top );
+ }
+
+ 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 ) )
+ {
+ 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 ) )
+ {
+ i_align_offset = ( i_width - p_line->i_width ) / 2;
+ }
+ }
+
+ for( i = 0; p_line->pp_glyphs[i] != NULL; i++ )
{
- uint8_t *p_in;
- int i_pic_pitch = p_pic->p[ i_plane ].i_pitch;
- int i_pic_width = p_pic->p[ i_plane ].i_visible_pitch;
+ FT_BitmapGlyph p_glyph = p_line->pp_glyphs[ i ];
- p_in = p_pic->p[ i_plane ].p_pixels;
+ i_offset = ( p_line->p_glyph_pos[ i ].y +
+ i_glyph_tmax - p_glyph->top + 2 ) *
+ i_pitch + p_line->p_glyph_pos[ i ].x + p_glyph->left + 2 +
+ i_align_offset;
- if ( i_plane == 0 )
+ for( y = 0, i_bitmap_offset = 0; y < p_glyph->bitmap.rows; y++ )
{
- if ( p_string->i_flags & OSD_ALIGN_BOTTOM )
- {
- pen_y = p_pic->p[ i_plane ].i_lines - p_string->i_height -
- p_string->i_y_margin;
- }
- else
- {
- pen_y = p_string->i_y_margin;
- }
- pen_y += p_vout->p_text_renderer_data->p_face->size->metrics.ascender >> 6;
- if ( p_string->i_flags & OSD_ALIGN_RIGHT )
+ for( x = 0; x < p_glyph->bitmap.width; x++, i_bitmap_offset++ )
{
- pen_x = i_pic_width - p_line->i_width
- - p_string->i_x_margin;
- }
- else if ( p_string->i_flags & OSD_ALIGN_LEFT )
- {
- pen_x = p_string->i_x_margin;
- }
- else
- {
- pen_x = i_pic_width / 2 - p_line->i_width / 2
- + p_string->i_x_margin;
+ if( p_glyph->bitmap.buffer[i_bitmap_offset] )
+ p_dst[i_offset+x] =
+ ((int)p_glyph->bitmap.buffer[i_bitmap_offset] + 8)/16;
}
+ i_offset += i_pitch;
+ }
+ }
+ }
- for( i = 0; p_line->pp_glyphs[i] != NULL; i++ )
- {
- FT_BitmapGlyph p_glyph = p_line->pp_glyphs[ i ];
-#define alpha p_vout->p_text_renderer_data->pi_gamma[ p_glyph->bitmap.buffer[ x + y * p_glyph->bitmap.width ] ]
-#define pixel p_in[ ( p_line->p_glyph_pos[ i ].y + pen_y + y - p_glyph->top ) * i_pic_pitch + x + pen_x + p_line->p_glyph_pos[ i ].x + p_glyph->left ]
- for(y = 0; y < p_glyph->bitmap.rows; y++ )
- {
- for( x = 0; x < p_glyph->bitmap.width; x++ )
- {
- pen_y--;
- pixel = ( ( pixel * ( 255 - alpha ) ) >> 8 );
- pen_y++; pen_x--;
- pixel = ( ( pixel * ( 255 - alpha ) ) >> 8 );
- pen_x += 2;
- pixel = ( ( pixel * ( 255 - alpha ) ) >> 8 );
- pen_y++; pen_x--;
- pixel = ( ( pixel * ( 255 - alpha ) ) >> 8 );
- pen_y--;
- }
- }
- for(y = 0; y < p_glyph->bitmap.rows; y++ )
- {
- for( x = 0; x < p_glyph->bitmap.width; x++ )
- {
- pixel = ( ( pixel * ( 255 - alpha ) ) >> 8 ) +
- ( 255 * alpha >> 8 );
- }
- }
-#undef alpha
-#undef pixel
- }
+ /* Outlining (find something better than nearest neighbour filtering ?) */
+ if( 1 )
+ {
+ uint8_t *p_dst = p_region->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;
+ 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;
+ left = current;
}
- else
+ }
+ memset( p_top, 0, fmt.i_width );
+ }
+
+ return VLC_SUCCESS;
+}
+
+static void UnderlineGlyphYUVA( int i_line_thickness, int i_line_offset, vlc_bool_t 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,
+ 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;
+
+ 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;
+
+ 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) -
+ (p_this_glyph_pos->x + p_this_glyph->left);
+ }
+ for( x = 0; x < i_extra; x++ )
+ {
+ vlc_bool_t b_ok = VLC_TRUE;
+
+ /* break the underline around the tails of any glyphs which cross it */
+ for( z = x - i_line_thickness;
+ z < x + i_line_thickness && b_ok;
+ z++ )
{
- if ( p_string->i_flags & OSD_ALIGN_BOTTOM )
- {
- pen_y = p_pic->p[i_plane].i_lines - ( p_string->i_height>>1) -
- (p_string->i_y_margin>>1);
- }
- else
+ if( p_next_glyph && ( z >= i_extra ) )
{
- pen_y = p_string->i_y_margin >> 1;
- }
- pen_y += p_vout->p_text_renderer_data->p_face->size->metrics.ascender >> 7;
- if ( p_string->i_flags & OSD_ALIGN_RIGHT )
- {
- pen_x = i_pic_width - ( p_line->i_width >> 1 )
- - ( p_string->i_x_margin >> 1 );
- }
- else if ( p_string->i_flags & OSD_ALIGN_LEFT )
- {
- pen_x = p_string->i_x_margin >> 1;
+ int i_row = i_line_offset + p_next_glyph->top + y;
+
+ 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;
+ }
}
- else
+ else if ((z > 0 ) && (z < p_this_glyph->bitmap.width))
{
- pen_x = i_pic_width / 2 - p_line->i_width / 4
- + p_string->i_x_margin / 2;
- }
+ int i_row = i_line_offset + p_this_glyph->top + y;
- for( i = 0; p_line->pp_glyphs[i] != NULL; i++ )
- {
- FT_BitmapGlyph p_glyph = p_line->pp_glyphs[ i ];
-#define alpha p_vout->p_text_renderer_data->pi_gamma[ p_glyph->bitmap.buffer[ ( x + y * p_glyph->bitmap.width ) ] ]
-#define pixel p_in[ ( ( p_line->p_glyph_pos[ i ].y >> 1 ) + pen_y + ( y >> 1 ) - ( p_glyph->top >> 1 ) ) * i_pic_pitch + ( x >> 1 ) + pen_x + ( p_line->p_glyph_pos[ i ].x >> 1 ) + ( p_glyph->left >>1) ]
- for( y = 0; y < p_glyph->bitmap.rows; y+=2 )
+ if( ( p_this_glyph->bitmap.rows > i_row ) &&
+ p_this_glyph->bitmap.buffer[p_this_glyph->bitmap.width * i_row + z] )
{
- for( x = 0; x < p_glyph->bitmap.width; x+=2 )
- {
- pixel = ( ( pixel * ( 0xFF - alpha ) ) >> 8 ) +
- ( 0x80 * alpha >> 8 );
-#undef alpha
-#undef pixel
- }
+ b_ok = VLC_FALSE;
}
}
}
+
+ if( b_ok )
+ {
+ p_dst_y[i_offset+x] = (i_y * 255) >> 8;
+ p_dst_u[i_offset+x] = i_u;
+ p_dst_v[i_offset+x] = i_v;
+ p_dst_a[i_offset+x] = 255;
+ }
}
+ i_offset += i_pitch;
}
}
-/**
- * Draw a string on a YUY2 picture
- */
-static void RenderYUY2( vout_thread_t *p_vout, picture_t *p_pic,
- const subpicture_t *p_subpic )
+static void DrawBlack( line_desc_t *p_line, int i_width, subpicture_region_t *p_region, int xoffset, int yoffset )
{
- subpicture_sys_t *p_string = p_subpic->p_sys;
- int x, y, pen_x, pen_y;
- unsigned int i;
- line_desc_t *p_line;
+ uint8_t *p_dst = p_region->picture.A_PIXELS;
+ int i_pitch = p_region->picture.A_PITCH;
+ int x,y;
- for( p_line = p_subpic->p_sys->p_lines; p_line != NULL;
- p_line = p_line->p_next )
+ for( ; p_line != NULL; p_line = p_line->p_next )
{
- uint8_t *p_in;
- int i_pic_pitch = p_pic->p[0].i_pitch;
- int i_pic_width = p_pic->p[0].i_visible_pitch;
-
- p_in = p_pic->p[0].p_pixels;
-
- if ( p_string->i_flags & OSD_ALIGN_BOTTOM )
- {
- pen_y = p_pic->p[0].i_lines - p_string->i_height -
- p_string->i_y_margin;
- }
- else
- {
- pen_y = p_string->i_y_margin;
- }
- pen_y += p_vout->p_text_renderer_data->p_face->size->metrics.ascender >> 6;
- if ( p_string->i_flags & OSD_ALIGN_RIGHT )
- {
- pen_x = i_pic_width - p_line->i_width
- - p_string->i_x_margin;
- }
- else if ( p_string->i_flags & OSD_ALIGN_LEFT )
+ int i_glyph_tmax=0, i = 0;
+ int i_bitmap_offset, i_offset, i_align_offset = 0;
+ for( i = 0; p_line->pp_glyphs[i] != NULL; i++ )
{
- pen_x = p_string->i_x_margin;
+ FT_BitmapGlyph p_glyph = p_line->pp_glyphs[ i ];
+ i_glyph_tmax = __MAX( i_glyph_tmax, p_glyph->top );
}
- else
+
+ if( p_line->i_width < i_width )
{
- pen_x = i_pic_width / 2 /2 - p_line->i_width / 2 + p_string->i_x_margin;
+ 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 ) )
+ {
+ 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 ) )
+ {
+ i_align_offset = ( i_width - p_line->i_width ) / 2;
+ }
}
for( i = 0; p_line->pp_glyphs[i] != NULL; i++ )
{
FT_BitmapGlyph p_glyph = p_line->pp_glyphs[ i ];
-#define alpha p_vout->p_text_renderer_data->pi_gamma[ p_glyph->bitmap.buffer[ x + y * p_glyph->bitmap.width ] ]
-#define pixel p_in[ ( p_line->p_glyph_pos[ i ].y + pen_y + y - p_glyph->top ) * i_pic_pitch + 2 * ( x + pen_x + p_line->p_glyph_pos[ i ].x + p_glyph->left ) ]
- for(y = 0; y < p_glyph->bitmap.rows; y++ )
- {
- for( x = 0; x < p_glyph->bitmap.width; x++ )
- {
- pen_y--;
- pixel = ( ( pixel * ( 255 - alpha ) ) >> 8 );
- pen_y++; pen_x--;
- pixel = ( ( pixel * ( 255 - alpha ) ) >> 8 );
- pen_x += 2;
- pixel = ( ( pixel * ( 255 - alpha ) ) >> 8 );
- pen_y++; pen_x--;
- pixel = ( ( pixel * ( 255 - alpha ) ) >> 8 );
- pen_y--;
- }
- }
- for(y = 0; y < p_glyph->bitmap.rows; y++ )
+
+ i_offset = ( p_line->p_glyph_pos[ i ].y +
+ i_glyph_tmax - p_glyph->top + 3 + yoffset ) *
+ i_pitch + p_line->p_glyph_pos[ i ].x + p_glyph->left + 3 +
+ i_align_offset +xoffset;
+
+ for( y = 0, i_bitmap_offset = 0; y < p_glyph->bitmap.rows; y++ )
{
- for( x = 0; x < p_glyph->bitmap.width; x++ )
+ for( x = 0; x < p_glyph->bitmap.width; x++, i_bitmap_offset++ )
{
- pixel = ( ( pixel * ( 255 - alpha ) ) >> 8 ) +
- ( 255 * alpha >> 8 );
+ if( p_glyph->bitmap.buffer[i_bitmap_offset] )
+ if( p_dst[i_offset+x] <
+ ((int)p_glyph->bitmap.buffer[i_bitmap_offset]) )
+ p_dst[i_offset+x] =
+ ((int)p_glyph->bitmap.buffer[i_bitmap_offset]);
}
+ i_offset += i_pitch;
}
-#undef alpha
-#undef pixel
}
}
+
}
-/**
- * Draw a string on a RV32 picture
- */
-static void RenderRV32( vout_thread_t *p_vout, picture_t *p_pic,
- const subpicture_t *p_subpic )
+/*****************************************************************************
+ * Render: place string in picture
+ *****************************************************************************
+ * This function merges the previously rendered freetype glyphs into a picture
+ *****************************************************************************/
+static int RenderYUVA( filter_t *p_filter, subpicture_region_t *p_region,
+ line_desc_t *p_line, int i_width, int i_height )
{
- subpicture_sys_t *p_string = p_subpic->p_sys;
- int i_plane, x, y, pen_x, pen_y;
- unsigned int i;
- line_desc_t *p_line;
-
- i_plane = 0;
+ uint8_t *p_dst_y,*p_dst_u,*p_dst_v,*p_dst_a;
+ 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;
+
+ /* Create a new subpicture region */
+ memset( &fmt, 0, sizeof(video_format_t) );
+ fmt.i_chroma = VLC_FOURCC('Y','U','V','A');
+ fmt.i_aspect = 0;
+ fmt.i_width = fmt.i_visible_width = i_width + 6;
+ fmt.i_height = fmt.i_visible_height = i_height + 6;
+ 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;
+ }
- for( p_line = p_subpic->p_sys->p_lines; p_line != NULL; p_line = p_line->p_next )
+ p_region->fmt = p_region_tmp->fmt;
+ p_region->picture = p_region_tmp->picture;
+ free( p_region_tmp );
+
+ /* 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);
+ 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;
+
+ /* Initialize the region pixels */
+ if( p_filter->p_sys->i_effect != EFFECT_BACKGROUND )
+ {
+ memset( p_dst_y, 0x00, i_pitch * p_region->fmt.i_height );
+ memset( p_dst_u, 0x80, i_pitch * p_region->fmt.i_height );
+ memset( p_dst_v, 0x80, i_pitch * p_region->fmt.i_height );
+ memset( p_dst_a, 0, i_pitch * p_region->fmt.i_height );
+ }
+ else
+ {
+ memset( p_dst_y, 0x0, i_pitch * p_region->fmt.i_height );
+ memset( p_dst_u, 0x80, i_pitch * p_region->fmt.i_height );
+ memset( p_dst_v, 0x80, i_pitch * p_region->fmt.i_height );
+ memset( p_dst_a, 0x80, i_pitch * p_region->fmt.i_height );
+ }
+ if( p_filter->p_sys->i_effect == EFFECT_OUTLINE ||
+ p_filter->p_sys->i_effect == EFFECT_OUTLINE_FAT )
{
- uint8_t *p_in;
- int i_pic_pitch = p_pic->p[ i_plane ].i_pitch;
- int i_pic_width = p_pic->p[ i_plane ].i_visible_pitch;
+ DrawBlack( p_line, i_width, p_region, 0, 0);
+ DrawBlack( p_line, i_width, p_region, -1, 0);
+ DrawBlack( p_line, i_width, p_region, 0, -1);
+ DrawBlack( p_line, i_width, p_region, 1, 0);
+ DrawBlack( p_line, i_width, p_region, 0, 1);
+ }
- p_in = p_pic->p[ i_plane ].p_pixels;
+ if( p_filter->p_sys->i_effect == EFFECT_OUTLINE_FAT )
+ {
+ DrawBlack( p_line, i_width, p_region, -1, -1);
+ DrawBlack( p_line, i_width, p_region, -1, 1);
+ DrawBlack( p_line, i_width, p_region, 1, -1);
+ DrawBlack( p_line, i_width, p_region, 1, 1);
+
+ DrawBlack( p_line, i_width, p_region, -2, 0);
+ DrawBlack( p_line, i_width, p_region, 0, -2);
+ DrawBlack( p_line, i_width, p_region, 2, 0);
+ DrawBlack( p_line, i_width, p_region, 0, 2);
+
+ DrawBlack( p_line, i_width, p_region, -2, -2);
+ DrawBlack( p_line, i_width, p_region, -2, 2);
+ DrawBlack( p_line, i_width, p_region, 2, -2);
+ DrawBlack( p_line, i_width, p_region, 2, 2);
+
+ DrawBlack( p_line, i_width, p_region, -3, 0);
+ DrawBlack( p_line, i_width, p_region, 0, -3);
+ DrawBlack( p_line, i_width, p_region, 3, 0);
+ DrawBlack( p_line, i_width, p_region, 0, 3);
+ }
- if ( p_string->i_flags & OSD_ALIGN_BOTTOM )
- {
- pen_y = p_pic->p[ i_plane ].i_lines - p_string->i_height -
- p_string->i_y_margin;
- }
- else
- {
- pen_y = p_string->i_y_margin;
- }
- pen_y += p_vout->p_text_renderer_data->p_face->size->metrics.ascender >> 6;
- if ( p_string->i_flags & OSD_ALIGN_RIGHT )
- {
- pen_x = i_pic_width - p_line->i_width
- - p_string->i_x_margin;
- }
- else if ( p_string->i_flags & OSD_ALIGN_LEFT )
+ for( ; p_line != NULL; p_line = p_line->p_next )
+ {
+ int i_glyph_tmax = 0;
+ int i_bitmap_offset, i_offset, i_align_offset = 0;
+ for( i = 0; p_line->pp_glyphs[i] != NULL; i++ )
{
- pen_x = p_string->i_x_margin;
+ FT_BitmapGlyph p_glyph = p_line->pp_glyphs[ i ];
+ i_glyph_tmax = __MAX( i_glyph_tmax, p_glyph->top );
}
- else
+
+ if( p_line->i_width < i_width )
{
- pen_x = i_pic_width / 2 / 4 - p_line->i_width / 2
- + p_string->i_x_margin;
+ 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 ) )
+ {
+ 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 ) )
+ {
+ i_align_offset = ( i_width - p_line->i_width ) / 2;
+ }
}
for( i = 0; p_line->pp_glyphs[i] != NULL; i++ )
{
FT_BitmapGlyph p_glyph = p_line->pp_glyphs[ i ];
-#define alpha p_vout->p_text_renderer_data->pi_gamma[ p_glyph->bitmap.buffer[ x + y * p_glyph->bitmap.width ] ]
-#define pixel( c ) p_in[ ( p_line->p_glyph_pos[ i ].y + pen_y + y - p_glyph->top ) * i_pic_pitch + ( x + pen_x + p_line->p_glyph_pos[ i ].x + p_glyph->left ) * 4 + c ]
- for(y = 0; y < p_glyph->bitmap.rows; y++ )
+
+ i_offset = ( p_line->p_glyph_pos[ i ].y +
+ i_glyph_tmax - p_glyph->top + 3 ) *
+ i_pitch + p_line->p_glyph_pos[ i ].x + p_glyph->left + 3 +
+ i_align_offset;
+
+ if( p_line->b_new_color_mode )
{
- for( x = 0; x < p_glyph->bitmap.width; x++ )
- {
- pen_y--;
- pixel( 0 ) = ( ( pixel( 0 ) * ( 255 - alpha ) ) >> 8 );
- pixel( 1 ) = ( ( pixel( 1 ) * ( 255 - alpha ) ) >> 8 );
- pixel( 2 ) = ( ( pixel( 2 ) * ( 255 - alpha ) ) >> 8 );
- pen_y++; pen_x--;
- pixel( 0 ) = ( ( pixel( 0 ) * ( 255 - alpha ) ) >> 8 );
- pixel( 1 ) = ( ( pixel( 1 ) * ( 255 - alpha ) ) >> 8 );
- pixel( 2 ) = ( ( pixel( 2 ) * ( 255 - alpha ) ) >> 8 );
- pen_x += 2;
- pixel( 0 ) = ( ( pixel( 0 ) * ( 255 - alpha ) ) >> 8 );
- pixel( 1 ) = ( ( pixel( 1 ) * ( 255 - alpha ) ) >> 8 );
- pixel( 2 ) = ( ( pixel( 2 ) * ( 255 - alpha ) ) >> 8 );
- pen_y++; pen_x--;
- pixel( 0 ) = ( ( pixel( 0 ) * ( 255 - alpha ) ) >> 8 );
- pixel( 1 ) = ( ( pixel( 1 ) * ( 255 - alpha ) ) >> 8 );
- pixel( 2 ) = ( ( pixel( 2 ) * ( 255 - alpha ) ) >> 8 );
- pen_y--;
- }
+ /* 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);
}
- for(y = 0; y < p_glyph->bitmap.rows; y++ )
+
+ for( y = 0, i_bitmap_offset = 0; y < p_glyph->bitmap.rows; y++ )
{
- for( x = 0; x < p_glyph->bitmap.width; x++ )
+ for( x = 0; x < p_glyph->bitmap.width; x++, i_bitmap_offset++ )
{
- pixel( 0 ) = ( ( pixel( 0 ) * ( 255 - alpha ) ) >> 8 ) +
- ( 255 * alpha >> 8 );
- pixel( 1 ) = ( ( pixel( 1 ) * ( 255 - alpha ) ) >> 8 ) +
- ( 255 * alpha >> 8 );
- pixel( 2 ) = ( ( pixel( 2 ) * ( 255 - alpha ) ) >> 8 ) +
- ( 255 * alpha >> 8 );
+ 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])) +
+ i_y * ((int)p_glyph->bitmap.buffer[i_bitmap_offset])) >> 8;
+
+ p_dst_u[i_offset+x] = i_u;
+ p_dst_v[i_offset+x] = i_v;
+
+ if( p_filter->p_sys->i_effect == EFFECT_BACKGROUND )
+ p_dst_a[i_offset+x] = 0xff;
+ }
}
+ i_offset += i_pitch;
+ }
+
+ if( p_line->pi_underline_thickness[ i ] )
+ {
+ UnderlineGlyphYUVA( p_line->pi_underline_thickness[ i ],
+ p_line->pi_underline_offset[ i ],
+ (p_line->pp_glyphs[i+1] && (p_line->pi_underline_thickness[ i + 1] > 0)),
+ 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,
+ p_region);
}
-#undef alpha
-#undef pixel
}
}
+
+ /* Apply the alpha setting */
+ for( i = 0; i < (int)fmt.i_height * i_pitch; i++ )
+ p_dst_a[i] = p_dst_a[i] * (255 - i_alpha) / 255;
+
+ return VLC_SUCCESS;
}
/**
- * This function receives a string and creates a subpicture for it. It
- * also calculates the size needed for this string, and renders the
+ * This function renders a text subpicture region into another one.
+ * It also calculates the size needed for this string, and renders the
* needed glyphs into memory. It is used as pf_add_string callback in
* the vout method by this module
*/
-static subpicture_t *AddText ( vout_thread_t *p_vout, char *psz_string,
- text_style_t *p_style, int i_flags, int i_hmargin,
- int i_vmargin, mtime_t i_start, mtime_t i_stop )
+static int RenderText( filter_t *p_filter, subpicture_region_t *p_region_out,
+ subpicture_region_t *p_region_in )
{
- subpicture_sys_t *p_string;
+ filter_sys_t *p_sys = p_filter->p_sys;
+ line_desc_t *p_lines = 0, *p_line = 0, *p_next = 0, *p_prev = 0;
int i, i_pen_y, i_pen_x, i_error, i_glyph_index, i_previous;
- subpicture_t *p_subpic;
- line_desc_t *p_line, *p_next;
- uint32_t *p_unicode_string, i_char;
+ uint32_t *psz_unicode, *psz_unicode_orig = 0, i_char, *psz_line_start;
int i_string_length;
- iconv_t iconv_handle;
+ 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;
FT_BBox line;
FT_BBox glyph_size;
FT_Glyph tmp_glyph;
/* Sanity check */
- if ( !psz_string || !*psz_string )
- {
- return NULL;
- }
-
- result.x = 0;
- result.y = 0;
- line.xMin = 0;
- line.xMax = 0;
- line.yMin = 0;
- line.yMax = 0;
-
- p_line = 0;
- p_string = 0;
- p_subpic = 0;
+ 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;
- /* Create and initialize a subpicture */
- p_subpic = vout_CreateSubPicture( p_vout, MEMORY_SUBPICTURE );
- if ( p_subpic == NULL )
+ if( p_region_in->p_style )
{
- return NULL;
- }
- p_subpic->p_sys = 0;
- p_subpic->pf_render = Render;
- p_subpic->pf_destroy = FreeString;
- p_subpic->i_start = i_start;
- p_subpic->i_stop = i_stop;
- if( i_stop == 0 )
- {
- p_subpic->b_ephemer = VLC_TRUE;
+ 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 );
}
else
{
- p_subpic->b_ephemer = VLC_FALSE;
+ 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;
}
- /* Create and initialize private data for the subpicture */
- p_string = malloc( sizeof(subpicture_sys_t) );
- if ( p_string == NULL )
- {
- msg_Err( p_vout, "Out of memory" );
- goto error;
- }
- p_subpic->p_sys = p_string;
- p_string->i_flags = i_flags;
- p_string->i_x_margin = i_hmargin;
- p_string->i_y_margin = i_vmargin;
- p_string->p_lines = 0;
- p_string->psz_text = strdup( psz_string );
+ if( i_font_color == 0xFFFFFF ) i_font_color = p_sys->i_font_color;
+ if( !i_font_alpha ) i_font_alpha = 255 - p_sys->i_font_opacity;
+ SetFontSize( p_filter, i_font_size );
+
+ i_red = ( i_font_color & 0x00FF0000 ) >> 16;
+ i_green = ( i_font_color & 0x0000FF00 ) >> 8;
+ i_blue = i_font_color & 0x000000FF;
+
+ result.x = result.y = 0;
+ line.xMin = line.xMax = line.yMin = line.yMax = 0;
-#if defined(HAVE_ICONV)
- p_unicode_string = malloc( ( strlen(psz_string) + 1 ) * sizeof(uint32_t) );
- if( p_unicode_string == NULL )
+ psz_unicode = psz_unicode_orig =
+ malloc( ( strlen(psz_string) + 1 ) * sizeof(uint32_t) );
+ if( psz_unicode == NULL )
{
- msg_Err( p_vout, "Out of memory" );
+ msg_Err( p_filter, "out of memory" );
goto error;
}
#if defined(WORDS_BIGENDIAN)
- iconv_handle = iconv_open( "UCS-4BE", "UTF-8" );
+ iconv_handle = vlc_iconv_open( "UCS-4BE", "UTF-8" );
#else
- iconv_handle = iconv_open( "UCS-4LE", "UTF-8" );
+ iconv_handle = vlc_iconv_open( "UCS-4LE", "UTF-8" );
#endif
- if( iconv_handle == (iconv_t)-1 )
+ if( iconv_handle == (vlc_iconv_t)-1 )
{
- msg_Warn( p_vout, "Unable to do convertion" );
+ msg_Warn( p_filter, "unable to do conversion" );
goto error;
}
{
- char *p_in_buffer, *p_out_buffer;
+ char *p_out_buffer;
+ const char *p_in_buffer = psz_string;
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 *)p_unicode_string;
- i_ret = iconv( iconv_handle, &p_in_buffer, &i_in_bytes, &p_out_buffer, &i_out_bytes_left );
+ 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 );
+
+ vlc_iconv_close( iconv_handle );
+
if( i_in_bytes )
{
- msg_Warn( p_vout, "Failed to convert string to unicode (%s), bytes left %d", strerror(errno), i_in_bytes );
+ msg_Warn( p_filter, "failed to convert string to unicode (%s), "
+ "bytes left %d", strerror(errno), (int)i_in_bytes );
goto error;
}
*(uint32_t*)p_out_buffer = 0;
- i_string_length = ( i_out_bytes - i_out_bytes_left ) / sizeof(uint32_t);
+ i_string_length = (i_out_bytes - i_out_bytes_left) / sizeof(uint32_t);
}
#if defined(HAVE_FRIBIDI)
{
uint32_t *p_fribidi_string;
- FriBidiCharType base_dir = FRIBIDI_TYPE_ON;
- p_fribidi_string = malloc( ( i_string_length + 1 ) * sizeof(uint32_t) );
- fribidi_log2vis( (FriBidiChar*)p_unicode_string, i_string_length,
- &base_dir, (FriBidiChar*)p_fribidi_string, NULL, NULL,
- NULL );
- free( p_unicode_string );
- p_unicode_string = p_fribidi_string;
+ int start_pos, pos = 0;
+
+ p_fribidi_string = malloc( (i_string_length + 1) * sizeof(uint32_t) );
+
+ /* Do bidi conversion line-by-line */
+ while(pos < i_string_length)
+ {
+ while(pos < i_string_length) {
+ i_char = psz_unicode[pos];
+ if (i_char != '\r' && i_char != '\n')
+ break;
+ p_fribidi_string[pos] = i_char;
+ ++pos;
+ }
+ start_pos = pos;
+ while(pos < i_string_length) {
+ i_char = psz_unicode[pos];
+ if (i_char == '\r' || i_char == '\n')
+ break;
+ ++pos;
+ }
+ 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);
+ }
+ }
+
+ free( psz_unicode_orig );
+ psz_unicode = psz_unicode_orig = p_fribidi_string;
p_fribidi_string[ i_string_length ] = 0;
}
-#endif
#endif
/* Calculate relative glyph positions and a bounding box for the
* entire string */
- p_line = NewLine( psz_string );
- if( p_line == NULL )
+ if( !(p_line = NewLine( (byte_t *)psz_string )) )
{
- msg_Err( p_vout, "Out of memory" );
+ msg_Err( p_filter, "out of memory" );
goto error;
}
- p_string->p_lines = p_line;
- i_pen_x = 0;
- i_pen_y = 0;
- i_previous = 0;
- i = 0;
+ p_lines = p_line;
+ i_pen_x = i_pen_y = 0;
+ i_previous = i = 0;
+ psz_line_start = psz_unicode;
-#define face p_vout->p_text_renderer_data->p_face
+#define face p_sys->p_face
#define glyph face->glyph
- while( *p_unicode_string )
+ while( *psz_unicode )
{
- i_char = *p_unicode_string++;
- if ( i_char == '\r' ) /* ignore CR chars wherever they may be */
+ i_char = *psz_unicode++;
+ if( i_char == '\r' ) /* ignore CR chars wherever they may be */
{
continue;
}
- if ( i_char == '\n' )
+ if( i_char == '\n' )
{
- p_next = NewLine( psz_string );
- if( p_next == NULL )
+ psz_line_start = psz_unicode;
+ if( !(p_next = NewLine( (byte_t *)psz_string )) )
{
- msg_Err( p_vout, "Out of memory" );
+ msg_Err( p_filter, "out of memory" );
goto error;
}
p_line->p_next = p_next;
p_line->i_width = line.xMax;
p_line->i_height = face->size->metrics.height >> 6;
p_line->pp_glyphs[ i ] = NULL;
+ p_line->i_alpha = i_font_alpha;
+ p_line->i_red = i_red;
+ p_line->i_green = i_green;
+ p_line->i_blue = i_blue;
+ p_prev = p_line;
p_line = p_next;
result.x = __MAX( result.x, line.xMax );
result.y += face->size->metrics.height >> 6;
i_pen_x = 0;
- line.xMin = 0;
- line.xMax = 0;
- line.yMin = 0;
- line.yMax = 0;
+ i_previous = i = 0;
+ line.xMin = line.xMax = line.yMin = line.yMax = 0;
i_pen_y += face->size->metrics.height >> 6;
- msg_Dbg( p_vout, "Creating new line, i is %d", i );
- i = 0;
+#if 0
+ msg_Dbg( p_filter, "Creating new line, i is %d", i );
+#endif
continue;
}
i_glyph_index = FT_Get_Char_Index( face, i_char );
- if ( p_vout->p_text_renderer_data->i_use_kerning && i_glyph_index
+ if( p_sys->i_use_kerning && i_glyph_index
&& i_previous )
{
FT_Vector delta;
p_line->p_glyph_pos[ i ].x = i_pen_x;
p_line->p_glyph_pos[ i ].y = i_pen_y;
i_error = FT_Load_Glyph( face, i_glyph_index, FT_LOAD_DEFAULT );
- if ( i_error )
+ if( i_error )
{
- msg_Err( p_vout, "FT_Load_Glyph returned %d", i_error );
+ msg_Err( p_filter, "unable to render text FT_Load_Glyph returned"
+ " %d", i_error );
goto error;
}
i_error = FT_Get_Glyph( glyph, &tmp_glyph );
- if ( i_error )
+ if( i_error )
{
- msg_Err( p_vout, "FT_Get_Glyph returned %d", i_error );
+ msg_Err( p_filter, "unable to render text FT_Get_Glyph returned "
+ "%d", i_error );
goto error;
}
FT_Glyph_Get_CBox( tmp_glyph, ft_glyph_bbox_pixels, &glyph_size );
- i_error = FT_Glyph_To_Bitmap( &tmp_glyph, ft_render_mode_normal,
- NULL, 1 );
- if ( i_error ) continue;
+ i_error = FT_Glyph_To_Bitmap( &tmp_glyph, ft_render_mode_normal, 0, 1);
+ if( i_error )
+ {
+ FT_Done_Glyph( tmp_glyph );
+ continue;
+ }
p_line->pp_glyphs[ i ] = (FT_BitmapGlyph)tmp_glyph;
/* Do rest */
- line.xMax = p_line->p_glyph_pos[i].x + glyph_size.xMax - glyph_size.xMin;
+ line.xMax = p_line->p_glyph_pos[i].x + glyph_size.xMax -
+ glyph_size.xMin + ((FT_BitmapGlyph)tmp_glyph)->left;
+ if( line.xMax > (int)p_filter->fmt_out.video.i_visible_width - 20 )
+ {
+ p_line->pp_glyphs[ i ] = NULL;
+ FreeLine( p_line );
+ p_line = NewLine( (byte_t *)psz_string );
+ if( p_prev ) p_prev->p_next = p_line;
+ else p_lines = p_line;
+
+ while( psz_unicode > psz_line_start && *psz_unicode != ' ' )
+ {
+ psz_unicode--;
+ }
+ if( psz_unicode == psz_line_start )
+ {
+ msg_Warn( p_filter, "unbreakable string" );
+ goto error;
+ }
+ else
+ {
+ *psz_unicode = '\n';
+ }
+ psz_unicode = psz_line_start;
+ i_pen_x = 0;
+ i_previous = i = 0;
+ line.xMin = line.xMax = line.yMin = line.yMax = 0;
+ continue;
+ }
line.yMax = __MAX( line.yMax, glyph_size.yMax );
line.yMin = __MIN( line.yMin, glyph_size.yMin );
i_pen_x += glyph->advance.x >> 6;
i++;
}
+
p_line->i_width = line.xMax;
p_line->i_height = face->size->metrics.height >> 6;
p_line->pp_glyphs[ i ] = NULL;
+ p_line->i_alpha = i_font_alpha;
+ p_line->i_red = i_red;
+ p_line->i_green = i_green;
+ p_line->i_blue = i_blue;
result.x = __MAX( result.x, line.xMax );
result.y += line.yMax - line.yMin;
- p_string->i_height = result.y;
- p_string->i_width = result.x;
- vout_DisplaySubPicture( p_vout, p_subpic );
- return p_subpic;
#undef face
#undef glyph
+ 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( psz_unicode_orig ) free( psz_unicode_orig );
+ FreeLines( p_lines );
+ return VLC_SUCCESS;
+
error:
- FreeString( p_subpic );
- vout_DestroySubPicture( p_vout, p_subpic );
- return NULL;
+ if( psz_unicode_orig ) free( psz_unicode_orig );
+ FreeLines( p_lines );
+ return VLC_EGENERIC;
}
-static void FreeString( subpicture_t *p_subpic )
+#ifdef HAVE_FONTCONFIG
+static int PushFont( font_stack_t **p_font, char *psz_name, int i_size,
+ int i_color, int i_alpha )
{
- unsigned int i;
- subpicture_sys_t *p_string = p_subpic->p_sys;
- line_desc_t *p_line, *p_next;
+ 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;
- if( p_subpic->p_sys == NULL ) return;
+ p_new->i_size = i_size;
+ p_new->i_color = i_color;
+ p_new->i_alpha = i_alpha;
- for( p_line = p_string->p_lines; p_line != NULL; p_line = p_next )
+ if( !*p_font )
{
- p_next = p_line->p_next;
- for( i = 0; p_line->pp_glyphs[ i ] != NULL; i++ )
+ *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 uint32_t *IconvText( filter_t *p_filter, char *psz_string )
+{
+ 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 )
+ {
+ msg_Err( p_filter, "out of memory" );
+ return NULL;;
+ }
+#if defined(WORDS_BIGENDIAN)
+ iconv_handle = vlc_iconv_open( "UCS-4BE", "UTF-8" );
+#else
+ 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;;
+ }
+
+ {
+ 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 );
+
+ vlc_iconv_close( iconv_handle );
+
+ if( i_in_bytes )
{
- FT_Done_Glyph( (FT_Glyph)p_line->pp_glyphs[ i ] );
+ 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;;
}
- free( p_line->pp_glyphs );
- free( p_line->p_glyph_pos );
- free( p_line );
+ *(uint32_t*)p_out_buffer = 0;
+ i_string_length = (i_out_bytes - i_out_bytes_left) / sizeof(uint32_t);
}
- free( p_string->psz_text );
- free( p_string );
+#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;
}
-#if !defined( HAVE_ICONV )
-/* convert one or more utf8 bytes into a unicode character */
-static int GetUnicodeCharFromUTF8( byte_t **ppsz_utf8_string )
+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,
+ int *pi_pen_x, int i_pen_y, int *pi_start,
+ FT_Vector *p_result )
{
- int i_remaining_bytes, i_char = 0;
- if( ( **ppsz_utf8_string & 0xFC ) == 0xFC )
+ FT_BBox line;
+ int i_yMin, i_yMax;
+ int i;
+
+ int i_previous = 0;
+ int i_pen_x_start = *pi_pen_x;
+
+ uint32_t *psz_unicode_start = psz_unicode;
+
+ line.xMin = line.xMax = line.yMin = line.yMax = 0;
+
+ /* Account for part of line already in position */
+ for( i=0; i<*pi_start; i++ )
{
- i_char = **ppsz_utf8_string & 1;
- i_remaining_bytes = 5;
+ FT_BBox glyph_size;
+
+ FT_Glyph_Get_CBox( 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 );
+ line.yMin = __MIN( line.yMin, glyph_size.yMin );
}
- else if( ( **ppsz_utf8_string & 0xF8 ) == 0xF8 )
+ i_yMin = line.yMin;
+ i_yMax = line.yMax;
+
+ while( *psz_unicode && ( *psz_unicode != 0xffff ) )
{
- i_char = **ppsz_utf8_string & 3;
- i_remaining_bytes = 4;
+ FT_BBox glyph_size;
+ FT_Glyph tmp_glyph;
+ int i_error;
+
+ int i_glyph_index = FT_Get_Char_Index( p_face, *psz_unicode++ );
+ if( FT_HAS_KERNING( p_face ) && i_glyph_index
+ && i_previous )
+ {
+ FT_Vector delta;
+ FT_Get_Kerning( p_face, i_previous, i_glyph_index,
+ ft_kerning_default, &delta );
+ *pi_pen_x += delta.x >> 6;
+ }
+ p_line->p_glyph_pos[ i ].x = *pi_pen_x;
+ p_line->p_glyph_pos[ i ].y = i_pen_y;
+
+ 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 );
+ 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 );
+ p_line->pp_glyphs[ i ] = NULL;
+ return VLC_EGENERIC;
+ }
+ FT_Glyph_Get_CBox( tmp_glyph, ft_glyph_bbox_pixels, &glyph_size );
+ i_error = FT_Glyph_To_Bitmap( &tmp_glyph, FT_RENDER_MODE_NORMAL, 0, 1);
+ if( i_error )
+ {
+ FT_Done_Glyph( tmp_glyph );
+ continue;
+ }
+ 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;
+ }
+ p_line->pp_glyphs[ i ] = (FT_BitmapGlyph)tmp_glyph;
+ p_line->p_rgb[ i ] = i_font_color & 0x00ffffff;
+
+ line.xMax = p_line->p_glyph_pos[i].x + glyph_size.xMax -
+ 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 )
+ {
+ FT_Done_Glyph( (FT_Glyph)p_line->pp_glyphs[ i ] );
+ }
+
+ while( psz_unicode > psz_unicode_start && *psz_unicode != ' ' )
+ {
+ psz_unicode--;
+ }
+ if( psz_unicode == psz_unicode_start )
+ {
+ msg_Warn( p_filter, "unbreakable string" );
+ p_line->pp_glyphs[ i ] = NULL;
+ return VLC_EGENERIC;
+ }
+ else
+ {
+ *psz_unicode = 0xffff;
+ }
+ psz_unicode = psz_unicode_start;
+ *pi_pen_x = i_pen_x_start;
+ i_previous = 0;
+
+ line.yMax = i_yMax;
+ line.yMin = i_yMin;
+
+ continue;
+ }
+ line.yMax = __MAX( line.yMax, glyph_size.yMax );
+ line.yMin = __MIN( line.yMin, glyph_size.yMin );
+
+ i_previous = i_glyph_index;
+ *pi_pen_x += p_face->glyph->advance.x >> 6;
+ i++;
}
- else if( ( **ppsz_utf8_string & 0xF0 ) == 0xF0 )
+ 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;
+
+ 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 ) );
+
+ *pi_start = i;
+
+ /* Get rid of any text processed - if necessary repositioning
+ * at the start of a new line of text
+ */
+ if( !*psz_unicode )
{
- i_char = **ppsz_utf8_string & 7;
- i_remaining_bytes = 3;
+ *psz_unicode_start = '\0';
}
- else if( ( **ppsz_utf8_string & 0xE0 ) == 0xE0 )
+ else
{
- i_char = **ppsz_utf8_string & 15;
- i_remaining_bytes = 2;
+ psz_unicode++;
+ for( i=0; psz_unicode[ i ]; i++ )
+ psz_unicode_start[ i ] = psz_unicode[ i ];
+ psz_unicode_start[ i ] = '\0';
}
- else if( ( **ppsz_utf8_string & 0xC0 ) == 0xC0 )
+
+ 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 )
+{
+ filter_sys_t *p_sys = p_filter->p_sys;
+
+ FT_Vector tmp_result;
+
+ 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;
+
+ line_desc_t *p_line = NULL;
+ line_desc_t *p_prev = NULL;
+
+ char *psz_node = NULL;
+
+ int i_pen_x = 0;
+ int i_pen_y = 0;
+ int i_posn = 0;
+
+ int rv = VLC_SUCCESS;
+
+ p_result->x = p_result->y = 0;
+ tmp_result.x = tmp_result.y = 0;
+
+ if( p_font_style )
{
- i_char = **ppsz_utf8_string & 31;
- i_remaining_bytes = 1;
+ 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
{
- i_char = **ppsz_utf8_string;
- i_remaining_bytes = 0;
+ PushFont( &p_fonts, FC_DEFAULT_FONT, 24, 0xffffff, 0 );
+ }
+
+ while ( ( xml_ReaderRead( p_xml_reader ) == 1 ) && ( rv == VLC_SUCCESS ) )
+ {
+ 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 ) )
+ {
+ 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 );
+ }
+ break;
+ case XML_READER_TEXT:
+ psz_node = xml_ReaderValue( p_xml_reader );
+ if( psz_node )
+ {
+ char *psz_fontname = NULL;
+ int i_font_color = 0xffffff;
+ int i_font_alpha = 0;
+ int i_font_size = 24;
+ FT_Face p_face = NULL;
+
+ if( VLC_SUCCESS == PeekFont( &p_fonts, &psz_fontname, &i_font_size, &i_font_color, &i_font_alpha ) )
+ {
+ 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 );
+ }
+ }
+
+ 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 ) );
+
+ uint32_t *psz_unicode = IconvText( p_filter, psz_node );
+
+ if( !psz_unicode )
+ {
+ free( psz_node );
+ if( p_face ) FT_Done_Face( p_face );
+ rv = VLC_EGENERIC;
+ break;
+ }
+
+ while( *psz_unicode )
+ {
+ 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;
+ }
+
+ 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 )
+ {
+ 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;
+ }
+ }
+ if( rv != VLC_SUCCESS ) break;
+
+ if( p_face ) FT_Done_Face( p_face );
+ free( psz_unicode );
+ free( psz_node );
+ }
+ break;
+ }
+ }
+ if( p_line )
+ {
+ p_result->x = __MAX( p_result->x, tmp_result.x );
+ p_result->y += tmp_result.y;
+ }
+
+
+ while( VLC_SUCCESS == PopFont( &p_fonts ) );
+
+ return rv;
+}
+
+
+static int RenderHtml( filter_t *p_filter, subpicture_region_t *p_region_out,
+ subpicture_region_t *p_region_in )
+{
+ int rv = VLC_SUCCESS;
+ stream_t *p_sub = NULL;
+ xml_t *p_xml = NULL;
+ xml_reader_t *p_xml_reader = NULL;
+
+ if( !p_region_in || !p_region_in->psz_html )
+ return VLC_EGENERIC;
+
+ p_sub = stream_MemoryNew( VLC_OBJECT(p_filter),
+ p_region_in->psz_html,
+ strlen( p_region_in->psz_html ),
+ VLC_FALSE );
+ if( p_sub )
+ {
+ p_xml = xml_Create( p_filter );
+ if( p_xml )
+ {
+ p_xml_reader = xml_ReaderCreate( p_xml, p_sub );
+ if( p_xml_reader )
+ {
+ 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 )
+ {
+ 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 );
+ }
+ FreeLines( p_lines );
+
+ xml_ReaderDelete( p_xml, p_xml_reader );
+ }
+ xml_Delete( p_xml );
+ }
+ 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 )
+{
+ 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 );
+
+ 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 ) )
+ {
+ FcPatternDestroy( p_pat );
+ return NULL;
+ }
+ if( FcResultMatch != FcPatternGetInteger( p_pat, FC_INDEX, 0, i_idx ) )
+ {
+ *i_idx = 0;
}
- while( i_remaining_bytes )
+
+ if( FcResultMatch != FcPatternGetString( p_pat, FC_FAMILY, 0, &val_s ) )
{
- (*ppsz_utf8_string)++;
- i_remaining_bytes--;
- i_char = ( i_char << 6 ) + ( **ppsz_utf8_string & 0x3F );
+ FcPatternDestroy( p_pat );
+ return NULL;
}
- (*ppsz_utf8_string)++;
- return i_char;
+
+ /*
+ if( strcasecmp((const char*)val_s, family ) != 0 )
+ msg_Warn( p_filter, "fontconfig: selected font family is not the requested one: '%s' != '%s'\n",
+ (const char*)val_s, family );
+ */
+
+ if( FcResultMatch != FcPatternGetString( p_pat, FC_FILE, 0, &val_s ) )
+ {
+ FcPatternDestroy( p_pat );
+ return NULL;
+ }
+
+ FcPatternDestroy( p_pat );
+ return strdup( (const char*)val_s );
}
#endif
+static void FreeLine( line_desc_t *p_line )
+{
+ unsigned int i;
+ for( i = 0; p_line->pp_glyphs[ i ] != NULL; i++ )
+ {
+ FT_Done_Glyph( (FT_Glyph)p_line->pp_glyphs[ i ] );
+ }
+ free( p_line->pp_glyphs );
+ free( p_line->p_glyph_pos );
+ free( p_line->p_rgb );
+ free( p_line->pi_underline_offset );
+ free( p_line->pi_underline_thickness );
+ free( p_line );
+}
+
+static void FreeLines( line_desc_t *p_lines )
+{
+ line_desc_t *p_line, *p_next;
+
+ if( !p_lines ) return;
+
+ for( p_line = p_lines; p_line != NULL; p_line = p_next )
+ {
+ p_next = p_line->p_next;
+ FreeLine( p_line );
+ }
+}
+
static line_desc_t *NewLine( byte_t *psz_string )
{
int i_count;
line_desc_t *p_line = malloc( sizeof(line_desc_t) );
- if( !p_line )
- {
- return NULL;
- }
+
+ if( !p_line ) return NULL;
p_line->i_height = 0;
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( psz_string );
-
- p_line->pp_glyphs = malloc( sizeof(FT_BitmapGlyph)
- * ( i_count + 1 ) );
- if( p_line->pp_glyphs == NULL )
+ 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 ) );
+ if( ( p_line->pp_glyphs == NULL ) ||
+ ( p_line->p_glyph_pos == NULL ) ||
+ ( p_line->p_rgb == 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 );
return NULL;
}
- p_line->p_glyph_pos = malloc( sizeof( FT_Vector )
- * i_count + 1 );
- if( p_line->p_glyph_pos == NULL )
+ p_line->pp_glyphs[0] = NULL;
+ p_line->b_new_color_mode = VLC_FALSE;
+
+ return p_line;
+}
+
+static int SetFontSize( filter_t *p_filter, int i_size )
+{
+ filter_sys_t *p_sys = p_filter->p_sys;
+
+ if( i_size && i_size == p_sys->i_font_size ) return VLC_SUCCESS;
+
+ if( !i_size )
{
- free( p_line->pp_glyphs );
- free( p_line );
- return NULL;
+ 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;
+ }
+ else
+ {
+ 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" );
+ i_size = 12;
+ }
+
+ msg_Dbg( p_filter, "using fontsize: %i", i_size );
}
- return p_line;
+ p_sys->i_font_size = i_size;
+
+ if( FT_Set_Pixel_Sizes( p_sys->p_face, 0, i_size ) )
+ {
+ msg_Err( p_filter, "couldn't set font size to %d", i_size );
+ return VLC_EGENERIC;
+ }
+
+ return VLC_SUCCESS;
}
projects / vlc / blobdiff