GdkPixbuf *pixbuf;
char *fgcolor;
char *bgcolor;
+ char *olcolor;
int align;
int pad;
+ int outline;
char *markup;
char *text;
char *font;
+ char *family;
+ int size;
+ int style;
int weight;
};
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.
/** Parse the alignment property.
*/
-static int alignment_parse( char* align )
+static int parse_alignment( char* align )
{
int ret = pango_align_left;
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;
// 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 || ( filename && ( !strcmp( filename, "" )
// workaround for old kdenlive countdown generator
if ( markup )
{
markup = realloc( markup, size );
- strcat( markup, line );
+ if ( markup )
+ strcat( markup, line );
}
else
{
}
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", filename );
- mlt_properties_set( properties, "markup", ( markup == NULL ? "" : markup ) );
+ if ( markup )
+ mlt_properties_set( properties, "markup", markup );
+ else
+ mlt_properties_set( properties, "markup", "" );
free( markup );
}
else
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 );
mlt_properties_set( properties, prop_name, "" );
mlt_pool_release( outbuf );
- iconv_close( cd );
result = 0;
}
+ iconv_close( cd );
return result;
}
// 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" );
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, 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" ) );
if ( this->pixbuf )
g_object_unref( this->pixbuf );
}
// 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 )
{
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 );
// 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" ) );
}
static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_format *format, int *width, int *height, int writable )
// Get width and height
*width = this->width;
*height = this->height;
+ *format = mlt_image_rgb24a;
// Always clone here to allow 'animated' text
if ( this->pixbuf )
// Now update properties so we free the copy after
mlt_frame_set_image( frame, *buffer, image_size, mlt_pool_release );
- *format = mlt_image_rgb24a;
}
else
{
{
producer_pango this = producer->child;
+ // Fetch the producers properties
+ mlt_properties producer_properties = MLT_PRODUCER_PROPERTIES( producer );
+
// Generate a frame
*frame = mlt_frame_init( MLT_PRODUCER_SERVICE( producer ) );
// Set producer-specific frame properties
mlt_properties_set_int( properties, "progressive", 1 );
- mlt_properties_set_double( properties, "aspect_ratio", 1 );
+ 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 );
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 );
}
}
-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;
+
+ 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_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 )
- pango_font_description_set_absolute_size( desc, PANGO_SCALE * size );
+
+ 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 )
{
}
pango_layout_get_pixel_size( layout, &w, &h );
- // Interpret size property as an absolute pixel height and compensate for
- // freetype's "interpretation" of our absolute size request. This gives
- // precise control over compositing and better quality by reducing scaling
- // artifacts with composite geometries that constrain the dimensions.
- // If you do not want this, then put the size in the font property or in
- // the pango markup.
- if ( size != 0 )
- {
- pango_font_description_set_absolute_size( desc, PANGO_SCALE * size * size/h );
- pango_layout_set_font_description( layout, desc );
- pango_layout_get_pixel_size( layout, &w, &h );
- }
-
- if ( pad == 0 )
- pad = 1;
+ 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