X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fgtk2%2Fproducer_pango.c;h=c26e61a5977be9e9065b1ccb5148467ae5b152f3;hb=d7ae73d25cf5a38a3a8153ae52409fcbef16bb22;hp=523238982053e7787d68871ac3df11db80c8efd1;hpb=36aad7b318537612374acfd3f626a8c1364ad95d;p=melted diff --git a/src/modules/gtk2/producer_pango.c b/src/modules/gtk2/producer_pango.c index 5232389..c26e61a 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,6 +55,24 @@ 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 ); +/** Parse the alignment property. +*/ + +static int alignment_parse( char* align ) +{ + int ret = pango_align_left; + + if ( align == NULL ); + else if ( isdigit( align[ 0 ] ) ) + ret = atoi( align ); + else if ( align[ 0 ] == 'c' || align[ 0 ] == 'm' ) + ret = pango_align_center; + else if ( align[ 0 ] == 'r' ) + ret = pango_align_right; + + return ret; +} + mlt_producer producer_pango_init( const char *filename ) { producer_pango this = calloc( sizeof( struct producer_pango_s ), 1 ); @@ -72,31 +90,29 @@ mlt_producer producer_pango_init( const char *filename ) 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, "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 ); if ( filename == NULL ) { - mlt_properties_set( properties, "resource", "pango" ); mlt_properties_set( properties, "markup", "" ); } - else if ( filename[ 0 ] == '+' ) + else if ( filename[ 0 ] == '+' || strstr( filename, "/+" ) ) { - char *markup = strdup( filename + 1 ); + 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( markup ); + free( copy ); } else { @@ -132,7 +148,6 @@ mlt_producer producer_pango_init( const char *filename ) } else { - mlt_properties_set( properties, "resource", "pango" ); mlt_properties_set( properties, "markup", "" ); } } @@ -143,6 +158,68 @@ mlt_producer producer_pango_init( const char *filename ) return NULL; } +static void set_string( char **string, char *value, char *fallback ) +{ + if ( value != 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; + } +} + +rgba_color parse_color( char *color ) +{ + rgba_color result = { 0xff, 0xff, 0xff, 0xff }; + + 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 void refresh_image( mlt_frame frame, int width, int height ) { // Pixbuf @@ -161,60 +238,41 @@ static void refresh_image( mlt_frame frame, int width, int height ) 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" ); - int align = mlt_properties_get_int( producer_props, "align" ); + char *fg = mlt_properties_get( producer_props, "fgcolour" ); + char *bg = mlt_properties_get( producer_props, "bgcolour" ); + int align = alignment_parse( mlt_properties_get( producer_props, "align" ) ); int pad = mlt_properties_get_int( producer_props, "pad" ); char *markup = mlt_properties_get( producer_props, "markup" ); char *text = mlt_properties_get( producer_props, "text" ); 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 ); - property_changed = property_changed || ( align != this->align ); + 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 ) ); // Save the properties for next comparison - this->fgcolor = fg; - this->bgcolor = bg; this->align = align; this->pad = pad; - if ( markup != NULL ) - { - free( this->markup ); - this->markup = strdup( markup ); - } - if ( text != NULL ) - { - free( this->text ); - this->text = strdup( text ); - } - if ( 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 ); + + mlt_pool_release( this->image ); + mlt_pool_release( this->alpha ); + this->image = NULL; + this->alpha = NULL; // Render the title pixbuf = pango_get_pixbuf( markup, text, font, fgcolor, bgcolor, pad, align ); @@ -232,54 +290,50 @@ static void refresh_image( mlt_frame frame, int width, int height ) this->height = gdk_pixbuf_get_height( pixbuf ); } } - else if ( this->image == NULL || width != this->width || height != this->height ) + else if ( width > 0 && ( this->image == NULL || width != this->width || height != this->height ) ) { + mlt_pool_release( this->image ); + mlt_pool_release( this->alpha ); + this->image = NULL; + this->alpha = NULL; + pixbuf = mlt_properties_get_data( producer_props, "pixbuf", NULL ); } // If we have a pixbuf and a valid width if ( pixbuf && width > 0 ) { + char *interps = mlt_properties_get( properties, "rescale.interp" ); + int interp = GDK_INTERP_BILINEAR; + + if ( strcmp( interps, "nearest" ) == 0 ) + interp = GDK_INTERP_NEAREST; + else if ( strcmp( interps, "tiles" ) == 0 ) + interp = GDK_INTERP_TILES; + 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 ); + // Note - the original pixbuf is already safe and ready for destruction - pixbuf = gdk_pixbuf_scale_simple( pixbuf, width, height, GDK_INTERP_HYPER ); + pixbuf = gdk_pixbuf_scale_simple( pixbuf, width, height, interp ); // Store width and height - this->width = gdk_pixbuf_get_width( pixbuf ); - this->height = gdk_pixbuf_get_height( pixbuf ); + this->width = width; + this->height = height; - // Allocate/define image and alpha - uint8_t *image = malloc( this->width * this->height * 2 ); - uint8_t *alpha = NULL; + // Allocate/define image + this->image = mlt_pool_alloc( width * ( height + 1 ) * 2 ); + this->alpha = mlt_pool_alloc( this->width * this->height ); - // Extract YUV422 and alpha - if ( gdk_pixbuf_get_has_alpha( pixbuf ) ) - { - // Allocate the alpha mask - alpha = malloc( this->width * this->height ); - - // Convert the image - mlt_convert_rgb24a_to_yuv422( gdk_pixbuf_get_pixels( pixbuf ), - this->width, this->height, - gdk_pixbuf_get_rowstride( pixbuf ), - image, alpha ); - } - else - { - // No alpha to extract - mlt_convert_rgb24_to_yuv422( gdk_pixbuf_get_pixels( pixbuf ), - this->width, this->height, - gdk_pixbuf_get_rowstride( pixbuf ), - image ); - } + // Convert the image + mlt_convert_rgb24a_to_yuv422( gdk_pixbuf_get_pixels( pixbuf ), + this->width, this->height, + gdk_pixbuf_get_rowstride( pixbuf ), + this->image, this->alpha ); // Finished with pixbuf now g_object_unref( pixbuf ); - - // if single picture, reference the image and alpha in the producer - free( this->image ); - this->image = image; - free( this->alpha ); - this->alpha = alpha; } // Set width/height @@ -288,8 +342,8 @@ static void refresh_image( mlt_frame frame, int width, int 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" ) ); - // pass the image and alpha data without destructor - mlt_properties_set_data( properties, "image", this->image, this->width * this->height * 2, NULL, NULL ); + // pass the image data without destructor + mlt_properties_set_data( properties, "image", this->image, this->width * ( this->height + 1 ) * 2, NULL, NULL ); mlt_properties_set_data( properties, "alpha", this->alpha, this->width * this->height, NULL, NULL ); } @@ -298,9 +352,16 @@ 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 ); + *width = mlt_properties_get_int( properties, "rescale_width" ); + *height = mlt_properties_get_int( properties, "rescale_height" ); + // Refresh the image 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; @@ -315,14 +376,14 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form if ( writable ) { // Clone our image - uint8_t *copy = malloc( size ); + uint8_t *copy = mlt_pool_alloc( 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 ); + mlt_properties_set_data( properties, "image", copy, size, ( mlt_destructor )mlt_pool_release, NULL ); } // Pass on the image @@ -356,7 +417,11 @@ static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int i // Refresh the pango image refresh_image( *frame, 0, 0 ); - // Set alpha mask call back + // Set producer-specific frame properties + mlt_properties_set_int( properties, "progressive", 1 ); + mlt_properties_set_double( properties, "aspect_ratio", mlt_properties_get_double( properties, "real_width" ) / mlt_properties_get_double( properties, "real_height" ) ); + + // Set alpha call back ( *frame )->get_alpha_mask = producer_get_alpha_mask; // Stack the get image callback @@ -374,8 +439,10 @@ 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; - free( this->image ); - free( this->alpha ); + mlt_pool_release( this->image ); + mlt_pool_release( this->alpha ); + free( this->fgcolor ); + free( this->bgcolor ); free( this->markup ); free( this->text ); free( this->font ); @@ -437,10 +504,12 @@ static GdkPixbuf *pango_get_pixbuf( const char *markup, const char *text, const bitmap.width = w; bitmap.pitch = 32 * ( ( w + 31 ) / 31 ); bitmap.rows = h; - bitmap.buffer = ( unsigned char * ) calloc( 1, h * bitmap.pitch ); + bitmap.buffer = mlt_pool_alloc( h * bitmap.pitch ); bitmap.num_grays = 256; bitmap.pixel_mode = ft_pixel_mode_grays; + memset( bitmap.buffer, 0, h * bitmap.pitch ); + pango_ft2_render_layout( &bitmap, layout, 0, 0 ); src = bitmap.buffer; @@ -459,8 +528,7 @@ static GdkPixbuf *pango_get_pixbuf( const char *markup, const char *text, const } dest += stride; } - free( bitmap.buffer ); - + mlt_pool_release( bitmap.buffer ); g_object_unref( layout ); g_object_unref( context ); g_object_unref( fontmap );