X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmodules%2Fgtk2%2Fproducer_pango.c;h=ba902bd6f4e14385fc90861165ea58e0e2ce8863;hb=2e8969380c3bd190791cea6bf045e30d068ea480;hp=52bf2ff20bb12454769a6ffd752b64c900429b61;hpb=6fbad87cfc97a367c4e47216b83c9e433253aa9e;p=mlt diff --git a/src/modules/gtk2/producer_pango.c b/src/modules/gtk2/producer_pango.c index 52bf2ff2..ba902bd6 100644 --- a/src/modules/gtk2/producer_pango.c +++ b/src/modules/gtk2/producer_pango.c @@ -18,35 +18,48 @@ * 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 #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 { struct mlt_producer_s parent; - int width; - int height; - uint8_t *image; - uint8_t *alpha; + int width; + int height; + GdkPixbuf *pixbuf; char *fgcolor; char *bgcolor; + char *olcolor; int align; int pad; + int outline; char *markup; char *text; char *font; - int weight; + char *family; + int size; + int style; + int weight; }; // special color type used by internal pango routines @@ -60,7 +73,9 @@ 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, int size ); + rgba_color fg, rgba_color bg, rgba_color ol, int pad, int align, char* family, int style, int weight, int size, int outline ); +static void fill_pixbuf( GdkPixbuf* pixbuf, FT_Bitmap* bitmap, int w, int h, int pad, int align, rgba_color fg, rgba_color bg ); +static void fill_pixbuf_with_outline( GdkPixbuf* pixbuf, FT_Bitmap* bitmap, int w, int h, int pad, int align, rgba_color fg, rgba_color bg, rgba_color ol, int outline ); /** Return nonzero if the two strings are equal, ignoring case, up to the first n characters. @@ -78,7 +93,7 @@ int strncaseeq(const char *s1, const char *s2, size_t n) /** Parse the alignment property. */ -static int alignment_parse( char* align ) +static int parse_alignment( char* align ) { int ret = pango_align_left; @@ -93,11 +108,22 @@ static int alignment_parse( char* align ) return ret; } +/** Parse the style property. +*/ + +static int parse_style( char* style ) +{ + int ret = PANGO_STYLE_NORMAL; + if( !strncmp(style, "italic", 6) ) + ret = PANGO_STYLE_ITALIC; + return ret; +} + static PangoFT2FontMap *fontmap = NULL; mlt_producer producer_pango_init( const char *filename ) { - producer_pango this = calloc( sizeof( struct producer_pango_s ), 1 ); + producer_pango this = calloc( 1, sizeof( struct producer_pango_s ) ); if ( this != NULL && mlt_producer_init( &this->parent, this ) == 0 ) { mlt_producer producer = &this->parent; @@ -117,14 +143,23 @@ mlt_producer producer_pango_init( const char *filename ) // Set the default properties mlt_properties_set( properties, "fgcolour", "0xffffffff" ); mlt_properties_set( properties, "bgcolour", "0x00000000" ); + mlt_properties_set( properties, "olcolour", "0x00000000" ); mlt_properties_set_int( properties, "align", pango_align_left ); mlt_properties_set_int( properties, "pad", 0 ); + mlt_properties_set_int( properties, "outline", 0 ); mlt_properties_set( properties, "text", "" ); - mlt_properties_set( properties, "font", "Sans 48" ); + mlt_properties_set( properties, "font", NULL ); + mlt_properties_set( properties, "family", "Sans" ); + mlt_properties_set_int( properties, "size", 48 ); + mlt_properties_set( properties, "style", "normal" ); mlt_properties_set( properties, "encoding", "UTF-8" ); mlt_properties_set_int( properties, "weight", PANGO_WEIGHT_NORMAL ); + mlt_properties_set_int( properties, "seekable", 1 ); - if ( filename == NULL ) + if ( filename == NULL || ( filename && ( !strcmp( filename, "" ) + || strstr( filename, "" ) + // workaround for old kdenlive countdown generator + || strstr( filename, "<producer>" ) ) ) ) { mlt_properties_set( properties, "markup", "" ); } @@ -134,10 +169,11 @@ mlt_producer producer_pango_init( const char *filename ) char *markup = copy; if ( strstr( markup, "/+" ) ) markup = strstr( markup, "/+" ) + 2; - ( *strrchr( markup, '.' ) ) = '\0'; + if ( strrchr( markup, '.' ) ) + ( *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 ); } @@ -147,7 +183,7 @@ mlt_producer producer_pango_init( const char *filename ) 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( 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 ); @@ -164,6 +200,7 @@ mlt_producer producer_pango_init( const char *filename ) item.frame = atoi( name ); mlt_geometry_insert( key_frames, &item ); } + mlt_geometry_interpolate( key_frames ); } else { @@ -181,7 +218,8 @@ mlt_producer producer_pango_init( const char *filename ) if ( markup ) { markup = realloc( markup, size ); - strcat( markup, line ); + if ( markup ) + strcat( markup, line ); } else { @@ -190,16 +228,22 @@ mlt_producer producer_pango_init( const char *filename ) } fclose( f ); - if ( markup[ strlen( markup ) - 1 ] == '\n' ) + if ( markup && 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 ); + if ( markup ) + mlt_properties_set( properties, "markup", markup ); + else + mlt_properties_set( properties, "markup", "" ); free( markup ); } else { - mlt_properties_set( properties, "markup", "" ); + producer->close = NULL; + mlt_producer_close( producer ); + producer = NULL; + free( this ); } } @@ -209,7 +253,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 ) { @@ -227,20 +271,11 @@ static void set_string( char **string, char *value, char *fallback ) } } -rgba_color parse_color( char *color ) +rgba_color parse_color( char *color, unsigned int color_int ) { 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" ) ) + if ( !strcmp( color, "red" ) ) { result.r = 0xff; result.g = 0x00; @@ -258,14 +293,12 @@ rgba_color parse_color( char *color ) result.g = 0x00; result.b = 0xff; } - else + else if ( strcmp( color, "white" ) ) { - 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; + result.r = ( color_int >> 24 ) & 0xff; + result.g = ( color_int >> 16 ) & 0xff; + result.b = ( color_int >> 8 ) & 0xff; + result.a = ( color_int ) & 0xff; } return result; @@ -273,13 +306,13 @@ 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; iconv_t cd = iconv_open( "UTF-8", encoding ); - if ( cd != ( iconv_t )-1 ) + if ( text && ( cd != ( iconv_t )-1 ) ) { char *inbuf_p = text; size_t inbuf_n = strlen( text ); @@ -295,15 +328,15 @@ static int iconv_utf8( mlt_properties properties, char *prop_name, const char* e mlt_properties_set( properties, prop_name, "" ); mlt_pool_release( outbuf ); - iconv_close( cd ); result = 0; } + iconv_close( cd ); return result; } static void refresh_image( mlt_frame frame, int width, int height ) { - // Pixbuf + // Pixbuf GdkPixbuf *pixbuf = mlt_properties_get_data( MLT_FRAME_PROPERTIES( frame ), "pixbuf", NULL ); // Obtain properties of frame @@ -321,11 +354,15 @@ 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 = alignment_parse( mlt_properties_get( producer_props, "align" ) ); + char *ol = mlt_properties_get( producer_props, "olcolour" ); + int align = parse_alignment( mlt_properties_get( producer_props, "align" ) ); int pad = mlt_properties_get_int( producer_props, "pad" ); + int outline = mlt_properties_get_int( producer_props, "outline" ); char *markup = mlt_properties_get( producer_props, "markup" ); char *text = mlt_properties_get( producer_props, "text" ); char *font = mlt_properties_get( producer_props, "font" ); + char *family = mlt_properties_get( producer_props, "family" ); + int style = parse_style( mlt_properties_get( producer_props, "style" ) ); 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" ); @@ -334,14 +371,13 @@ static void refresh_image( mlt_frame frame, int width, int height ) 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 ); + mlt_geometry_prev_key( key_frames, &item, mlt_frame_original_position( frame ) ); sprintf( temp, "%d", item.frame ); markup = mlt_properties_get( contents, temp ); } @@ -350,32 +386,42 @@ static void refresh_image( mlt_frame frame, int width, int height ) 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 || ( this->olcolor == NULL || ( ol && strcmp( ol, this->olcolor ) ) ); property_changed = property_changed || ( pad != this->pad ); + property_changed = property_changed || ( outline != this->outline ); 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 || ( family && this->family && strcmp( family, this->family ) ); property_changed = property_changed || ( weight != this->weight ); + property_changed = property_changed || ( style != this->style ); + property_changed = property_changed || ( size != this->size ); // Save the properties for next comparison this->align = align; this->pad = pad; + this->outline = outline; set_string( &this->fgcolor, fg, "0xffffffff" ); set_string( &this->bgcolor, bg, "0x00000000" ); + set_string( &this->olcolor, ol, "0x00000000" ); set_string( &this->markup, markup, NULL ); set_string( &this->text, text, NULL ); - set_string( &this->font, font, "Sans 48" ); + set_string( &this->font, font, NULL ); + set_string( &this->family, family, "Sans" ); this->weight = weight; + this->style = style; + this->size = size; } if ( pixbuf == NULL && property_changed ) { - rgba_color fgcolor = parse_color( this->fgcolor ); - rgba_color bgcolor = parse_color( this->bgcolor ); + rgba_color fgcolor = parse_color( this->fgcolor, mlt_properties_get_int( producer_props, "fgcolour" ) ); + rgba_color bgcolor = parse_color( this->bgcolor, mlt_properties_get_int( producer_props, "bgcolour" ) ); + rgba_color olcolor = parse_color( this->olcolor, mlt_properties_get_int( producer_props, "olcolour" ) ); - mlt_pool_release( this->image ); - mlt_pool_release( this->alpha ); - this->image = NULL; - this->alpha = NULL; + if ( this->pixbuf ) + g_object_unref( this->pixbuf ); + this->pixbuf = NULL; // Convert from specified encoding to UTF-8 if ( encoding != NULL && !strncaseeq( encoding, "utf-8", 5 ) && !strncaseeq( encoding, "utf8", 4 ) ) @@ -393,7 +439,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, weight, size ); + pixbuf = pango_get_pixbuf( markup, text, font, fgcolor, bgcolor, olcolor, pad, align, family, style, weight, size, outline ); if ( pixbuf != NULL ) { @@ -402,21 +448,19 @@ static void refresh_image( mlt_frame frame, int width, int height ) 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 ) ); + mlt_properties_set_int( producer_props, "meta.media.width", gdk_pixbuf_get_width( pixbuf ) ); + mlt_properties_set_int( producer_props, "meta.media.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 ( pixbuf == NULL && ( width > 0 && ( this->image == NULL || width != this->width || height != this->height ) ) ) + else if ( pixbuf == NULL && width > 0 && ( this->pixbuf == NULL || width != this->width || height != this->height ) ) { - mlt_pool_release( this->image ); - mlt_pool_release( this->alpha ); - this->image = NULL; - this->alpha = NULL; - + if ( this->pixbuf ) + g_object_unref( this->pixbuf ); + this->pixbuf = NULL; pixbuf = mlt_properties_get_data( producer_props, "pixbuf", NULL ); } @@ -430,121 +474,77 @@ static void refresh_image( mlt_frame frame, int width, int height ) interp = GDK_INTERP_NEAREST; else if ( strcmp( interps, "tiles" ) == 0 ) interp = GDK_INTERP_TILES; - else if ( strcmp( interps, "hyper" ) == 0 ) + else if ( strcmp( interps, "hyper" ) == 0 || strcmp( interps, "bicubic" ) == 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 ); + this->pixbuf = gdk_pixbuf_scale_simple( pixbuf, width, height, interp ); // Store width and height this->width = width; this->height = height; - - // Allocate/define image - this->image = mlt_pool_alloc( width * ( height + 1 ) * 2 ); - this->alpha = mlt_pool_alloc( 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 ), - this->image, this->alpha ); - - // Finished with pixbuf now - g_object_unref( pixbuf ); } // 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" ) ); - - // 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 ); } static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_format *format, int *width, int *height, int writable ) { + int error = 0; + producer_pango this = ( producer_pango ) mlt_frame_pop_service( frame ); + // 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" ); + mlt_service_lock( MLT_PRODUCER_SERVICE( &this->parent ) ); + // Refresh the image pthread_mutex_lock( &pango_mutex ); refresh_image( frame, *width, *height ); - // Get the image - *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" ); + *width = this->width; + *height = this->height; + *format = mlt_image_rgb24a; // Always clone here to allow 'animated' text - if ( *buffer != NULL ) + if ( this->pixbuf ) { - // Clone the image and the alpha - uint8_t *image_copy = mlt_pool_alloc( image_size ); - uint8_t *alpha_copy = mlt_pool_alloc( alpha_size ); - - 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 ); + // Clone the image + int image_size = this->width * this->height * 4; + *buffer = mlt_pool_alloc( image_size ); + memcpy( *buffer, gdk_pixbuf_get_pixels( this->pixbuf ), image_size ); // Now update properties so we free the copy after - 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; + mlt_frame_set_image( frame, *buffer, image_size, mlt_pool_release ); } 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; + error = 1; } pthread_mutex_unlock( &pango_mutex ); + mlt_service_unlock( MLT_PRODUCER_SERVICE( &this->parent ) ); - 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 ); + return error; } static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int index ) { producer_pango this = producer->child; + // Fetch the producers properties + mlt_properties producer_properties = MLT_PRODUCER_PROPERTIES( producer ); + // 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 ); @@ -554,7 +554,6 @@ static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int i // 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 ); @@ -563,12 +562,14 @@ static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int i // Set producer-specific frame properties mlt_properties_set_int( properties, "progressive", 1 ); - mlt_properties_set_double( properties, "aspect_ratio", 1 ); - - // Set alpha call back - ( *frame )->get_alpha_mask = producer_get_alpha_mask; + double force_ratio = mlt_properties_get_double( producer_properties, "force_aspect_ratio" ); + if ( force_ratio > 0.0 ) + mlt_properties_set_double( properties, "aspect_ratio", force_ratio ); + else + mlt_properties_set_double( properties, "aspect_ratio", 1.0); // Stack the get image callback + mlt_frame_push_service( *frame, this ); mlt_frame_push_get_image( *frame, producer_get_image ); // Calculate the next timecode @@ -580,13 +581,15 @@ 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; - mlt_pool_release( this->image ); - mlt_pool_release( this->alpha ); + if ( this->pixbuf ) + g_object_unref( this->pixbuf ); free( this->fgcolor ); free( this->bgcolor ); + free( this->olcolor ); free( this->markup ); free( this->text ); free( this->font ); + free( this->family ); parent->close = NULL; mlt_producer_close( parent ); free( this ); @@ -611,27 +614,32 @@ 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, int size ) +static GdkPixbuf *pango_get_pixbuf( const char *markup, const char *text, const char *font, rgba_color fg, rgba_color bg, rgba_color ol, int pad, int align, char* family, int style, int weight, int size, int outline ) { PangoContext *context = pango_ft2_font_map_create_context( fontmap ); PangoLayout *layout = pango_layout_new( context ); - int w, h, x; - int i, j; + int w, h; GdkPixbuf *pixbuf = NULL; 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 ); + PangoFontDescription *desc = NULL; - 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 ) + if( font ) + { + // Support for deprecated "font" property. + desc = pango_font_description_from_string( font ); + pango_ft2_font_map_set_resolution( fontmap, 72, 72 ); + } + else + { + desc = pango_font_description_from_string( family ); pango_font_description_set_size( desc, PANGO_SCALE * size ); + pango_font_description_set_style( desc, (PangoStyle) style ); + } + + pango_font_description_set_weight( desc, ( PangoWeight ) weight ); + + pango_layout_set_width( layout, -1 ); // set wrapping constraints 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 ) { @@ -653,11 +661,12 @@ static GdkPixbuf *pango_get_pixbuf( const char *markup, const char *text, const } pango_layout_get_pixel_size( layout, &w, &h ); + if ( pad == 0 ) + pad = 1; + pixbuf = gdk_pixbuf_new( GDK_COLORSPACE_RGB, TRUE /* has alpha */, 8, w + 2 * pad, h + 2 * pad ); pango_draw_background( pixbuf, bg ); - stride = gdk_pixbuf_get_rowstride( pixbuf ); - bitmap.width = w; bitmap.pitch = 32 * ( ( w + 31 ) / 31 ); bitmap.rows = h; @@ -669,10 +678,32 @@ static GdkPixbuf *pango_get_pixbuf( const char *markup, const char *text, const pango_ft2_render_layout( &bitmap, layout, 0, 0 ); - 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; - j = h; + if ( outline ) + { + fill_pixbuf_with_outline( pixbuf, &bitmap, w, h, pad, align, fg, bg, ol, outline ); + } + else + { + fill_pixbuf( pixbuf, &bitmap, w, h, pad, align, fg, bg ); + } + + mlt_pool_release( bitmap.buffer ); + pango_font_description_free( desc ); + g_object_unref( layout ); + g_object_unref( context ); + + return pixbuf; +} + +static void fill_pixbuf( GdkPixbuf* pixbuf, FT_Bitmap* bitmap, int w, int h, int pad, int align, rgba_color fg, rgba_color bg ) +{ + int stride = gdk_pixbuf_get_rowstride( pixbuf ); + uint8_t* src = bitmap->buffer; + int x = ( gdk_pixbuf_get_width( pixbuf ) - w - 2 * pad ) * align / 2 + pad; + uint8_t* dest = gdk_pixbuf_get_pixels( pixbuf ) + 4 * x + pad * stride; + int j = h; + int i = 0; + uint8_t *d, *s, a; while( j -- ) { @@ -688,12 +719,131 @@ static GdkPixbuf *pango_get_pixbuf( const char *markup, const char *text, const *d++ = ( a * fg.a + ( 255 - a ) * bg.a ) >> 8; } dest += stride; - src += bitmap.pitch; + src += bitmap->pitch; } - mlt_pool_release( bitmap.buffer ); - pango_font_description_free( desc ); - g_object_unref( layout ); - g_object_unref( context ); +} - return pixbuf; +static void fill_pixbuf_with_outline( GdkPixbuf* pixbuf, FT_Bitmap* bitmap, int w, int h, int pad, int align, rgba_color fg, rgba_color bg, rgba_color ol, int outline ) +{ + int stride = gdk_pixbuf_get_rowstride( pixbuf ); + int x = ( gdk_pixbuf_get_width( pixbuf ) - w - 2 * pad ) * align / 2 + pad; + uint8_t* dest = gdk_pixbuf_get_pixels( pixbuf ) + 4 * x + pad * stride; + int j ,i; + uint8_t *d = NULL; + float a_ol = 0; + float a_fg = 0; + + for ( j = 0; j < h; j++ ) + { + d = dest; + for ( i = 0; i < w; i++ ) + { +#define geta(x, y) (float) bitmap->buffer[ (y) * bitmap->pitch + (x) ] / 255.0 + + a_ol = geta(i, j); + // One pixel fake circle + if ( i > 0 ) + a_ol = MAX( a_ol, geta(i - 1, j) ); + if ( i < w - 1 ) + a_ol = MAX( a_ol, geta(i + 1, j) ); + if ( j > 0 ) + a_ol = MAX( a_ol, geta(i, j - 1) ); + if ( j < h - 1 ) + a_ol = MAX( a_ol, geta(i, j + 1) ); + if ( outline >= 2 ) { + // Two pixels fake circle + if ( i > 1 ) { + a_ol = MAX( a_ol, geta(i - 2, j) ); + if ( j > 0 ) + a_ol = MAX( a_ol, geta(i - 2, j - 1) ); + if ( j < h - 1 ) + a_ol = MAX( a_ol, geta(i - 2, j + 1) ); + } + if ( i > 0 ) { + if ( j > 0 ) + a_ol = MAX( a_ol, geta(i - 1, j - 1) ); + if ( j > 1 ) + a_ol = MAX( a_ol, geta(i - 1, j - 2) ); + if ( j < h - 1 ) + a_ol = MAX( a_ol, geta(i - 1, j + 1) ); + if ( j < h - 2 ) + a_ol = MAX( a_ol, geta(i - 1, j + 2) ); + } + if ( j > 1 ) + a_ol = MAX( a_ol, geta(i, j - 2) ); + if ( j < h - 2 ) + a_ol = MAX( a_ol, geta(i, j + 2) ); + if ( i < w - 1 ) { + if ( j > 0 ) + a_ol = MAX( a_ol, geta(i + 1, j - 1) ); + if ( j > 1 ) + a_ol = MAX( a_ol, geta(i + 1, j - 2) ); + if ( j < h - 1 ) + a_ol = MAX( a_ol, geta(i + 1, j + 1) ); + if ( j < h - 2 ) + a_ol = MAX( a_ol, geta(i + 1, j + 2) ); + } + if ( i < w - 2 ) { + a_ol = MAX( a_ol, geta(i + 2, j) ); + if ( j > 0 ) + a_ol = MAX( a_ol, geta(i + 2, j - 1) ); + if ( j < h - 1 ) + a_ol = MAX( a_ol, geta(i + 2, j + 1) ); + } + } + if ( outline >= 3 ) { + // Three pixels fake circle + if ( i > 2 ) { + a_ol = MAX( a_ol, geta(i - 3, j) ); + if ( j > 0 ) + a_ol = MAX( a_ol, geta(i - 3, j - 1) ); + if ( j < h - 1 ) + a_ol = MAX( a_ol, geta(i - 3, j + 1) ); + } + if ( i > 1 ) { + if ( j > 1 ) + a_ol = MAX( a_ol, geta(i - 2, j - 2) ); + if ( j < h - 2 ) + a_ol = MAX( a_ol, geta(i - 2, j + 2) ); + } + if ( i > 0 ) { + if ( j > 2 ) + a_ol = MAX( a_ol, geta(i - 1, j - 3) ); + if ( j < h - 3 ) + a_ol = MAX( a_ol, geta(i - 1, j + 3) ); + } + if ( j > 2 ) + a_ol = MAX( a_ol, geta(i, j - 3) ); + if ( j < h - 3 ) + a_ol = MAX( a_ol, geta(i, j + 3) ); + if ( i < w - 1 ) { + if ( j > 2 ) + a_ol = MAX( a_ol, geta(i + 1, j - 3) ); + if ( j < h - 3 ) + a_ol = MAX( a_ol, geta(i + 1, j + 3) ); + } + if ( i < w - 2 ) { + if ( j > 1 ) + a_ol = MAX( a_ol, geta(i + 2, j - 2) ); + if ( j < h - 2 ) + a_ol = MAX( a_ol, geta(i + 2, j + 2) ); + } + if ( i < w - 3 ) { + a_ol = MAX( a_ol, geta(i + 3, j) ); + if ( j > 0 ) + a_ol = MAX( a_ol, geta(i + 3, j - 1) ); + if ( j < h - 1 ) + a_ol = MAX( a_ol, geta(i + 3, j + 1) ); + } + } + + a_fg = ( float ) bitmap->buffer[ j * bitmap->pitch + i ] / 255.0; + + *d++ = ( int ) ( a_fg * fg.r + ( 1 - a_fg ) * ( a_ol * ol.r + ( 1 - a_ol ) * bg.r ) ); + *d++ = ( int ) ( a_fg * fg.g + ( 1 - a_fg ) * ( a_ol * ol.g + ( 1 - a_ol ) * bg.g ) ); + *d++ = ( int ) ( a_fg * fg.b + ( 1 - a_fg ) * ( a_ol * ol.b + ( 1 - a_ol ) * bg.b ) ); + *d++ = ( int ) ( a_fg * fg.a + ( 1 - a_fg ) * ( a_ol * ol.a + ( 1 - a_ol ) * bg.a ) ); + } + dest += stride; + } }