X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fgtk2%2Fproducer_pango.c;h=3398e79a285cce6f19fca18d76e6ad10310881ba;hb=f4963a6aa07644399b273b5d2b1f9299c9047414;hp=2d6dd50c49e9403efff9aa642843c569cbb1231a;hpb=9947d4dd5669e184a824b99ee78101051d5659de;p=melted diff --git a/src/modules/gtk2/producer_pango.c b/src/modules/gtk2/producer_pango.c index 2d6dd50..3398e79 100644 --- a/src/modules/gtk2/producer_pango.c +++ b/src/modules/gtk2/producer_pango.c @@ -3,29 +3,43 @@ * 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 #include #include #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 { @@ -55,7 +69,7 @@ static int producer_get_frame( mlt_producer parent, mlt_frame_ptr frame, int ind static void producer_close( mlt_producer parent ); static void pango_draw_background( GdkPixbuf *pixbuf, rgba_color bg ); static GdkPixbuf *pango_get_pixbuf( const char *markup, const char *text, const char *font, - rgba_color fg, rgba_color bg, int pad, int align, int weight ); + rgba_color fg, rgba_color bg, int pad, int align, int weight, int size ); /** Return nonzero if the two strings are equal, ignoring case, up to the first n characters. @@ -88,6 +102,8 @@ static int alignment_parse( char* align ) return ret; } +static PangoFT2FontMap *fontmap = NULL; + mlt_producer producer_pango_init( const char *filename ) { producer_pango this = calloc( sizeof( struct producer_pango_s ), 1 ); @@ -95,12 +111,15 @@ mlt_producer producer_pango_init( const char *filename ) { mlt_producer producer = &this->parent; + 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 ); @@ -127,10 +146,34 @@ mlt_producer producer_pango_init( const char *filename ) ( *strrchr( markup, '.' ) ) = '\0'; while ( strchr( markup, '~' ) ) ( *strchr( markup, '~' ) ) = '\n'; - mlt_properties_set( properties, "resource", ( char * )filename ); + mlt_properties_set( properties, "resource", filename ); mlt_properties_set( properties, "markup", markup ); free( copy ); } + else if ( strstr( filename, ".mpl" ) ) + { + int i = 0; + 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", 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 ); + + // Make sure we have at least one entry + if ( mlt_properties_get( contents, "0" ) == NULL ) + mlt_properties_set( contents, "0", "" ); + + for ( i = 0; i < mlt_properties_count( contents ); i ++ ) + { + char *name = mlt_properties_get_name( contents, i ); + char *value = mlt_properties_get_value( contents, i ); + while ( value != NULL && strchr( value, '~' ) ) + ( *strchr( value, '~' ) ) = '\n'; + item.frame = atoi( name ); + mlt_geometry_insert( key_frames, &item ); + } + } else { FILE *f = fopen( filename, "r" ); @@ -159,8 +202,8 @@ mlt_producer producer_pango_init( const char *filename ) if ( markup[ strlen( markup ) - 1 ] == '\n' ) markup[ strlen( markup ) - 1 ] = '\0'; - mlt_properties_set( properties, "resource", ( char * ) filename ); - mlt_properties_set( properties, "markup", ( char * ) ( markup == NULL ? "" : markup ) ); + mlt_properties_set( properties, "resource", filename ); + mlt_properties_set( properties, "markup", ( markup == NULL ? "" : markup ) ); free( markup ); } else @@ -175,7 +218,7 @@ mlt_producer producer_pango_init( const char *filename ) return NULL; } -static void set_string( char **string, char *value, char *fallback ) +static void set_string( char **string, const char *value, const char *fallback ) { if ( value != NULL ) { @@ -239,7 +282,7 @@ rgba_color parse_color( char *color ) /** Convert a string property to UTF-8 */ -static int iconv_utf8( mlt_properties properties, char *prop_name, const char* encoding ) +static int iconv_utf8( mlt_properties properties, const char *prop_name, const char* encoding ) { char *text = mlt_properties_get( properties, prop_name ); int result = -1; @@ -247,20 +290,22 @@ static int iconv_utf8( mlt_properties properties, char *prop_name, const char* e iconv_t cd = iconv_open( "UTF-8", encoding ); if ( cd != ( iconv_t )-1 ) { - char *inbuf_p = strdup( text ); + char *inbuf_p = 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; + memset( outbuf, 0, outbuf_n ); + + if ( text != NULL && strcmp( text, "" ) && iconv( cd, &inbuf_p, &inbuf_n, &outbuf_p, &outbuf_n ) != -1 ) mlt_properties_set( properties, prop_name, outbuf ); - result = 0; - } + else + mlt_properties_set( properties, prop_name, "" ); + mlt_pool_release( outbuf ); iconv_close( cd ); + result = 0; } return result; } @@ -268,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 ); @@ -292,28 +337,46 @@ static void refresh_image( mlt_frame frame, int width, int height ) char *font = mlt_properties_get( producer_props, "font" ); 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 = 0; + + if ( pixbuf == NULL ) + { + // 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 - 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 ) ); - 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 ); @@ -339,12 +402,14 @@ static void refresh_image( mlt_frame frame, int width, int height ) } // Render the title - pixbuf = pango_get_pixbuf( markup, text, font, fgcolor, bgcolor, pad, align, weight ); + pixbuf = pango_get_pixbuf( markup, text, font, fgcolor, bgcolor, pad, align, weight, size ); if ( pixbuf != NULL ) { // 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 ) ); @@ -354,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 ); @@ -377,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 ); @@ -416,43 +481,60 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form // Obtain properties of frame mlt_properties properties = MLT_FRAME_PROPERTIES( frame ); + // We need to know the size of the image to clone it + int image_size = 0; + int alpha_size = 0; + + // Alpha channel + uint8_t *alpha = NULL; + *width = mlt_properties_get_int( properties, "rescale_width" ); *height = mlt_properties_get_int( properties, "rescale_height" ); // Refresh the image + pthread_mutex_lock( &pango_mutex ); refresh_image( frame, *width, *height ); - // Determine format - //mlt_producer this = mlt_properties_get_data( properties, "producer_pango", NULL ); - //*format = ( mlt_properties_get_int( MLT_PRODUCER_PROPERTIES( this ), "bpp" ) == 4 ) ? mlt_image_rgb24a : mlt_image_rgb24; - - // May need to know the size of the image to clone it - int size = 0; - // Get the image - uint8_t *image = mlt_properties_get_data( properties, "image", &size ); + *buffer = mlt_properties_get_data( properties, "image", &image_size ); + alpha = mlt_properties_get_data( properties, "alpha", &alpha_size ); // Get width and height *width = mlt_properties_get_int( properties, "width" ); *height = mlt_properties_get_int( properties, "height" ); - // Clone if necessary - if ( writable ) + // Always clone here to allow 'animated' text + if ( *buffer != NULL ) { - // Clone our image - uint8_t *copy = mlt_pool_alloc( size ); - if ( copy != NULL ) - memcpy( copy, image, size ); + // Clone the image and the alpha + uint8_t *image_copy = mlt_pool_alloc( image_size ); + uint8_t *alpha_copy = mlt_pool_alloc( alpha_size ); - // We're going to pass the copy on - image = copy; + memcpy( image_copy, *buffer, image_size ); + + // Copy or default the alpha + if ( alpha != NULL ) + memcpy( alpha_copy, alpha, alpha_size ); + else + memset( alpha_copy, 255, alpha_size ); // Now update properties so we free the copy after - mlt_properties_set_data( properties, "image", copy, size, ( mlt_destructor )mlt_pool_release, NULL ); + mlt_properties_set_data( properties, "image", image_copy, image_size, mlt_pool_release, NULL ); + mlt_properties_set_data( properties, "alpha", alpha_copy, alpha_size, mlt_pool_release, NULL ); + + // We're going to pass the copy on + *buffer = image_copy; + } + else + { + // TODO: Review all cases of invalid images + *buffer = mlt_pool_alloc( 50 * 50 * 2 ); + mlt_properties_set_data( properties, "image", *buffer, image_size, mlt_pool_release, NULL ); + *width = 50; + *height = 50; } - // Pass on the image - *buffer = image; + pthread_mutex_unlock( &pango_mutex ); return 0; } @@ -471,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 ); @@ -479,8 +561,14 @@ static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int i // Set the producer on the frame properties mlt_properties_set_data( properties, "producer_pango", this, 0, NULL, NULL ); + // Update timecode on the frame we're creating + mlt_frame_set_position( *frame, mlt_producer_position( producer ) ); + 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 ); @@ -492,9 +580,6 @@ static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int i // Stack the get image callback mlt_frame_push_get_image( *frame, producer_get_image ); - // Update timecode on the frame we're creating - mlt_frame_set_position( *frame, mlt_producer_position( producer ) ); - // Calculate the next timecode mlt_producer_prepare_next( producer ); @@ -535,9 +620,8 @@ static void pango_draw_background( GdkPixbuf *pixbuf, rgba_color bg ) } } -static GdkPixbuf *pango_get_pixbuf( const char *markup, const char *text, const char *font, rgba_color fg, rgba_color bg, int pad, int align, int weight ) +static GdkPixbuf *pango_get_pixbuf( const char *markup, const char *text, const char *font, rgba_color fg, rgba_color bg, int pad, int align, int weight, int size ) { - PangoFT2FontMap *fontmap = (PangoFT2FontMap*) pango_ft2_font_map_new(); PangoContext *context = pango_ft2_font_map_create_context( fontmap ); PangoLayout *layout = pango_layout_new( context ); int w, h, x; @@ -553,17 +637,44 @@ static GdkPixbuf *pango_get_pixbuf( const char *markup, const char *text, const pango_ft2_font_map_set_resolution( fontmap, 72, 72 ); pango_layout_set_width( layout, -1 ); // set wrapping constraints pango_font_description_set_weight( desc, ( PangoWeight ) weight ); + if ( size != 0 ) + 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 ); @@ -602,9 +713,9 @@ static GdkPixbuf *pango_get_pixbuf( const char *markup, const char *text, const src += bitmap.pitch; } mlt_pool_release( bitmap.buffer ); + pango_font_description_free( desc ); g_object_unref( layout ); g_object_unref( context ); - g_object_unref( fontmap ); return pixbuf; }