#include <gdk-pixbuf/gdk-pixbuf.h>
#include <pango/pangoft2.h>
#include <freetype/freetype.h>
+#include <iconv.h>
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;
char *text;
char *font;
+ int weight;
};
// special color type used by internal pango routines
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 );
-mlt_producer producer_pango_init( const char *markup )
+/** Return nonzero if the two strings are equal, ignoring case, up to
+ the first n characters.
+*/
+int strncaseeq(const char *s1, const char *s2, size_t n)
+{
+ for ( ; n > 0; n--)
+ {
+ if (tolower(*s1++) != tolower(*s2++))
+ return 0;
+ }
+ return 1;
+}
+
+/** 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;
+}
+
+static PangoFT2FontMap *fontmap = NULL;
+
+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 )
{
mlt_producer producer = &this->parent;
+ // THIS SHOULD BE MUTEXED...
+ if ( fontmap == NULL )
+ fontmap = (PangoFT2FontMap*) pango_ft2_font_map_new();
+
producer->get_frame = producer_get_frame;
- producer->close = producer_close;
+ 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_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, "encoding", "UTF-8" );
+ mlt_properties_set_int( properties, "weight", PANGO_WEIGHT_NORMAL );
- mlt_properties_set( properties, "resource", "pango" );
+ if ( filename == NULL )
+ {
+ 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, "markup", "" );
+ }
+ }
return producer;
}
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 );
+ 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;
+ }
+}
- // May need to know the size of the image to clone it
- int size = 0;
+rgba_color parse_color( char *color )
+{
+ rgba_color result = { 0xff, 0xff, 0xff, 0xff };
- // Get the image
- uint8_t *image = mlt_properties_get_data( properties, "image", &size );
+ 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;
+ }
- // Get width and height
- *width = mlt_properties_get_int( properties, "width" );
- *height = mlt_properties_get_int( properties, "height" );
+ return result;
+}
- // Clone if necessary
- if ( writable )
+/** Convert a string property to UTF-8
+*/
+static int iconv_utf8( mlt_properties properties, 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 )
{
- // Clone our image
- uint8_t *copy = malloc( size );
- memcpy( copy, image, size );
+ 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;
+
+ memset( outbuf, 0, outbuf_n );
- // We're going to pass the copy on
- image = copy;
+ if ( text != NULL && strcmp( text, "" ) && iconv( cd, &inbuf_p, &inbuf_n, &outbuf_p, &outbuf_n ) != -1 )
+ mlt_properties_set( properties, prop_name, outbuf );
+ else
+ mlt_properties_set( properties, prop_name, "" );
- // Now update properties so we free the copy after
- mlt_properties_set_data( properties, "image", copy, size, free, NULL );
+ mlt_pool_release( outbuf );
+ iconv_close( cd );
+ result = 0;
}
-
- // Pass on the image
- *buffer = image;
-
- return 0;
+ return result;
}
-static uint8_t *producer_get_alpha_mask( mlt_frame this )
+static void refresh_image( mlt_frame frame, int width, int height )
{
+ // Pixbuf
+ GdkPixbuf *pixbuf = NULL;
+
// Obtain properties of frame
- mlt_properties properties = mlt_frame_properties( this );
+ mlt_properties properties = MLT_FRAME_PROPERTIES( frame );
- // Return the alpha mask
- return mlt_properties_get_data( properties, "alpha", NULL );
-}
+ // Obtain the producer pango for this frame
+ producer_pango this = mlt_properties_get_data( properties, "producer_pango", NULL );
-static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int index )
-{
- producer_pango this = producer->child;
- GdkPixbuf *pixbuf = NULL;
+ // Obtain the producer
+ mlt_producer producer = &this->parent;
- // Generate a frame
- *frame = mlt_frame_init( );
+ // Obtain the producer properties
+ mlt_properties producer_props = MLT_PRODUCER_PROPERTIES( producer );
- // Obtain properties of frame and producer
- mlt_properties properties = mlt_frame_properties( *frame );
- 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" );
-
+ 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" );
+
// 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 ) );
+ property_changed = property_changed || ( weight != this->weight );
// 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" );
+ this->weight = weight;
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 );
- }
+ mlt_pool_release( this->image );
+ mlt_pool_release( this->alpha );
+ this->image = NULL;
+ this->alpha = NULL;
- // 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 )
+ // Convert from specified encoding to UTF-8
+ if ( encoding != NULL && !strncaseeq( encoding, "utf-8", 5 ) && !strncaseeq( encoding, "utf8", 4 ) )
{
- 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 );
+ if ( markup != NULL && iconv_utf8( producer_props, "markup", encoding ) != -1 )
+ {
+ markup = mlt_properties_get( producer_props, "markup" );
+ set_string( &this->markup, markup, NULL );
+ }
+ if ( text != NULL && iconv_utf8( producer_props, "text", encoding ) != -1 )
+ {
+ text = mlt_properties_get( producer_props, "text" );
+ set_string( &this->text, text, NULL );
+ }
}
- else
+
+ // Render the title
+ pixbuf = pango_get_pixbuf( markup, text, font, fgcolor, bgcolor, pad, align, weight, size );
+
+ 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 ( 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, 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
- if ( this->image != NULL )
- free( this->image );
- this->image = image;
- if ( this->alpha != NULL )
- 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" ) );
+
+ // 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 )
+{
+ // Obtain properties of frame
+ mlt_properties properties = MLT_FRAME_PROPERTIES( frame );
- // 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" ) );
+ *width = mlt_properties_get_int( properties, "rescale_width" );
+ *height = mlt_properties_get_int( properties, "rescale_height" );
- // 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 );
+ // Refresh the image
+ refresh_image( frame, *width, *height );
- // Set alpha mask call back
- ( *frame )->get_alpha_mask = producer_get_alpha_mask;
+ // 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 );
+
+ // Get width and height
+ *width = mlt_properties_get_int( properties, "width" );
+ *height = mlt_properties_get_int( properties, "height" );
- // Stack the get image callback
- mlt_frame_push_get_image( *frame, producer_get_image );
+ // Clone if necessary
+ if ( writable )
+ {
+ // Clone our image
+ uint8_t *copy = mlt_pool_alloc( size );
+ if ( copy != NULL && image != NULL )
+ 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, ( mlt_destructor )mlt_pool_release, 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 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;
+
+ // 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 );
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 );
+ 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 );
parent->close = NULL;
mlt_producer_close( parent );
free( this );
}
}
-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;
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 )
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 );
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;
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;
}
- free( bitmap.buffer );
-
+ mlt_pool_release( bitmap.buffer );
+ pango_font_description_free( desc );
g_object_unref( layout );
g_object_unref( context );
- g_object_unref( fontmap );
return pixbuf;
}
-
projects / mlt / blobdiff