X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fmisc%2Fsvg.c;h=d601cd7ca4e1b35694b9b71c6dd190087950cef8;hb=1c8685fb7d890424ec06ff9a2e3cbc1da984e617;hp=26d95af1db64bd3b79f36b158b3f8db88dc9cabc;hpb=615ba42c1399c964347d45bbd327f731ab03167e;p=vlc diff --git a/modules/misc/svg.c b/modules/misc/svg.c index 26d95af1db..d601cd7ca4 100644 --- a/modules/misc/svg.c +++ b/modules/misc/svg.c @@ -24,13 +24,22 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include /* malloc( ), free( ) */ -#include + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include +#include +#include +#include +#include +#include #ifdef HAVE_SYS_TYPES_H # include #endif -#include #ifdef HAVE_UNISTD_H # include @@ -38,12 +47,9 @@ # include #endif -#include -#include -#include "vlc_osd.h" -#include "vlc_block.h" -#include "vlc_filter.h" - +#include +#include +#include /* g_object_unref( ) */ #include typedef struct svg_rendition_t svg_rendition_t; @@ -53,23 +59,24 @@ typedef struct svg_rendition_t svg_rendition_t; *****************************************************************************/ static int Create ( vlc_object_t * ); static void Destroy ( vlc_object_t * ); -static int RenderText( filter_t *p_filter, subpicture_region_t *p_region_out, - subpicture_region_t *p_region_in ); - +static int RenderText( filter_t *p_filter, subpicture_region_t *p_region_out, + subpicture_region_t *p_region_in ); +static char *svg_GetTemplate( vlc_object_t *p_this ); /***************************************************************************** * Module descriptor *****************************************************************************/ #define TEMPLATE_TEXT N_( "SVG template file" ) -#define TEMPLATE_LONGTEXT N_( "Location of a file holding a SVG template for automatic string conversion" ) +#define TEMPLATE_LONGTEXT N_( "Location of a file holding a SVG template "\ + "for automatic string conversion" ) vlc_module_begin(); set_category( CAT_INPUT); set_category( SUBCAT_INPUT_SCODEC ); - set_capability( "text renderer", 101 ); + set_capability( "text renderer", 99 ); add_shortcut( "svg" ); - add_string( "svg-template-file", "", NULL, TEMPLATE_TEXT, TEMPLATE_LONGTEXT, VLC_TRUE ); + add_string( "svg-template-file", "", NULL, TEMPLATE_TEXT, TEMPLATE_LONGTEXT, true ); set_callbacks( Create, Destroy ); vlc_module_end(); @@ -124,16 +131,13 @@ static int Create( vlc_object_t *p_this ) /* Allocate structure */ p_sys = malloc( sizeof( filter_sys_t ) ); if( !p_sys ) - { - msg_Err( p_filter, "Out of memory" ); return VLC_ENOMEM; - } /* Initialize psz_template */ p_sys->psz_template = svg_GetTemplate( p_this ); if( !p_sys->psz_template ) { - msg_Err( p_filter, "Out of memory" ); + free( p_sys ); return VLC_ENOMEM; } @@ -141,10 +145,11 @@ static int Create( vlc_object_t *p_this ) p_sys->i_height = p_filter->fmt_out.video.i_height; p_filter->pf_render_text = RenderText; + p_filter->pf_render_html = NULL; p_filter->p_sys = p_sys; /* MUST call this before any RSVG funcs */ - g_type_init (); + rsvg_init( ); return VLC_SUCCESS; } @@ -157,7 +162,7 @@ static char *svg_GetTemplate( vlc_object_t *p_this ) FILE *file; psz_filename = config_GetPsz( p_filter, "svg-template-file" ); - if( !psz_filename || psz_filename[0] == 0 ) + if( !psz_filename || (psz_filename[0] == 0) ) { /* No filename. Use a default value. */ psz_template = NULL; @@ -168,16 +173,15 @@ static char *svg_GetTemplate( vlc_object_t *p_this ) file = utf8_fopen( psz_filename, "rt" ); if( !file ) { - msg_Warn( p_this, "SVG template file %s does not exist.", psz_filename ); + msg_Warn( p_this, "SVG template file %s does not exist.", + psz_filename ); psz_template = NULL; } else { struct stat s; - int i_ret; - i_ret = utf8_stat( psz_filename, &s ); - if( i_ret ) + if( fstat( fileno( file ), &s ) ) { /* Problem accessing file information. Should not happen as we could open it. */ @@ -191,21 +195,23 @@ static char *svg_GetTemplate( vlc_object_t *p_this ) } else { - msg_Dbg( p_this, "Reading %ld bytes from template %s", + msg_Dbg( p_this, "reading %ld bytes from template %s", (unsigned long)s.st_size, psz_filename ); - psz_template = malloc( s.st_size + 42 ); + psz_template = malloc( ( s.st_size + 42 ) * sizeof( char ) ); if( !psz_template ) { - msg_Err( p_filter, "Out of memory" ); + fclose( file ); + free( psz_filename ); return NULL; } memset( psz_template, 0, s.st_size + 1 ); fread( psz_template, s.st_size, 1, file ); - fclose( file ); } + fclose( file ); } } + free( psz_filename ); if( !psz_template ) { /* Either there was no file, or there was an error. @@ -231,6 +237,7 @@ static void Destroy( vlc_object_t *p_this ) free( p_sys->psz_template ); free( p_sys ); + rsvg_term( ); } /***************************************************************************** @@ -258,8 +265,11 @@ static int Render( filter_t *p_filter, subpicture_region_t *p_region, if( p_svg->p_rendition == NULL ) { svg_RenderPicture( p_filter, p_svg ); - /* FIXME: should do a check here to ensure that - the rendition went OK */ + if( ! p_svg->p_rendition ) + { + msg_Err( p_filter, "Cannot render SVG" ); + return VLC_EGENERIC; + } } i_width = gdk_pixbuf_get_width( p_svg->p_rendition ); i_height = gdk_pixbuf_get_height( p_svg->p_rendition ); @@ -329,24 +339,24 @@ static int Render( filter_t *p_filter, subpicture_region_t *p_region, if( !alpha ) memset( p_a, 0xFF, i_pitch * p_region->fmt.i_height ); */ - + #define INDEX_IN( x, y ) ( y * rowstride_in + x * channels_in ) #define INDEX_OUT( x, y ) ( y * i_pitch + x * p_pic->p[Y_PLANE].i_pixel_pitch ) - + for( y = 0; y < i_height; y++ ) { for( x = 0; x < i_width; x++ ) { guchar *p_in; int i_out; - + p_in = &pixels_in[INDEX_IN( x, y )]; - + #define R( pixel ) *pixel #define G( pixel ) *( pixel+1 ) #define B( pixel ) *( pixel+2 ) #define ALPHA( pixel ) *( pixel+3 ) - + /* From http://www.geocrawler.com/archives/3/8263/2001/6/0/6020594/ : Y = 0.29900 * R + 0.58700 * G + 0.11400 * B U = -0.1687 * r - 0.3313 * g + 0.5 * b + 128 @@ -354,13 +364,13 @@ static int Render( filter_t *p_filter, subpicture_region_t *p_region, */ if ( alpha ) { i_out = INDEX_OUT( x, y ); - + p_pic->Y_PIXELS[i_out] = .299 * R( p_in ) + .587 * G( p_in ) + .114 * B( p_in ); - - p_pic->U_PIXELS[i_out] = -.1687 * R( p_in ) - .3313 * G( p_in ) + .5 * B( p_in ) + 128; - p_pic->V_PIXELS[i_out] = .5 * R( p_in ) - .4187 * G( p_in ) - .0813 * B( p_in ) + 128; - p_pic->A_PIXELS[i_out] = ALPHA( p_in ); + p_pic->U_PIXELS[i_out] = -.1687 * R( p_in ) - .3313 * G( p_in ) + .5 * B( p_in ) + 128; + p_pic->V_PIXELS[i_out] = .5 * R( p_in ) - .4187 * G( p_in ) - .0813 * B( p_in ) + 128; + + p_pic->A_PIXELS[i_out] = ALPHA( p_in ); } } } @@ -391,22 +401,37 @@ static void svg_RenderPicture( filter_t *p_filter, RsvgHandle *p_handle; GError *error = NULL; + p_svg->p_rendition = NULL; + p_handle = rsvg_handle_new(); + if( !p_handle ) + { + msg_Err( p_filter, "Error creating SVG reader: %s", error->message ); + return; + } + rsvg_handle_set_size_callback( p_handle, svg_SizeCallback, p_filter, NULL ); - rsvg_handle_write( p_handle, - ( guchar* )p_svg->psz_text, strlen( p_svg->psz_text ) + 1, - &error ); - if( error != NULL ) + if( ! rsvg_handle_write( p_handle, + ( guchar* )p_svg->psz_text, strlen( p_svg->psz_text ), + &error ) ) { - msg_Err( p_filter, "Error in handle_write: %s\n", error->message ); + msg_Err( p_filter, "error while rendering SVG: %s\n", error->message ); + g_object_unref( G_OBJECT( p_handle ) ); + return; + } + + if( ! rsvg_handle_close( p_handle, &error ) ) + { + msg_Err( p_filter, "error while rendering SVG (close): %s\n", error->message ); + g_object_unref( G_OBJECT( p_handle ) ); return; } - rsvg_handle_close( p_handle, &error ); p_svg->p_rendition = rsvg_handle_get_pixbuf( p_handle ); - rsvg_handle_free( p_handle ); + + g_object_unref( G_OBJECT( p_handle ) ); } @@ -424,10 +449,7 @@ static int RenderText( filter_t *p_filter, subpicture_region_t *p_region_out, p_svg = ( svg_rendition_t * )malloc( sizeof( svg_rendition_t ) ); if( !p_svg ) - { - msg_Err( p_filter, "Out of memory" ); return VLC_ENOMEM; - } p_region_out->i_x = p_region_in->i_x; p_region_out->i_y = p_region_in->i_y; @@ -440,7 +462,6 @@ static int RenderText( filter_t *p_filter, subpicture_region_t *p_region_out, p_svg->psz_text = strdup( psz_string ); if( !p_svg->psz_text ) { - msg_Err( p_filter, "Out of memory" ); free( p_svg ); return VLC_ENOMEM; } @@ -448,13 +469,13 @@ static int RenderText( filter_t *p_filter, subpicture_region_t *p_region_out, else { /* Data is text. Convert to SVG */ + /* FIXME: handle p_style attributes */ int length; char* psz_template = p_sys->psz_template; length = strlen( psz_string ) + strlen( psz_template ) + 42; - p_svg->psz_text = malloc( length + 1 ); + p_svg->psz_text = malloc( ( length + 1 ) * sizeof( char ) ); if( !p_svg->psz_text ) { - msg_Err( p_filter, "Out of memory" ); free( p_svg ); return VLC_ENOMEM; } @@ -479,6 +500,9 @@ static int RenderText( filter_t *p_filter, subpicture_region_t *p_region_out, static void FreeString( svg_rendition_t *p_svg ) { free( p_svg->psz_text ); - free( p_svg->p_rendition ); + /* p_svg->p_rendition is a GdkPixbuf, and its allocation is + managed through ref. counting */ + if( p_svg->p_rendition ) + g_object_unref( p_svg->p_rendition ); free( p_svg ); }