X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fgtk2%2Fproducer_pango.c;h=c293d86f334d7f96b375c43c7cda88f4b0e2574d;hb=6159bd78fa8e72c784747776a2c4c63d9c461ff5;hp=c1bf1d3f467ac4f8d42e1f5e3597731cdde9da8f;hpb=9390e8b584f3f717f0a326893c0e37cf187a0a51;p=melted diff --git a/src/modules/gtk2/producer_pango.c b/src/modules/gtk2/producer_pango.c index c1bf1d3..c293d86 100644 --- a/src/modules/gtk2/producer_pango.c +++ b/src/modules/gtk2/producer_pango.c @@ -33,8 +33,8 @@ struct producer_pango_s int height; uint8_t *image; uint8_t *alpha; - int fgcolor; - int bgcolor; + char *fgcolor; + char *bgcolor; int align; int pad; char *markup; @@ -55,7 +55,7 @@ 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 ); -mlt_producer producer_pango_init( const char *markup ) +mlt_producer producer_pango_init( const char *filename ) { producer_pango this = calloc( sizeof( struct producer_pango_s ), 1 ); if ( this != NULL && mlt_producer_init( &this->parent, this ) == 0 ) @@ -72,19 +72,69 @@ mlt_producer producer_pango_init( const char *markup ) mlt_properties properties = mlt_producer_properties( &this->parent ); // Set the default properties - mlt_properties_set_int( properties, "video_standard", mlt_video_standard_pal ); - mlt_properties_set_int( properties, "fgcolor", 0xffffffff ); - mlt_properties_set_int( properties, "bgcolor", 0x00000000 ); + mlt_properties_set( properties, "fgcolour", "0xffffffff" ); + mlt_properties_set( properties, "bgcolour", "0x00000000" ); mlt_properties_set_int( properties, "align", pango_align_left ); mlt_properties_set_int( properties, "pad", 0 ); - mlt_properties_set( properties, "markup", ( char * ) ( markup == NULL ? "" : markup ) ); mlt_properties_set( properties, "text", "" ); mlt_properties_set( properties, "font", "Sans 48" ); - mlt_properties_set_int( properties, "x", 0 ); - mlt_properties_set_int( properties, "y", 0 ); - mlt_properties_set_double( properties, "mix", 1.0 ); - mlt_properties_set( properties, "resource", "pango" ); + if ( filename == NULL ) + { + mlt_properties_set( properties, "resource", "pango" ); + mlt_properties_set( properties, "markup", "" ); + } + else if ( filename[ 0 ] == '+' || strstr( filename, "/+" ) ) + { + char *copy = strdup( filename + 1 ); + char *markup = copy; + if ( strstr( markup, "/+" ) ) + markup = strstr( markup, "/+" ) + 2; + ( *strrchr( markup, '.' ) ) = '\0'; + while ( strchr( markup, '~' ) ) + ( *strchr( markup, '~' ) ) = '\n'; + mlt_properties_set( properties, "resource", ( char * )filename ); + mlt_properties_set( properties, "markup", markup ); + free( copy ); + } + else + { + FILE *f = fopen( filename, "r" ); + if ( f != NULL ) + { + char line[81]; + char *markup = NULL; + size_t size = 0; + line[80] = '\0'; + + while ( fgets( line, 80, f ) ) + { + size += strlen( line ) + 1; + if ( markup ) + { + markup = realloc( markup, size ); + strcat( markup, line ); + } + else + { + markup = strdup( line ); + } + } + fclose( f ); + + 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 ) ); + free( markup ); + } + else + { + mlt_properties_set( properties, "resource", "pango" ); + mlt_properties_set( properties, "markup", "" ); + } + } return producer; } @@ -92,65 +142,88 @@ mlt_producer producer_pango_init( const char *markup ) return NULL; } -static int producer_get_image( mlt_frame this, uint8_t **buffer, mlt_image_format *format, int *width, int *height, int writable ) +static void set_string( char **string, char *value, char *fallback ) { - // Obtain properties of frame - mlt_properties properties = mlt_frame_properties( this ); - - // 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 ); - - // Get width and height - *width = mlt_properties_get_int( properties, "width" ); - *height = mlt_properties_get_int( properties, "height" ); - - // Clone if necessary - if ( writable ) + if ( value != NULL ) { - // Clone our image - uint8_t *copy = malloc( 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 ); + free( *string ); + *string = strdup( value ); + } + else if ( *string == NULL && fallback != NULL ) + { + *string = strdup( fallback ); + } + else if ( *string != NULL && fallback == NULL ) + { + free( *string ); + *string = NULL; } - - // Pass on the image - *buffer = image; - - return 0; } -static uint8_t *producer_get_alpha_mask( mlt_frame this ) +rgba_color parse_color( char *color ) { - // Obtain properties of frame - mlt_properties properties = mlt_frame_properties( this ); + rgba_color result = { 0xff, 0xff, 0xff, 0xff }; - // Return the alpha mask - return mlt_properties_get_data( properties, "alpha", NULL ); + if ( !strncmp( color, "0x", 2 ) ) + { + unsigned int temp = 0; + sscanf( color + 2, "%x", &temp ); + result.r = ( temp >> 24 ) & 0xff; + result.g = ( temp >> 16 ) & 0xff; + result.b = ( temp >> 8 ) & 0xff; + result.a = ( temp ) & 0xff; + } + else if ( !strcmp( color, "red" ) ) + { + result.r = 0xff; + result.g = 0x00; + result.b = 0x00; + } + else if ( !strcmp( color, "green" ) ) + { + result.r = 0x00; + result.g = 0xff; + result.b = 0x00; + } + else if ( !strcmp( color, "blue" ) ) + { + result.r = 0x00; + result.g = 0x00; + result.b = 0xff; + } + else + { + unsigned int temp = 0; + sscanf( color, "%d", &temp ); + result.r = ( temp >> 24 ) & 0xff; + result.g = ( temp >> 16 ) & 0xff; + result.b = ( temp >> 8 ) & 0xff; + result.a = ( temp ) & 0xff; + } + + return result; } -static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int index ) +static void refresh_image( mlt_frame frame, int width, int height ) { - producer_pango this = producer->child; + // Pixbuf GdkPixbuf *pixbuf = NULL; - // Generate a frame - *frame = mlt_frame_init( ); + // Obtain properties of frame + mlt_properties properties = mlt_frame_properties( frame ); - // Obtain properties of frame and producer - 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 ); + + // Obtain the producer + mlt_producer producer = &this->parent; + + // Obtain the producer properties mlt_properties producer_props = mlt_producer_properties( producer ); - + // Get producer properties - int fg = mlt_properties_get_int( producer_props, "fgcolor" ); - int bg = mlt_properties_get_int( producer_props, "bgcolor" ); + 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 pad = mlt_properties_get_int( producer_props, "pad" ); char *markup = mlt_properties_get( producer_props, "markup" ); @@ -158,8 +231,8 @@ static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int i char *font = mlt_properties_get( producer_props, "font" ); // See if any properties changed - int property_changed = ( fg != this->fgcolor ); - property_changed = property_changed || ( bg != this->bgcolor ); + 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 ); property_changed = property_changed || ( pad != this->pad ); property_changed = property_changed || ( markup && this->markup && strcmp( markup, this->markup ) ); @@ -167,72 +240,45 @@ static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int i property_changed = property_changed || ( font && this->font && strcmp( font, this->font ) ); // Save the properties for next comparison - this->fgcolor = fg; - this->bgcolor = bg; this->align = align; this->pad = pad; - if ( markup != NULL ) - { - if ( this->markup != NULL ) - free( this->markup ); - this->markup = strdup( markup ); - } - if ( text != NULL ) - { - if ( this->text != NULL ) - free( this->text ); - this->text = strdup( text ); - } - if ( font != NULL ) - { - if ( this->font != NULL ) - free( this->font ); - this->font = strdup( font ); - } + 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" ); if ( property_changed ) { - rgba_color fgcolor = - { - ( fg & 0xff000000 ) >> 24, - ( fg & 0x00ff0000 ) >> 16, - ( fg & 0x0000ff00 ) >> 8, - ( fg & 0x000000ff ) - }; - rgba_color bgcolor = - { - ( bg & 0xff000000 ) >> 24, - ( bg & 0x00ff0000 ) >> 16, - ( bg & 0x0000ff00 ) >> 8, - ( bg & 0x000000ff ) - }; + rgba_color fgcolor = parse_color( this->fgcolor ); + rgba_color bgcolor = parse_color( this->bgcolor ); // Render the title pixbuf = pango_get_pixbuf( markup, text, font, fgcolor, bgcolor, pad, align ); - } - // If we have a pixbuf - if ( pixbuf ) - { - // Scale to adjust for sample aspect ratio - if ( mlt_properties_get_int( properties, "video_standard" ) == mlt_video_standard_pal ) - { - GdkPixbuf *temp = pixbuf; - GdkPixbuf *scaled = gdk_pixbuf_scale_simple( pixbuf, - (gint) ( (float) gdk_pixbuf_get_width( pixbuf ) * 54.0/59.0), - gdk_pixbuf_get_height( pixbuf ), GDK_INTERP_HYPER ); - pixbuf = scaled; - g_object_unref( temp ); - } - else + if ( pixbuf != NULL ) { - GdkPixbuf *temp = pixbuf; - GdkPixbuf *scaled = gdk_pixbuf_scale_simple( pixbuf, - (gint) ( (float) gdk_pixbuf_get_width( pixbuf ) * 11.0/10.0 ), - gdk_pixbuf_get_height( pixbuf ), GDK_INTERP_HYPER ); - pixbuf = scaled; - g_object_unref( temp ); + // Register this pixbuf for destruction and reuse + mlt_properties_set_data( producer_props, "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 ) ); + + // Store the width/height of the pixbuf temporarily + this->width = gdk_pixbuf_get_width( pixbuf ); + this->height = gdk_pixbuf_get_height( pixbuf ); } + } + else if ( this->image == NULL || width != this->width || height != this->height ) + { + pixbuf = mlt_properties_get_data( producer_props, "pixbuf", NULL ); + } + + // If we have a pixbuf and a valid width + if ( pixbuf && width > 0 ) + { + // Note - the original pixbuf is already safe and ready for destruction + pixbuf = gdk_pixbuf_scale_simple( pixbuf, width, height, GDK_INTERP_HYPER ); // Store width and height this->width = gdk_pixbuf_get_width( pixbuf ); @@ -267,39 +313,94 @@ static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int i g_object_unref( pixbuf ); // if single picture, reference the image and alpha in the producer - if ( this->image != NULL ) - free( this->image ); + free( this->image ); this->image = image; - if ( this->alpha != NULL ) - free( this->alpha ); + free( this->alpha ); this->alpha = alpha; - } - if ( this->image != NULL ) - { - // Set width/height - mlt_properties_set_int( properties, "width", this->width ); - mlt_properties_set_int( properties, "height", this->height ); + // Set width/height + mlt_properties_set_int( properties, "width", this->width ); + mlt_properties_set_int( properties, "height", this->height ); + mlt_properties_set_int( properties, "real_width", mlt_properties_get_int( producer_props, "real_width" ) ); + mlt_properties_set_int( properties, "real_height", mlt_properties_get_int( producer_props, "real_height" ) ); - // Set the compositing properties - mlt_properties_set_int( properties, "x", mlt_properties_get_int( producer_props, "x" ) ); - mlt_properties_set_int( properties, "y", mlt_properties_get_int( producer_props, "y" ) ); - mlt_properties_set_double( properties, "mix", mlt_properties_get_double( producer_props, "mix" ) ); + // pass the image and alpha data without destructor + mlt_properties_set_data( properties, "image", this->image, this->width * this->height * 2, NULL, NULL ); + mlt_properties_set_data( properties, "alpha", this->alpha, this->width * this->height, NULL, NULL ); +} - // if picture sequence pass the image and alpha data without destructor - mlt_properties_set_data( properties, "image", this->image, 0, NULL, NULL ); - mlt_properties_set_data( properties, "alpha", this->alpha, 0, NULL, NULL ); +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 ); + + // Refresh the image + refresh_image( frame, *width, *height ); + + // 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 ); + + // Get width and height + *width = mlt_properties_get_int( properties, "width" ); + *height = mlt_properties_get_int( properties, "height" ); - // Set alpha mask call back - ( *frame )->get_alpha_mask = producer_get_alpha_mask; + // Clone if necessary + if ( writable ) + { + // Clone our image + uint8_t *copy = malloc( size ); + memcpy( copy, image, size ); - // Stack the get image callback - mlt_frame_push_get_image( *frame, producer_get_image ); + // 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 ); } + // Pass on the image + *buffer = image; + + return 0; +} + +static uint8_t *producer_get_alpha_mask( mlt_frame this ) +{ + // Obtain properties of frame + mlt_properties properties = mlt_frame_properties( this ); + + // Return the alpha mask + return mlt_properties_get_data( properties, "alpha", NULL ); +} + +static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int index ) +{ + producer_pango this = producer->child; + + // Generate a frame + *frame = mlt_frame_init( ); + + // Obtain properties of frame and producer + 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 ); + + // Refresh the pango image + refresh_image( *frame, 0, 0 ); + + // Set alpha mask call back + ( *frame )->get_alpha_mask = producer_get_alpha_mask; + + // 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_timecode( *frame, mlt_producer_position( producer ) ); + mlt_frame_set_position( *frame, mlt_producer_position( producer ) ); // Calculate the next timecode mlt_producer_prepare_next( producer ); @@ -310,16 +411,13 @@ static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int i static void producer_close( mlt_producer parent ) { producer_pango this = parent->child; - if ( this->image != NULL ) - free( this->image ); - if ( this->alpha != NULL ) - free( this->alpha ); - if ( this->markup != NULL ) - free( this->markup ); - if ( this->text != NULL ) - free( this->text ); - if ( this->font != NULL ) - free( this->font ); + free( this->image ); + free( this->alpha ); + free( this->fgcolor ); + free( this->bgcolor ); + free( this->markup ); + free( this->text ); + free( this->font ); parent->close = NULL; mlt_producer_close( parent ); free( this );