X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fgtk2%2Fproducer_pango.c;h=7da47d1710071f5b23172ec234710824223c1364;hb=cdf7162ebc07120e92166a0e43eaba21ecca25ba;hp=e4969aba59b287ab9c35692c85faf2e0f93ae986;hpb=52c1bb26fcbb895824cd9237c228ea4834ce1433;p=melted diff --git a/src/modules/gtk2/producer_pango.c b/src/modules/gtk2/producer_pango.c index e4969ab..7da47d1 100644 --- a/src/modules/gtk2/producer_pango.c +++ b/src/modules/gtk2/producer_pango.c @@ -20,12 +20,16 @@ #include "producer_pango.h" #include +#include #include #include #include #include #include #include +#include + +static pthread_mutex_t pango_mutex = PTHREAD_MUTEX_INITIALIZER; struct producer_pango_s { @@ -41,6 +45,7 @@ struct producer_pango_s char *markup; char *text; char *font; + int weight; }; // special color type used by internal pango routines @@ -54,7 +59,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 ); + 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. @@ -87,6 +92,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 ); @@ -94,14 +101,17 @@ 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 ); + mlt_properties properties = MLT_PRODUCER_PROPERTIES( &this->parent ); // Set the default properties mlt_properties_set( properties, "fgcolour", "0xffffffff" ); @@ -111,6 +121,7 @@ mlt_producer producer_pango_init( const char *filename ) mlt_properties_set( properties, "text", "" ); mlt_properties_set( properties, "font", "Sans 48" ); mlt_properties_set( properties, "encoding", "UTF-8" ); + mlt_properties_set_int( properties, "weight", PANGO_WEIGHT_NORMAL ); if ( filename == NULL ) { @@ -129,6 +140,30 @@ mlt_producer producer_pango_init( const char *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", ( 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 ); + + // 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" ); @@ -245,20 +280,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; } @@ -269,7 +306,7 @@ static void refresh_image( mlt_frame frame, int width, int height ) GdkPixbuf *pixbuf = NULL; // Obtain properties of frame - mlt_properties properties = mlt_frame_properties( frame ); + mlt_properties properties = MLT_FRAME_PROPERTIES( frame ); // Obtain the producer pango for this frame producer_pango this = mlt_properties_get_data( properties, "producer_pango", NULL ); @@ -278,7 +315,7 @@ static void refresh_image( mlt_frame frame, int width, int height ) mlt_producer producer = &this->parent; // Obtain the producer properties - mlt_properties producer_props = mlt_producer_properties( producer ); + mlt_properties producer_props = MLT_PRODUCER_PROPERTIES( producer ); // Get producer properties char *fg = mlt_properties_get( producer_props, "fgcolour" ); @@ -289,15 +326,31 @@ static void refresh_image( mlt_frame frame, int width, int height ) char *text = mlt_properties_get( producer_props, "text" ); 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 = ( 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 ) + { + 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; @@ -307,6 +360,7 @@ static void refresh_image( mlt_frame frame, int width, int height ) 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 ) { @@ -334,7 +388,7 @@ 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 ); + pixbuf = pango_get_pixbuf( markup, text, font, fgcolor, bgcolor, pad, align, weight, size ); if ( pixbuf != NULL ) { @@ -409,44 +463,62 @@ static void refresh_image( mlt_frame frame, int width, int height ) static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_format *format, int *width, int *height, int writable ) { // Obtain properties of frame - mlt_properties properties = mlt_frame_properties( 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 ); - 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; } @@ -454,7 +526,7 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form static uint8_t *producer_get_alpha_mask( mlt_frame this ) { // Obtain properties of frame - mlt_properties properties = mlt_frame_properties( this ); + mlt_properties properties = MLT_FRAME_PROPERTIES( this ); // Return the alpha mask return mlt_properties_get_data( properties, "alpha", NULL ); @@ -468,13 +540,19 @@ static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int i *frame = mlt_frame_init( ); // Obtain properties of frame and producer - mlt_properties properties = mlt_frame_properties( *frame ); + mlt_properties properties = MLT_FRAME_PROPERTIES( *frame ); // 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 ); @@ -486,9 +564,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 ); @@ -529,9 +604,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 ) +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; @@ -540,11 +614,16 @@ static GdkPixbuf *pango_get_pixbuf( const char *markup, const char *text, const FT_Bitmap bitmap; uint8_t *src = NULL; uint8_t* dest = NULL; + uint8_t *d, *s, a; int stride; + PangoFontDescription *desc = pango_font_description_from_string( font ); pango_ft2_font_map_set_resolution( fontmap, 72, 72 ); pango_layout_set_width( layout, -1 ); // set wrapping constraints - pango_layout_set_font_description( layout, pango_font_description_from_string( font ) ); + pango_font_description_set_weight( desc, ( PangoWeight ) weight ); + if ( size != 0 ) + pango_font_description_set_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 ) @@ -552,7 +631,7 @@ static GdkPixbuf *pango_get_pixbuf( const char *markup, const char *text, const else if ( text != NULL && strcmp( text, "" ) != 0 ) pango_layout_set_text( layout, text, strlen( text ) ); else - return NULL; + 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 ); @@ -574,23 +653,28 @@ static GdkPixbuf *pango_get_pixbuf( const char *markup, const char *text, const src = bitmap.buffer; x = ( gdk_pixbuf_get_width( pixbuf ) - w - 2 * pad ) * align / 2 + pad; dest = gdk_pixbuf_get_pixels( pixbuf ) + 4 * x + pad * stride; - for ( j = 0; j < h; j++ ) + j = h; + + while( j -- ) { - uint8_t *d = dest; - for ( i = 0; i < w; i++ ) + d = dest; + s = src; + i = w; + while( i -- ) { - float a = ( float ) bitmap.buffer[ j * bitmap.pitch + i ] / 255.0; - *d++ = ( int ) ( a * fg.r + ( 1 - a ) * bg.r ); - *d++ = ( int ) ( a * fg.g + ( 1 - a ) * bg.g ); - *d++ = ( int ) ( a * fg.b + ( 1 - a ) * bg.b ); - *d++ = ( int ) ( a * fg.a + ( 1 - a ) * bg.a ); + a = *s ++; + *d++ = ( a * fg.r + ( 255 - a ) * bg.r ) >> 8; + *d++ = ( a * fg.g + ( 255 - a ) * bg.g ) >> 8; + *d++ = ( a * fg.b + ( 255 - a ) * bg.b ) >> 8; + *d++ = ( a * fg.a + ( 255 - a ) * bg.a ) >> 8; } dest += stride; + 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; }