#include <pango/pangoft2.h>
#include <freetype/freetype.h>
#include <iconv.h>
+#include <pthread.h>
+
+static pthread_mutex_t pango_mutex = PTHREAD_MUTEX_INITIALIZER;
struct producer_pango_s
{
{
mlt_producer producer = &this->parent;
- // THIS SHOULD BE MUTEXED...
+ pthread_mutex_lock( &pango_mutex );
if ( fontmap == NULL )
fontmap = (PangoFT2FontMap*) pango_ft2_font_map_new();
+ g_type_init();
+ pthread_mutex_unlock( &pango_mutex );
producer->get_frame = producer_get_frame;
producer->close = ( mlt_destructor )producer_close;
- // This is required to initialise gdk-pixbuf
- g_type_init();
-
// Get the properties interface
mlt_properties properties = MLT_PRODUCER_PROPERTIES( &this->parent );
mlt_properties contents = mlt_properties_load( filename );
mlt_geometry key_frames = mlt_geometry_init( );
struct mlt_geometry_item_s item;
+ mlt_properties_set( properties, "resource", ( char * )filename );
mlt_properties_set_data( properties, "contents", contents, 0, ( mlt_destructor )mlt_properties_close, NULL );
mlt_properties_set_data( properties, "key_frames", key_frames, 0, ( mlt_destructor )mlt_geometry_close, NULL );
static void refresh_image( mlt_frame frame, int width, int height )
{
// Pixbuf
- GdkPixbuf *pixbuf = NULL;
+ GdkPixbuf *pixbuf = mlt_properties_get_data( MLT_FRAME_PROPERTIES( frame ), "pixbuf", NULL );
// Obtain properties of frame
mlt_properties properties = MLT_FRAME_PROPERTIES( frame );
char *encoding = mlt_properties_get( producer_props, "encoding" );
int weight = mlt_properties_get_int( producer_props, "weight" );
int size = mlt_properties_get_int( producer_props, "size" );
- int property_changed = ( align != this->align );
-
- // Check for file support
- int position = mlt_properties_get_position( properties, "pango_position" );
- mlt_properties contents = mlt_properties_get_data( producer_props, "contents", NULL );
- mlt_geometry key_frames = mlt_properties_get_data( producer_props, "key_frames", NULL );
- struct mlt_geometry_item_s item;
- if ( contents != NULL )
+ int property_changed = 0;
+
+ if ( pixbuf == NULL )
{
- char temp[ 20 ];
- mlt_geometry_prev_key( key_frames, &item, position );
- sprintf( temp, "%d", item.frame );
- markup = mlt_properties_get( contents, temp );
- }
+ // Check for file support
+ int position = mlt_properties_get_position( properties, "pango_position" );
+ mlt_properties contents = mlt_properties_get_data( producer_props, "contents", NULL );
+ mlt_geometry key_frames = mlt_properties_get_data( producer_props, "key_frames", NULL );
+ struct mlt_geometry_item_s item;
+ if ( contents != NULL )
+ {
+ char temp[ 20 ];
+ mlt_geometry_prev_key( key_frames, &item, position );
+ sprintf( temp, "%d", item.frame );
+ markup = mlt_properties_get( contents, temp );
+ }
- // See if any properties changed
- 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 ) );
- property_changed = property_changed || ( font && this->font && strcmp( font, this->font ) );
- property_changed = property_changed || ( weight != this->weight );
-
- // Save the properties for next comparison
- this->align = align;
- this->pad = pad;
- set_string( &this->fgcolor, fg, "0xffffffff" );
- set_string( &this->bgcolor, bg, "0x00000000" );
- set_string( &this->markup, markup, NULL );
- set_string( &this->text, text, NULL );
- set_string( &this->font, font, "Sans 48" );
- this->weight = weight;
-
- if ( property_changed )
+ // See if any properties changed
+ 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 ) );
+ property_changed = property_changed || ( font && this->font && strcmp( font, this->font ) );
+ property_changed = property_changed || ( weight != this->weight );
+
+ // Save the properties for next comparison
+ this->align = align;
+ this->pad = pad;
+ set_string( &this->fgcolor, fg, "0xffffffff" );
+ set_string( &this->bgcolor, bg, "0x00000000" );
+ set_string( &this->markup, markup, NULL );
+ set_string( &this->text, text, NULL );
+ set_string( &this->font, font, "Sans 48" );
+ this->weight = weight;
+ }
+
+ if ( pixbuf == NULL && property_changed )
{
rgba_color fgcolor = parse_color( this->fgcolor );
rgba_color bgcolor = parse_color( this->bgcolor );
{
// Register this pixbuf for destruction and reuse
mlt_properties_set_data( producer_props, "pixbuf", pixbuf, 0, ( mlt_destructor )g_object_unref, NULL );
+ g_object_ref( pixbuf );
+ mlt_properties_set_data( MLT_FRAME_PROPERTIES( frame ), "pixbuf", pixbuf, 0, ( mlt_destructor )g_object_unref, NULL );
mlt_properties_set_int( producer_props, "real_width", gdk_pixbuf_get_width( pixbuf ) );
mlt_properties_set_int( producer_props, "real_height", gdk_pixbuf_get_height( pixbuf ) );
this->height = gdk_pixbuf_get_height( pixbuf );
}
}
- else if ( width > 0 && ( this->image == NULL || width != this->width || height != this->height ) )
+ else if ( pixbuf == NULL && ( width > 0 && ( this->image == NULL || width != this->width || height != this->height ) ) )
{
mlt_pool_release( this->image );
mlt_pool_release( this->alpha );
*height = mlt_properties_get_int( properties, "rescale_height" );
// Refresh the image
+ pthread_mutex_lock( &pango_mutex );
refresh_image( frame, *width, *height );
// Get the image
*height = 50;
}
+ pthread_mutex_unlock( &pango_mutex );
+
return 0;
}
mlt_properties_set_position( properties, "pango_position", mlt_producer_frame( producer ) );
// Refresh the pango image
+ pthread_mutex_lock( &pango_mutex );
refresh_image( *frame, 0, 0 );
+ pthread_mutex_unlock( &pango_mutex );
// Set producer-specific frame properties
mlt_properties_set_int( properties, "progressive", 1 );
- mlt_properties_set_double( properties, "aspect_ratio", 0 );
+ mlt_properties_set_double( properties, "aspect_ratio", 1 );
// Set alpha call back
( *frame )->get_alpha_mask = producer_get_alpha_mask;
// pango_layout_set_spacing( layout, space );
pango_layout_set_alignment( layout, ( PangoAlignment ) align );
if ( markup != NULL && strcmp( markup, "" ) != 0 )
+ {
pango_layout_set_markup( layout, markup, strlen( markup ) );
+ }
else if ( text != NULL && strcmp( text, "" ) != 0 )
- pango_layout_set_text( layout, text, strlen( text ) );
+ {
+ // Replace all ~'s with a line feed (silly convention, but handy)
+ char *copy = strdup( text );
+ while ( strchr( copy, '~' ) )
+ ( *strchr( copy, '~' ) ) = '\n';
+ pango_layout_set_text( layout, copy, strlen( copy ) );
+ free( copy );
+ }
else
+ {
+ // Pango doesn't like empty strings
pango_layout_set_text( layout, " ", 2 );
+ }
pango_layout_get_pixel_size( layout, &w, &h );
pixbuf = gdk_pixbuf_new( GDK_COLORSPACE_RGB, TRUE /* has alpha */, 8, w + 2 * pad, h + 2 * pad );