#include <gdk-pixbuf/gdk-pixbuf.h>
#include <pango/pangoft2.h>
#include <freetype/freetype.h>
+#include <iconv.h>
struct producer_pango_s
{
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 );
+
+/** 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.
*/
return ret;
}
+static PangoFT2FontMap *fontmap = NULL;
+
mlt_producer producer_pango_init( const char *filename )
{
producer_pango this = calloc( sizeof( struct producer_pango_s ), 1 );
{
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( properties, "fgcolour", "0xffffffff" );
mlt_properties_set_int( properties, "pad", 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 )
{
- mlt_properties_set( properties, "resource", "pango" );
mlt_properties_set( properties, "markup", "" );
}
else if ( filename[ 0 ] == '+' || strstr( filename, "/+" ) )
}
else
{
- mlt_properties_set( properties, "resource", "pango" );
mlt_properties_set( properties, "markup", "" );
}
}
return result;
}
+/** 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 )
+ {
+ 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 );
+
+ 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, "" );
+
+ mlt_pool_release( outbuf );
+ iconv_close( cd );
+ result = 0;
+ }
+ return result;
+}
+
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( frame );
+ mlt_properties properties = MLT_FRAME_PROPERTIES( frame );
// Obtain the producer pango for this frame
producer_pango this = mlt_properties_get_data( properties, "producer_pango", NULL );
mlt_producer producer = &this->parent;
// Obtain the producer properties
- mlt_properties producer_props = mlt_producer_properties( producer );
+ mlt_properties producer_props = MLT_PRODUCER_PROPERTIES( producer );
// Get producer properties
char *fg = mlt_properties_get( producer_props, "fgcolour" );
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 = ( align != this->align );
property_changed = property_changed || ( this->fgcolor == NULL || ( fg && strcmp( fg, this->fgcolor ) ) );
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->align = align;
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 )
{
this->image = NULL;
this->alpha = NULL;
+ // Convert from specified encoding to UTF-8
+ if ( encoding != NULL && !strncaseeq( encoding, "utf-8", 5 ) && !strncaseeq( encoding, "utf8", 4 ) )
+ {
+ 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 );
+ }
+ }
+
// Render the title
- pixbuf = pango_get_pixbuf( markup, text, font, fgcolor, bgcolor, pad, align );
+ pixbuf = pango_get_pixbuf( markup, text, font, fgcolor, bgcolor, pad, align, weight, size );
if ( pixbuf != 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 );
+ mlt_properties properties = MLT_FRAME_PROPERTIES( frame );
*width = mlt_properties_get_int( properties, "rescale_width" );
*height = mlt_properties_get_int( properties, "rescale_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;
+ //*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;
{
// Clone our image
uint8_t *copy = mlt_pool_alloc( size );
- memcpy( copy, image, size );
+ if ( copy != NULL && image != NULL )
+ memcpy( copy, image, size );
// We're going to pass the copy on
image = copy;
static uint8_t *producer_get_alpha_mask( mlt_frame this )
{
// Obtain properties of frame
- mlt_properties properties = mlt_frame_properties( this );
+ mlt_properties properties = MLT_FRAME_PROPERTIES( this );
// Return the alpha mask
return mlt_properties_get_data( properties, "alpha", NULL );
*frame = mlt_frame_init( );
// Obtain properties of frame and producer
- mlt_properties properties = mlt_frame_properties( *frame );
+ 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 );
// Set producer-specific frame properties
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" ) );
+ mlt_properties_set_double( properties, "aspect_ratio", 1 );
// Set alpha call back
( *frame )->get_alpha_mask = producer_get_alpha_mask;
}
}
-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 );
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;
}
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