X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fgtk2%2Fproducer_pango.c;h=c26e61a5977be9e9065b1ccb5148467ae5b152f3;hb=d7c316a3c4475397f4ee000b6d8422183aaa7838;hp=a626a9db60e78e02295444ccdb9f7ca527a532f6;hpb=74268cd86c30a0af9f03981c799aa4bba253c6e9;p=melted diff --git a/src/modules/gtk2/producer_pango.c b/src/modules/gtk2/producer_pango.c index a626a9d..c26e61a 100644 --- a/src/modules/gtk2/producer_pango.c +++ b/src/modules/gtk2/producer_pango.c @@ -32,6 +32,7 @@ struct producer_pango_s int width; int height; uint8_t *image; + uint8_t *alpha; char *fgcolor; char *bgcolor; int align; @@ -54,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 ); @@ -80,7 +99,6 @@ mlt_producer producer_pango_init( const char *filename ) if ( filename == NULL ) { - mlt_properties_set( properties, "resource", "pango" ); mlt_properties_set( properties, "markup", "" ); } else if ( filename[ 0 ] == '+' || strstr( filename, "/+" ) ) @@ -130,7 +148,6 @@ mlt_producer producer_pango_init( const char *filename ) } else { - mlt_properties_set( properties, "resource", "pango" ); mlt_properties_set( properties, "markup", "" ); } } @@ -223,16 +240,16 @@ static void refresh_image( mlt_frame frame, int width, int height ) // Get producer properties 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 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 = ( 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 ); + 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 ) ); @@ -252,6 +269,11 @@ static void refresh_image( mlt_frame frame, int width, int height ) 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 ); @@ -266,45 +288,52 @@ static void refresh_image( mlt_frame frame, int width, int height ) // Store the width/height of the pixbuf temporarily this->width = gdk_pixbuf_get_width( pixbuf ); this->height = gdk_pixbuf_get_height( pixbuf ); - - mlt_properties_set_int( producer_props, "bpp", gdk_pixbuf_get_has_alpha( pixbuf ) ? 4 : 3 ); } } - 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 ); - mlt_properties_set_int( producer_props, "bpp", gdk_pixbuf_get_has_alpha( pixbuf ) ? 4 : 3 ); } - int bpp = mlt_properties_get_int( producer_props, "bpp" ); - // If we have a pixbuf and a valid width if ( pixbuf && width > 0 ) { - int i; - + 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 - // IRRIGATE ME - uint8_t *image = malloc( this->width * ( this->height + 1 )* bpp ); + this->image = mlt_pool_alloc( width * ( height + 1 ) * 2 ); + this->alpha = mlt_pool_alloc( this->width * this->height ); - for ( i = 0; i < height; i++ ) - memcpy( image + i * width * bpp, - gdk_pixbuf_get_pixels( pixbuf ) + i * gdk_pixbuf_get_rowstride( pixbuf ), - gdk_pixbuf_get_width( pixbuf ) * bpp ); + // 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 ); - - // reference the image in the producer - free( this->image ); - this->image = image; } // Set width/height @@ -314,7 +343,8 @@ static void refresh_image( mlt_frame frame, int width, int height ) mlt_properties_set_int( properties, "real_height", mlt_properties_get_int( producer_props, "real_height" ) ); // pass the image data without destructor - mlt_properties_set_data( properties, "image", this->image, this->width * ( this->height + 1 ) * bpp, NULL, NULL ); + 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 ); } static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_format *format, int *width, int *height, int writable ) @@ -322,12 +352,15 @@ 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; + //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; @@ -343,15 +376,14 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form if ( writable ) { // Clone our image - // IRRIGATE ME - 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 @@ -360,6 +392,15 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form 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; @@ -380,6 +421,9 @@ static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int i 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 mlt_frame_push_get_image( *frame, producer_get_image ); @@ -395,7 +439,8 @@ 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 ); + mlt_pool_release( this->image ); + mlt_pool_release( this->alpha ); free( this->fgcolor ); free( this->bgcolor ); free( this->markup ); @@ -459,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; @@ -481,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 );