X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fgtk2%2Fproducer_pango.c;h=4756213eef8e22deed81af2c990fb3b08c85e3cc;hb=0fc4837b335b5918aab7818ff1432a8f61c4ce05;hp=1d981d182198ffc8fc131cf3bca36881c461eeee;hpb=c293c721ca8acea7e15fc718eb2dea21e1f90349;p=melted diff --git a/src/modules/gtk2/producer_pango.c b/src/modules/gtk2/producer_pango.c index 1d981d1..4756213 100644 --- a/src/modules/gtk2/producer_pango.c +++ b/src/modules/gtk2/producer_pango.c @@ -3,22 +3,22 @@ * Copyright (C) 2003-2004 Ushodaya Enterprises Limited * Author: Dan Dennedy * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "producer_pango.h" +#include #include #include #include @@ -27,6 +27,19 @@ #include #include #include +#include +#include + +typedef struct producer_pango_s *producer_pango; + +typedef enum +{ + pango_align_left = 0, + pango_align_center, + pango_align_right +} pango_align; + +static pthread_mutex_t pango_mutex = PTHREAD_MUTEX_INITIALIZER; struct producer_pango_s { @@ -98,16 +111,15 @@ mlt_producer producer_pango_init( const char *filename ) { 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 ); @@ -144,6 +156,7 @@ mlt_producer producer_pango_init( const char *filename ) 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 ); @@ -300,7 +313,7 @@ static int iconv_utf8( mlt_properties properties, char *prop_name, const char* e 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 ); @@ -325,41 +338,45 @@ static void refresh_image( mlt_frame frame, int width, int height ) 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 ); @@ -391,6 +408,8 @@ static void refresh_image( mlt_frame frame, int width, int height ) { // 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 ) ); @@ -400,7 +419,7 @@ static void refresh_image( mlt_frame frame, int width, int height ) 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 ); @@ -423,8 +442,8 @@ static void refresh_image( mlt_frame frame, int width, int height ) 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 ); - +// fprintf(stderr,"%s: scaling from %dx%d to %dx%d\n", __FILE__, this->width, this->height, width, height); + // Note - the original pixbuf is already safe and ready for destruction pixbuf = gdk_pixbuf_scale_simple( pixbuf, width, height, interp ); @@ -473,6 +492,7 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form *height = mlt_properties_get_int( properties, "rescale_height" ); // Refresh the image + pthread_mutex_lock( &pango_mutex ); refresh_image( frame, *width, *height ); // Get the image @@ -514,6 +534,8 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form *height = 50; } + pthread_mutex_unlock( &pango_mutex ); + return 0; } @@ -531,7 +553,7 @@ static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int i producer_pango this = producer->child; // Generate a frame - *frame = mlt_frame_init( ); + *frame = mlt_frame_init( MLT_PRODUCER_SERVICE( producer ) ); // Obtain properties of frame and producer mlt_properties properties = MLT_FRAME_PROPERTIES( *frame ); @@ -544,11 +566,13 @@ static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int i 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; @@ -614,18 +638,43 @@ static GdkPixbuf *pango_get_pixbuf( const char *markup, const char *text, const pango_layout_set_width( layout, -1 ); // set wrapping constraints pango_font_description_set_weight( desc, ( PangoWeight ) weight ); if ( size != 0 ) - pango_font_description_set_size( desc, PANGO_SCALE * size ); + pango_font_description_set_absolute_size( desc, PANGO_SCALE * size ); pango_layout_set_font_description( layout, desc ); // 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 ); + // Interpret size property as an absolute pixel height and compensate for + // freetype's "interpretation" of our absolute size request. This gives + // precise control over compositing and better quality by reducing scaling + // artifacts with composite geometries that constrain the dimensions. + // If you do not want this, then put the size in the font property or in + // the pango markup. + if ( size != 0 ) + { + pango_font_description_set_absolute_size( desc, PANGO_SCALE * size * size/h ); + pango_layout_set_font_description( layout, desc ); + 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 ); pango_draw_background( pixbuf, bg );