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;
+ 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, int weight, int size );
+ rgba_color fg, rgba_color bg, rgba_color ol, int pad, int align, 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.
// 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, "encoding", "UTF-8" );
mlt_properties_set_int( properties, "weight", PANGO_WEIGHT_NORMAL );
- if ( filename == NULL )
+ if ( filename == NULL || ( filename && ( !strcmp( filename, "" )
+ // workaround for old kdenlive countdown generator
+ || strstr( filename, "<producer>" ) ) ) )
{
mlt_properties_set( properties, "markup", "" );
}
item.frame = atoi( name );
mlt_geometry_insert( key_frames, &item );
}
+ mlt_geometry_interpolate( key_frames );
}
else
{
}
else
{
- mlt_properties_set( properties, "markup", "" );
+ producer->close = NULL;
+ mlt_producer_close( producer );
+ producer = NULL;
+ free( this );
}
}
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 )
{
}
}
-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;
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;
/** 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;
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
// Get producer properties
char *fg = mlt_properties_get( producer_props, "fgcolour" );
char *bg = mlt_properties_get( producer_props, "bgcolour" );
+ char *ol = mlt_properties_get( producer_props, "olcolour" );
int align = alignment_parse( 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" );
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( bg, 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 ) );
// 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" );
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 ) )
}
// 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, weight, size, outline );
if ( pixbuf != NULL )
{
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 );
}
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,"%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, "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;
// 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 );
+ *format = mlt_image_rgb24a;
}
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 )
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_service( *frame, this );
mlt_frame_push_get_image( *frame, producer_get_image );
// Calculate the next timecode
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 );
}
}
-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, 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 );
pango_ft2_font_map_set_resolution( fontmap, 72, 72 );
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;
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 -- )
{
*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;
+ }
}
projects / mlt / blobdiff