#include <gdk-pixbuf/gdk-pixbuf.h>
#include <pango/pangoft2.h>
#include <freetype/freetype.h>
+#include <iconv.h>
struct producer_pango_s
{
static GdkPixbuf *pango_get_pixbuf( const char *markup, const char *text, const char *font,
rgba_color fg, rgba_color bg, int pad, int align );
+/** Return nonzero if the two strings are equal, ignoring case, up to
+ the first n characters.
+*/
+int strncaseeq(const char *s1, const char *s2, size_t n)
+{
+ for ( ; n > 0; n--)
+ {
+ if (tolower(*s1++) != tolower(*s2++))
+ return 0;
+ }
+ return 1;
+}
+
+/** Parse the alignment property.
+*/
+
+static int alignment_parse( char* align )
+{
+ int ret = pango_align_left;
+
+ if ( align == NULL );
+ else if ( isdigit( align[ 0 ] ) )
+ ret = atoi( align );
+ else if ( align[ 0 ] == 'c' || align[ 0 ] == 'm' )
+ ret = pango_align_center;
+ else if ( align[ 0 ] == 'r' )
+ ret = pango_align_right;
+
+ return ret;
+}
+
mlt_producer producer_pango_init( const char *filename )
{
producer_pango this = calloc( sizeof( struct producer_pango_s ), 1 );
mlt_producer producer = &this->parent;
producer->get_frame = producer_get_frame;
- producer->close = producer_close;
+ producer->close = ( mlt_destructor )producer_close;
// This is required to initialise gdk-pixbuf
g_type_init();
mlt_properties_set_int( properties, "pad", 0 );
mlt_properties_set( properties, "text", "" );
mlt_properties_set( properties, "font", "Sans 48" );
+ mlt_properties_set( properties, "encoding", "UTF-8" );
if ( filename == NULL )
{
- mlt_properties_set( properties, "resource", "pango" );
mlt_properties_set( properties, "markup", "" );
}
else if ( filename[ 0 ] == '+' || strstr( filename, "/+" ) )
}
else
{
- mlt_properties_set( properties, "resource", "pango" );
mlt_properties_set( properties, "markup", "" );
}
}
return result;
}
+/** Convert a string property to UTF-8
+*/
+static int iconv_utf8( mlt_properties properties, char *prop_name, const char* encoding )
+{
+ char *text = mlt_properties_get( properties, prop_name );
+ int result = -1;
+
+ iconv_t cd = iconv_open( "UTF-8", encoding );
+ if ( cd != ( iconv_t )-1 )
+ {
+ char *inbuf_p = strdup( text );
+ size_t inbuf_n = strlen( text );
+ size_t outbuf_n = inbuf_n * 6;
+ char *outbuf = mlt_pool_alloc( outbuf_n );
+ char *outbuf_p = outbuf;
+
+ if ( iconv( cd, &inbuf_p, &inbuf_n, &outbuf_p, &outbuf_n ) != -1 )
+ {
+ outbuf[ outbuf_n ] = 0;
+ mlt_properties_set( properties, prop_name, outbuf );
+ result = 0;
+ }
+ mlt_pool_release( outbuf );
+ iconv_close( cd );
+ }
+ return result;
+}
+
static void refresh_image( mlt_frame frame, int width, int height )
{
// Pixbuf
// Get producer properties
char *fg = mlt_properties_get( producer_props, "fgcolour" );
char *bg = mlt_properties_get( producer_props, "bgcolour" );
- int align = mlt_properties_get_int( producer_props, "align" );
+ int align = alignment_parse( mlt_properties_get( producer_props, "align" ) );
int pad = mlt_properties_get_int( producer_props, "pad" );
char *markup = mlt_properties_get( producer_props, "markup" );
char *text = mlt_properties_get( producer_props, "text" );
char *font = mlt_properties_get( producer_props, "font" );
-
+ char *encoding = mlt_properties_get( producer_props, "encoding" );
+
// See if any properties changed
- int property_changed = ( this->fgcolor == NULL || strcmp( fg, this->fgcolor ) );
- property_changed = property_changed || ( this->bgcolor == NULL || strcmp( bg, this->bgcolor ) );
- property_changed = property_changed || ( align != this->align );
+ int property_changed = ( align != this->align );
+ property_changed = property_changed || ( this->fgcolor == NULL || ( fg && strcmp( fg, this->fgcolor ) ) );
+ property_changed = property_changed || ( this->bgcolor == NULL || ( bg && strcmp( bg, this->bgcolor ) ) );
property_changed = property_changed || ( pad != this->pad );
property_changed = property_changed || ( markup && this->markup && strcmp( markup, this->markup ) );
property_changed = property_changed || ( text && this->text && strcmp( text, this->text ) );
rgba_color fgcolor = parse_color( this->fgcolor );
rgba_color bgcolor = parse_color( this->bgcolor );
- free( this->image );
- free( this->alpha );
+ mlt_pool_release( this->image );
+ mlt_pool_release( this->alpha );
this->image = NULL;
this->alpha = NULL;
+ // Convert from specified encoding to UTF-8
+ if ( encoding != NULL && !strncaseeq( encoding, "utf-8", 5 ) && !strncaseeq( encoding, "utf8", 4 ) )
+ {
+ if ( markup != NULL && iconv_utf8( producer_props, "markup", encoding ) != -1 )
+ {
+ markup = mlt_properties_get( producer_props, "markup" );
+ set_string( &this->markup, markup, NULL );
+ }
+ if ( text != NULL && iconv_utf8( producer_props, "text", encoding ) != -1 )
+ {
+ text = mlt_properties_get( producer_props, "text" );
+ set_string( &this->text, text, NULL );
+ }
+ }
+
// Render the title
pixbuf = pango_get_pixbuf( markup, text, font, fgcolor, bgcolor, pad, align );
// Store the width/height of the pixbuf temporarily
this->width = gdk_pixbuf_get_width( pixbuf );
this->height = gdk_pixbuf_get_height( pixbuf );
-
- mlt_properties_set_int( producer_props, "bpp", gdk_pixbuf_get_has_alpha( pixbuf ) ? 4 : 3 );
}
}
- else if ( this->image == NULL || width != this->width || height != this->height )
+ else if ( width > 0 && ( this->image == NULL || width != this->width || height != this->height ) )
{
- free( this->image );
- free( this->alpha );
+ mlt_pool_release( this->image );
+ mlt_pool_release( this->alpha );
this->image = NULL;
this->alpha = NULL;
pixbuf = mlt_properties_get_data( producer_props, "pixbuf", NULL );
- mlt_properties_set_int( producer_props, "bpp", gdk_pixbuf_get_has_alpha( pixbuf ) ? 4 : 3 );
}
- int bpp = mlt_properties_get_int( producer_props, "bpp" );
-
// If we have a pixbuf and a valid width
if ( pixbuf && width > 0 )
{
+ char *interps = mlt_properties_get( properties, "rescale.interp" );
+ int interp = GDK_INTERP_BILINEAR;
+
+ if ( strcmp( interps, "nearest" ) == 0 )
+ interp = GDK_INTERP_NEAREST;
+ else if ( strcmp( interps, "tiles" ) == 0 )
+ interp = GDK_INTERP_TILES;
+ else if ( strcmp( interps, "hyper" ) == 0 )
+ interp = GDK_INTERP_HYPER;
+
+// fprintf( stderr, "SCALING PANGO from %dx%d to %dx%d was %dx%d\n", gdk_pixbuf_get_width( pixbuf ), gdk_pixbuf_get_height( pixbuf ), width, height, this->width, this->height );
+
// Note - the original pixbuf is already safe and ready for destruction
- pixbuf = gdk_pixbuf_scale_simple( pixbuf, width, height, GDK_INTERP_NEAREST );
+ pixbuf = gdk_pixbuf_scale_simple( pixbuf, width, height, interp );
// Store width and height
this->width = width;
this->height = height;
// Allocate/define image
- // IRRIGATE ME
- uint8_t *image = malloc( width * ( height + 1 ) * bpp );
- uint8_t *alpha = NULL;
-
- // Allocate the alpha mask
- alpha = malloc( this->width * this->height );
+ this->image = mlt_pool_alloc( width * ( height + 1 ) * 2 );
+ this->alpha = mlt_pool_alloc( this->width * this->height );
// Convert the image
mlt_convert_rgb24a_to_yuv422( gdk_pixbuf_get_pixels( pixbuf ),
this->width, this->height,
gdk_pixbuf_get_rowstride( pixbuf ),
- image, alpha );
+ this->image, this->alpha );
// Finished with pixbuf now
g_object_unref( pixbuf );
-
- // reference the image in the producer
- this->image = image;
- this->alpha = alpha;
}
// Set width/height
mlt_properties_set_int( properties, "real_height", mlt_properties_get_int( producer_props, "real_height" ) );
// pass the image data without destructor
- mlt_properties_set_data( properties, "image", this->image, this->width * ( this->height + 1 ) * bpp, NULL, NULL );
+ mlt_properties_set_data( properties, "image", this->image, this->width * ( this->height + 1 ) * 2, NULL, NULL );
mlt_properties_set_data( properties, "alpha", this->alpha, this->width * this->height, NULL, NULL );
}
if ( writable )
{
// Clone our image
- // IRRIGATE ME
- uint8_t *copy = malloc( size );
+ uint8_t *copy = mlt_pool_alloc( size );
memcpy( copy, image, size );
// We're going to pass the copy on
image = copy;
// Now update properties so we free the copy after
- mlt_properties_set_data( properties, "image", copy, size, free, NULL );
+ mlt_properties_set_data( properties, "image", copy, size, ( mlt_destructor )mlt_pool_release, NULL );
}
// Pass on the image
// Set producer-specific frame properties
mlt_properties_set_int( properties, "progressive", 1 );
- mlt_properties_set_double( properties, "aspect_ratio", mlt_properties_get_double( properties, "real_width" ) / mlt_properties_get_double( properties, "real_height" ) );
+ mlt_properties_set_double( properties, "aspect_ratio", 1 );
// Set alpha call back
( *frame )->get_alpha_mask = producer_get_alpha_mask;
static void producer_close( mlt_producer parent )
{
producer_pango this = parent->child;
- free( this->image );
- free( this->alpha );
+ mlt_pool_release( this->image );
+ mlt_pool_release( this->alpha );
free( this->fgcolor );
free( this->bgcolor );
free( this->markup );
bitmap.width = w;
bitmap.pitch = 32 * ( ( w + 31 ) / 31 );
bitmap.rows = h;
- bitmap.buffer = ( unsigned char * ) calloc( 1, h * bitmap.pitch );
+ bitmap.buffer = mlt_pool_alloc( h * bitmap.pitch );
bitmap.num_grays = 256;
bitmap.pixel_mode = ft_pixel_mode_grays;
+ memset( bitmap.buffer, 0, h * bitmap.pitch );
+
pango_ft2_render_layout( &bitmap, layout, 0, 0 );
src = bitmap.buffer;
}
dest += stride;
}
- free( bitmap.buffer );
-
+ mlt_pool_release( bitmap.buffer );
g_object_unref( layout );
g_object_unref( context );
g_object_unref( fontmap );
return pixbuf;
}
-
projects / mlt / blobdiff