X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fmisc%2Ffreetype.c;h=0acceb60950a5310780519a05cc6d5df750abbd9;hb=c6b73779878a2e152a40e644bb2029c2c3f41056;hp=1a2078307d4b9a4dd6f4336ffe285f069905319d;hpb=11e8ae92009d27accae414feeb8f30c6822b0955;p=vlc diff --git a/modules/misc/freetype.c b/modules/misc/freetype.c index 1a2078307d..0acceb6095 100644 --- a/modules/misc/freetype.c +++ b/modules/misc/freetype.c @@ -5,6 +5,7 @@ * $Id$ * * Authors: Sigmund Augdal + * Gildas Bazin * * 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 @@ -33,7 +34,10 @@ #include #include -#include +#include "osd.h" +#include "vlc_block.h" +#include "vlc_filter.h" + #include #ifdef HAVE_ERRNO_H @@ -54,9 +58,6 @@ #define DEFAULT_FONT "/usr/share/fonts/truetype/freefont/FreeSerifBold.ttf" #endif -#if defined(HAVE_ICONV) -#include -#endif #if defined(HAVE_FRIBIDI) #include #endif @@ -66,26 +67,10 @@ 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 *, int, 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 ** ); -#endif +static int Create ( vlc_object_t * ); +static void Destroy( vlc_object_t * ); +static subpicture_t *RenderText( filter_t *, block_t * ); static line_desc_t *NewLine( byte_t * ); /***************************************************************************** @@ -123,17 +108,15 @@ vlc_module_end(); /** * Private data in a subpicture. Describes a string. */ -struct subpicture_sys_t +typedef struct subpicture_data_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; -}; + +} subpicture_data_t; struct line_desc_t { @@ -146,17 +129,19 @@ struct line_desc_t line_desc_t *p_next; }; +static void Render ( filter_t *, subpicture_t *, subpicture_data_t * ); +static void FreeString( subpicture_data_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]; }; @@ -166,39 +151,39 @@ struct text_renderer_sys_t ***************************************************************************** * 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; + filter_t *p_filter = (filter_t *)p_this; + filter_sys_t *p_sys; + char *psz_fontfile = NULL; int i, i_error; int i_fontsize = 0; - double gamma_inv = 1.0f / gamma_value; 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_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; } + p_sys->p_face = 0; + p_sys->p_library = 0; - 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 ); + for( i = 0; i < 256; i++ ) + { + p_sys->pi_gamma[i] = (uint8_t)( pow( (double)i * 255.0f, 0.5f ) ); } - var_Create( p_vout, "freetype-font", VLC_VAR_STRING | VLC_VAR_DOINHERIT ); - var_Create( p_vout, "freetype-fontsize", + 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 ); /* 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 ); @@ -209,78 +194,75 @@ static int Create( vlc_object_t *p_this ) #elif SYS_DARWIN 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 ); + 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); - - var_Get( p_vout, "freetype-fontsize", &val ); + p_sys->i_use_kerning = FT_HAS_KERNING( p_sys->p_face ); + var_Get( p_filter, "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; + var_Get( p_filter, "freetype-rel-fontsize", &val ); + i_fontsize = (int)p_filter->fmt_out.video.i_height / val.i_int; } - msg_Dbg( p_vout, "Using fontsize: %i", i_fontsize); + if( i_fontsize <= 0 ) + { + msg_Warn( p_filter, "Invalid fontsize, using 12" ); + i_fontsize = 12; + } + msg_Dbg( p_filter, "Using fontsize: %i", i_fontsize); - i_error = FT_Set_Pixel_Sizes( p_vout->p_text_renderer_data->p_face, 0, - i_fontsize ); + i_error = FT_Set_Pixel_Sizes( p_sys->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; + msg_Err( p_filter, "couldn't set font size to %d", i_fontsize ); + goto error; } - p_vout->pf_add_string = AddText; + + if( psz_fontfile ) free( psz_fontfile ); + p_filter->pf_render_string = RenderText; + p_filter->p_sys = p_sys; 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; } /***************************************************************************** @@ -290,10 +272,11 @@ static int Create( vlc_object_t *p_this ) *****************************************************************************/ 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; + FT_Done_Face( p_sys->p_face ); + FT_Done_FreeType( p_sys->p_library ); + free( p_sys ); } /***************************************************************************** @@ -301,362 +284,101 @@ static void Destroy( vlc_object_t *p_this ) ***************************************************************************** * 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 ) -{ - 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; - } -} - -/** - * 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; - - for( p_line = p_subpic->p_sys->p_lines; p_line != NULL; - p_line = p_line->p_next ) - { - for( i_plane = 0; i_plane < p_pic->i_planes; i_plane++ ) - { - uint8_t *p_in = p_pic->p[ i_plane ].p_pixels; - int i_pic_pitch = p_pic->p[ i_plane ].i_pitch; - int i_pic_width = p_pic->p[ i_plane ].i_visible_pitch; - - if( i_plane == 0 ) - { - 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 ) - { - pen_x = p_string->i_x_margin; - } - else - { - pen_x = i_pic_width / 2 - p_line->i_width / 2 - + p_string->i_x_margin; - } - - for( i = 0; p_line->pp_glyphs[i] != NULL; i++ ) - { - FT_BitmapGlyph p_glyph = p_line->pp_glyphs[ i ]; - int i_alpha_offset = -1; - int i_offset = ( p_line->p_glyph_pos[ i ].y + pen_y - - p_glyph->top ) * i_pic_pitch + - p_line->p_glyph_pos[ i ].x + p_glyph->left; - -#define alpha p_vout->p_text_renderer_data->pi_gamma[ p_glyph->bitmap.buffer[ i_alpha_offset ] ] -#define pixel p_in[ i_offset + x + pen_x ] - - for( y = 0; y < p_glyph->bitmap.rows; y++ ) - { - for( x = 0; x < p_glyph->bitmap.width; x++ ) - { - i_alpha_offset++; - if( alpha == 0 ) continue; - - pen_y--; i_offset -= i_pic_pitch; - pixel = ( ( pixel * ( 255 - alpha ) ) >> 8 ); - pen_y++; i_offset += i_pic_pitch; pen_x--; - pixel = ( ( pixel * ( 255 - alpha ) ) >> 8 ); - pen_x += 2; - pixel = ( ( pixel * ( 255 - alpha ) ) >> 8 ); - pen_y++; i_offset += i_pic_pitch; pen_x--; - pixel = ( ( pixel * ( 255 - alpha ) ) >> 8 ); - pen_y--; i_offset -= i_pic_pitch; - } - i_offset += i_pic_pitch; - } - - i_alpha_offset = -1; - i_offset = ( p_line->p_glyph_pos[ i ].y + pen_y - - p_glyph->top ) * i_pic_pitch + - 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++ ) - { - i_alpha_offset++; - if( alpha == 0 ) continue; - - pixel = ( ( pixel * ( 255 - alpha ) ) >> 8 ) + - ( 255 * alpha >> 8 ); - } - i_offset += i_pic_pitch; - } -#undef alpha -#undef pixel - } - } - else - { - 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 - { - 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; - } - else - { - pen_x = i_pic_width / 2 - p_line->i_width / 4 - + p_string->i_x_margin / 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 >> 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 ) - { - for( x = 0; x < p_glyph->bitmap.width; x+=2 ) - { - if( alpha == 0 ) continue; - - pixel = ( ( pixel * ( 0xFF - alpha ) ) >> 8 ) + - ( 0x80 * alpha >> 8 ); -#undef alpha -#undef pixel - } - } - } - } - } - } -} - -/** - * 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 Render( filter_t *p_filter, subpicture_t *p_spu, + subpicture_data_t *p_string ) { - subpicture_sys_t *p_string = p_subpic->p_sys; - int x, y, pen_x, pen_y; - unsigned int i; + filter_sys_t *p_sys = p_filter->p_sys; line_desc_t *p_line; - - for( p_line = p_subpic->p_sys->p_lines; 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 ) - { - pen_x = p_string->i_x_margin; - } - else - { - pen_x = i_pic_width / 2 /2 - p_line->i_width / 2 + p_string->i_x_margin; - } - + uint8_t *p_y, *p_u, *p_v, *p_a; + video_format_t fmt; + int i, x, y, i_pitch; + + /* Create a new subpicture region */ + memset( &fmt, 0, sizeof(video_format_t) ); + fmt.i_chroma = VLC_FOURCC('Y','U','V','A'); + fmt.i_aspect = VOUT_ASPECT_FACTOR; + fmt.i_width = fmt.i_visible_width = p_string->i_width + 2; + fmt.i_height = fmt.i_visible_height = p_string->i_height + 2; + fmt.i_x_offset = fmt.i_y_offset = 0; + p_spu->p_region = p_spu->pf_create_region( VLC_OBJECT(p_filter), &fmt ); + if( !p_spu->p_region ) + { + msg_Err( p_filter, "cannot allocate SPU region" ); + return; + } + + p_spu->p_region->i_x = p_spu->p_region->i_y = 0; + p_y = p_spu->p_region->picture.Y_PIXELS; + p_u = p_spu->p_region->picture.U_PIXELS; + p_v = p_spu->p_region->picture.V_PIXELS; + p_a = p_spu->p_region->picture.A_PIXELS; + i_pitch = p_spu->p_region->picture.Y_PITCH; + + /* Initialize the region pixels (only the alpha will be changed later) */ + memset( p_y, 0x00, i_pitch * p_spu->p_region->fmt.i_height ); + memset( p_u, 0x80, i_pitch * p_spu->p_region->fmt.i_height ); + memset( p_v, 0x80, i_pitch * p_spu->p_region->fmt.i_height ); + memset( p_a, 0x00, i_pitch * p_spu->p_region->fmt.i_height ); + +#define pi_gamma p_sys->pi_gamma + + for( p_line = p_string->p_lines; p_line != NULL; p_line = p_line->p_next ) + { + int i_glyph_tmax = 0; + int i_bitmap_offset, i_offset; 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++ ) - { - if( alpha == 0 ) continue; - - 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++ ) - { - if( alpha == 0 ) continue; - - pixel = ( ( pixel * ( 255 - alpha ) ) >> 8 ) + - ( 255 * alpha >> 8 ); - } - } -#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 ) -{ - 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; - - for( p_line = p_subpic->p_sys->p_lines; p_line != NULL; p_line = p_line->p_next ) - { - 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; - - p_in = p_pic->p[ i_plane ].p_pixels; - - 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 ) - { - pen_x = p_string->i_x_margin; - } - else - { - pen_x = i_pic_width / 2 / 4 - p_line->i_width / 2 - + p_string->i_x_margin; + i_glyph_tmax = __MAX( i_glyph_tmax, p_glyph->top ); } 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 + 1 ) * + i_pitch + p_line->p_glyph_pos[ i ].x + p_glyph->left + 1; + + 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++ ) { - if( alpha == 0 ) continue; - - 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--; + if( !pi_gamma[p_glyph->bitmap.buffer[i_bitmap_offset]] ) + continue; + + i_offset -= i_pitch; + p_a[i_offset + x] = ((uint16_t)p_a[i_offset + x] + + pi_gamma[p_glyph->bitmap.buffer[i_bitmap_offset]])/2; + i_offset += i_pitch; x--; + p_a[i_offset + x] = ((uint16_t)p_a[i_offset + x] + + pi_gamma[p_glyph->bitmap.buffer[i_bitmap_offset]])/2; + x += 2; + p_a[i_offset + x] = ((uint16_t)p_a[i_offset + x] + + pi_gamma[p_glyph->bitmap.buffer[i_bitmap_offset]])/2; + i_offset += i_pitch; x--; + p_a[i_offset + x] = ((uint16_t)p_a[i_offset + x] + + pi_gamma[p_glyph->bitmap.buffer[i_bitmap_offset]])/2; + i_offset -= i_pitch; } + i_offset += i_pitch; } - for(y = 0; y < p_glyph->bitmap.rows; y++ ) + + i_offset = ( p_line->p_glyph_pos[ i ].y + + i_glyph_tmax - p_glyph->top ) * + i_pitch + p_line->p_glyph_pos[ i ].x + p_glyph->left + 1; + + for( y = 0, i_bitmap_offset = 0; y < p_glyph->bitmap.rows; y++ ) { - for( x = 0; x < p_glyph->bitmap.width; x++ ) - { - if( alpha == 0 ) continue; - - 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 ); - } + for( x = 0; x < p_glyph->bitmap.width; x++, i_bitmap_offset++ ) + { + p_y[i_offset + x] = + pi_gamma[p_glyph->bitmap.buffer[i_bitmap_offset]]; + } + i_offset += i_pitch; } -#undef alpha -#undef pixel + +#undef pi_gamma } } } @@ -667,21 +389,17 @@ static void RenderRV32( vout_thread_t *p_vout, picture_t *p_pic, * 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, int i_channel, - 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 subpicture_t *RenderText( filter_t *p_filter, block_t *p_block ) { - subpicture_sys_t *p_string; + filter_sys_t *p_sys = p_filter->p_sys; + subpicture_t *p_subpic = 0; + subpicture_data_t *p_string = 0; + line_desc_t *p_line = 0, *p_next = 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; int i_string_length; - -#if defined(HAVE_ICONV) - iconv_t iconv_handle; -#endif + char *psz_string; + vlc_iconv_t iconv_handle = (vlc_iconv_t)(-1); FT_BBox line; FT_BBox glyph_size; @@ -689,10 +407,9 @@ static subpicture_t *AddText ( vout_thread_t *p_vout, int i_channel, FT_Glyph tmp_glyph; /* Sanity check */ - if ( !psz_string || !*psz_string ) - { - return NULL; - } + if( !p_block ) return NULL; + psz_string = p_block->p_buffer; + if( !psz_string || !*psz_string ) goto error; result.x = 0; result.y = 0; @@ -701,59 +418,39 @@ static subpicture_t *AddText ( vout_thread_t *p_vout, int i_channel, line.yMin = 0; line.yMax = 0; - p_line = 0; - p_string = 0; - p_subpic = 0; - /* Create and initialize a subpicture */ - p_subpic = vout_CreateSubPicture( p_vout, i_channel, MEMORY_SUBPICTURE ); - if ( p_subpic == NULL ) - { - 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; - } - else - { - p_subpic->b_ephemer = VLC_FALSE; - } + p_subpic = p_filter->pf_sub_buffer_new( p_filter ); + if( !p_subpic ) goto error; + + p_subpic->i_start = p_block->i_pts; + p_subpic->i_stop = p_block->i_pts + p_block->i_length; + p_subpic->b_ephemer = (p_block->i_length == 0); + p_subpic->b_absolute = VLC_FALSE; /* Create and initialize private data for the subpicture */ - p_string = malloc( sizeof(subpicture_sys_t) ); - if ( p_string == NULL ) + p_string = malloc( sizeof(subpicture_data_t) ); + if( !p_string ) { - msg_Err( p_vout, "Out of memory" ); + msg_Err( p_filter, "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 defined(HAVE_ICONV) p_unicode_string = malloc( ( strlen(psz_string) + 1 ) * sizeof(uint32_t) ); if( p_unicode_string == 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 convertion" ); goto error; } @@ -765,29 +462,32 @@ static subpicture_t *AddText ( vout_thread_t *p_vout, int i_channel, 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 ); + i_ret = vlc_iconv( iconv_handle, &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), 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) ); + 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 ); + &base_dir, (FriBidiChar*)p_fribidi_string, 0, 0, 0 ); free( p_unicode_string ); p_unicode_string = p_fribidi_string; p_fribidi_string[ i_string_length ] = 0; } -#endif #endif /* Calculate relative glyph positions and a bounding box for the @@ -795,7 +495,7 @@ static subpicture_t *AddText ( vout_thread_t *p_vout, int i_channel, p_line = NewLine( psz_string ); if( p_line == NULL ) { - msg_Err( p_vout, "Out of memory" ); + msg_Err( p_filter, "Out of memory" ); goto error; } p_string->p_lines = p_line; @@ -804,23 +504,23 @@ static subpicture_t *AddText ( vout_thread_t *p_vout, int i_channel, i_previous = 0; i = 0; -#define face p_vout->p_text_renderer_data->p_face +#define face p_sys->p_face #define glyph face->glyph while( *p_unicode_string ) { i_char = *p_unicode_string++; - if ( i_char == '\r' ) /* ignore CR chars wherever they may be */ + 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 ) { - msg_Err( p_vout, "Out of memory" ); + msg_Err( p_filter, "Out of memory" ); goto error; } p_line->p_next = p_next; @@ -836,13 +536,15 @@ static subpicture_t *AddText ( vout_thread_t *p_vout, int i_channel, line.yMin = 0; line.yMax = 0; i_pen_y += face->size->metrics.height >> 6; - msg_Dbg( p_vout, "Creating new line, i is %d", i ); +#if 0 + msg_Dbg( p_filter, "Creating new line, i is %d", i ); +#endif i = 0; 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; @@ -854,21 +556,21 @@ static subpicture_t *AddText ( vout_thread_t *p_vout, int i_channel, 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, "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, "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; + if( i_error ) continue; p_line->pp_glyphs[ i ] = (FT_BitmapGlyph)tmp_glyph; /* Do rest */ @@ -880,6 +582,7 @@ static subpicture_t *AddText ( vout_thread_t *p_vout, int i_channel, 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; @@ -887,25 +590,28 @@ static subpicture_t *AddText ( vout_thread_t *p_vout, int i_channel, 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 + Render( p_filter, p_subpic, p_string ); + FreeString( p_string ); + block_Release( p_block ); + return p_subpic; + error: - FreeString( p_subpic ); - vout_DestroySubPicture( p_vout, p_subpic ); + FreeString( p_string ); + if( p_subpic ) p_filter->pf_sub_buffer_del( p_filter, p_subpic ); + block_Release( p_block ); return NULL; } -static void FreeString( subpicture_t *p_subpic ) +static void FreeString( subpicture_data_t *p_string ) { unsigned int i; - subpicture_sys_t *p_string = p_subpic->p_sys; line_desc_t *p_line, *p_next; - if( p_subpic->p_sys == NULL ) return; + if( !p_string ) return; for( p_line = p_string->p_lines; p_line != NULL; p_line = p_next ) { @@ -923,52 +629,6 @@ static void FreeString( subpicture_t *p_subpic ) free( p_string ); } -#if !defined( HAVE_ICONV ) -/* convert one or more utf8 bytes into a unicode character */ -static int GetUnicodeCharFromUTF8( byte_t **ppsz_utf8_string ) -{ - int i_remaining_bytes, i_char = 0; - if( ( **ppsz_utf8_string & 0xFC ) == 0xFC ) - { - i_char = **ppsz_utf8_string & 1; - i_remaining_bytes = 5; - } - else if( ( **ppsz_utf8_string & 0xF8 ) == 0xF8 ) - { - i_char = **ppsz_utf8_string & 3; - i_remaining_bytes = 4; - } - else if( ( **ppsz_utf8_string & 0xF0 ) == 0xF0 ) - { - i_char = **ppsz_utf8_string & 7; - i_remaining_bytes = 3; - } - else if( ( **ppsz_utf8_string & 0xE0 ) == 0xE0 ) - { - i_char = **ppsz_utf8_string & 15; - i_remaining_bytes = 2; - } - else if( ( **ppsz_utf8_string & 0xC0 ) == 0xC0 ) - { - i_char = **ppsz_utf8_string & 31; - i_remaining_bytes = 1; - } - else - { - i_char = **ppsz_utf8_string; - i_remaining_bytes = 0; - } - while( i_remaining_bytes ) - { - (*ppsz_utf8_string)++; - i_remaining_bytes--; - i_char = ( i_char << 6 ) + ( **ppsz_utf8_string & 0x3F ); - } - (*ppsz_utf8_string)++; - return i_char; -} -#endif - static line_desc_t *NewLine( byte_t *psz_string ) { int i_count;