/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <stdlib.h> /* malloc( ), free( ) */
-#include <string.h>
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
#endif
-#include <sys/stat.h>
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
+#include <vlc_fs.h>
+#include <vlc_vout.h>
+#include <vlc_osd.h>
+#include <vlc_block.h>
+#include <vlc_filter.h>
+
+#include <sys/types.h>
#ifdef HAVE_UNISTD_H
# include <unistd.h>
# include <io.h>
#endif
-#include <vlc/vlc.h>
-#include <vlc/vout.h>
-#include "vlc_osd.h"
-#include "vlc_block.h"
-#include "vlc_filter.h"
-
+#include <glib.h>
+#include <glib/gstdio.h>
+#include <glib-object.h> /* g_object_unref( ) */
#include <librsvg-2/librsvg/rsvg.h>
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" )
-
-vlc_module_begin();
- set_category( CAT_INPUT);
- set_category( SUBCAT_INPUT_SCODEC );
- set_capability( "text renderer", 101 );
- add_shortcut( "svg" );
- add_string( "svg-template-file", "", NULL, TEMPLATE_TEXT, TEMPLATE_LONGTEXT, VLC_TRUE );
- set_callbacks( Create, Destroy );
-vlc_module_end();
+#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", 99 )
+ add_shortcut( "svg" )
+ add_string( "svg-template-file", "", NULL, TEMPLATE_TEXT, TEMPLATE_LONGTEXT, true )
+ set_callbacks( Create, Destroy )
+vlc_module_end ()
/**
Describes a SVG string to be displayed on the video
/* Default size for rendering. Initialized to the output size. */
int i_width;
int i_height;
- vlc_mutex_t *lock;
};
/*****************************************************************************
/* 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;
}
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;
}
char *psz_template;
FILE *file;
- psz_filename = config_GetPsz( p_filter, "svg-template-file" );
- if( !psz_filename || psz_filename[0] == 0 )
+ psz_filename = var_InheritString( p_filter, "svg-template-file" );
+ if( !psz_filename || (psz_filename[0] == 0) )
{
/* No filename. Use a default value. */
psz_template = NULL;
else
{
/* Read the template */
- file = utf8_fopen( psz_filename, "rt" );
+ file = vlc_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. */
}
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 = calloc( 1, s.st_size + 42 );
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 );
+ if(! fread( psz_template, s.st_size, 1, file ) )
+ {
+ msg_Dbg( p_this, "No data read from template." );
+ }
}
+ fclose( file );
}
}
+ free( psz_filename );
if( !psz_template )
{
/* Either there was no file, or there was an error.
free( p_sys->psz_template );
free( p_sys );
+ rsvg_term( );
}
/*****************************************************************************
int channels_in;
int alpha;
picture_t *p_pic;
- subpicture_region_t *p_region_tmp;
if ( p_filter->p_sys->i_width != i_width ||
p_filter->p_sys->i_height != i_height )
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 );
/* 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_chroma = VLC_CODEC_YUVA;
fmt.i_width = fmt.i_visible_width = i_width;
fmt.i_height = fmt.i_visible_height = i_height;
fmt.i_x_offset = fmt.i_y_offset = 0;
- p_region_tmp = spu_CreateRegion( p_filter, &fmt );
- if( !p_region_tmp )
- {
- msg_Err( p_filter, "cannot allocate SPU region" );
+ fmt.i_sar_num = 1;
+ fmt.i_sar_den = 1;
+
+ p_region->p_picture = picture_NewFromFormat( &fmt );
+ if( !p_region->p_picture )
return VLC_EGENERIC;
- }
- p_region->fmt = p_region_tmp->fmt;
- p_region->picture = p_region_tmp->picture;
- free( p_region_tmp );
+ p_region->fmt = fmt;
p_region->i_x = p_region->i_y = 0;
- p_y = p_region->picture.Y_PIXELS;
- p_u = p_region->picture.U_PIXELS;
- p_v = p_region->picture.V_PIXELS;
- p_a = p_region->picture.A_PIXELS;
+ p_y = p_region->p_picture->Y_PIXELS;
+ p_u = p_region->p_picture->U_PIXELS;
+ p_v = p_region->p_picture->V_PIXELS;
+ p_a = p_region->p_picture->A_PIXELS;
- i_pitch = p_region->picture.Y_PITCH;
- i_u_pitch = p_region->picture.U_PITCH;
+ i_pitch = p_region->p_picture->Y_PITCH;
+ i_u_pitch = p_region->p_picture->U_PITCH;
/* Initialize the region pixels (only the alpha will be changed later) */
memset( p_y, 0x00, i_pitch * p_region->fmt.i_height );
memset( p_u, 0x80, i_u_pitch * p_region->fmt.i_height );
memset( p_v, 0x80, i_u_pitch * p_region->fmt.i_height );
- p_pic = &p_region->picture;
+ p_pic = p_region->p_picture;
/* Copy the data */
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
*/
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 );
}
}
}
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" );
+ 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 while rendering SVG: %s", error->message );
+ g_object_unref( G_OBJECT( p_handle ) );
+ return;
+ }
+
+ if( ! rsvg_handle_close( p_handle, &error ) )
{
- msg_Err( p_filter, "Error in handle_write: %s\n", error->message );
+ msg_Err( p_filter, "error while rendering SVG (close): %s", 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 ) );
}
psz_string = p_region_in->psz_text;
if( !psz_string || !*psz_string ) return VLC_EGENERIC;
- p_svg = ( svg_rendition_t * )malloc( sizeof( svg_rendition_t ) );
+ p_svg = 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;
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;
}
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 = calloc( 1, length + 1 );
if( !p_svg->psz_text )
{
- msg_Err( p_filter, "Out of memory" );
free( p_svg );
return VLC_ENOMEM;
}
- memset( p_svg->psz_text, 0, length + 1 );
snprintf( p_svg->psz_text, length, psz_template, psz_string );
}
p_svg->i_width = p_sys->i_width;
p_svg->i_height = p_sys->i_height;
- p_svg->i_chroma = VLC_FOURCC( 'Y','U','V','A' );
+ p_svg->i_chroma = VLC_CODEC_YUVA;
/* Render the SVG.
The input data is stored in the p_string structure,
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 );
}