/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <stdlib.h> /* malloc( ), free( ) */
-#include <string.h>
+
+#include <vlc/vlc.h>
+#include <vlc_charset.h>
+#include <vlc_vout.h>
+#include <vlc_osd.h>
+#include <vlc_block.h>
+#include <vlc_filter.h>
#ifdef HAVE_SYS_TYPES_H
# include <sys/types.h>
#endif
-#include <sys/stat.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
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 );
set_callbacks( Create, Destroy );
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;
}
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;
}
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" );
free( p_sys->psz_template );
free( p_sys );
+ rsvg_term( );
}
/*****************************************************************************
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 );
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: %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 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 ) );
}
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" );
static void FreeString( svg_rendition_t *p_svg )
{
- free( p_svg->psz_text );
- free( p_svg->p_rendition );
+ if( p_svg->psz_text )
+ free( p_svg->psz_text );
+ /* 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 );
}
projects / vlc / blobdiff