X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fgtk2%2Fproducer_pango.c;h=e4969aba59b287ab9c35692c85faf2e0f93ae986;hb=945a27e179cc4d1290b488a5b7cba466f06d009b;hp=bed28f9b9fd44aae49c90f4b2be7c29fd916817f;hpb=94dce1aea965163f8dcd2f97271f2652abb0e62d;p=melted diff --git a/src/modules/gtk2/producer_pango.c b/src/modules/gtk2/producer_pango.c index bed28f9..e4969ab 100644 --- a/src/modules/gtk2/producer_pango.c +++ b/src/modules/gtk2/producer_pango.c @@ -25,15 +25,14 @@ #include #include #include +#include struct producer_pango_s { struct mlt_producer_s parent; int width; int height; - void *image_release; uint8_t *image; - void *alpha_release; uint8_t *alpha; char *fgcolor; char *bgcolor; @@ -57,6 +56,19 @@ 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 ); +/** 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. */ @@ -83,7 +95,7 @@ mlt_producer producer_pango_init( const char *filename ) mlt_producer producer = &this->parent; 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(); @@ -98,10 +110,10 @@ mlt_producer producer_pango_init( const char *filename ) 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" ); if ( filename == NULL ) { - mlt_properties_set( properties, "resource", "pango" ); mlt_properties_set( properties, "markup", "" ); } else if ( filename[ 0 ] == '+' || strstr( filename, "/+" ) ) @@ -151,7 +163,6 @@ mlt_producer producer_pango_init( const char *filename ) } else { - mlt_properties_set( properties, "resource", "pango" ); mlt_properties_set( properties, "markup", "" ); } } @@ -224,6 +235,34 @@ rgba_color parse_color( char *color ) 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 = strdup( 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; + + if ( iconv( cd, &inbuf_p, &inbuf_n, &outbuf_p, &outbuf_n ) != -1 ) + { + outbuf[ outbuf_n ] = 0; + mlt_properties_set( properties, prop_name, outbuf ); + result = 0; + } + mlt_pool_release( outbuf ); + iconv_close( cd ); + } + return result; +} + static void refresh_image( mlt_frame frame, int width, int height ) { // Pixbuf @@ -249,7 +288,8 @@ static void refresh_image( mlt_frame frame, int width, int height ) 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" ); + // See if any properties changed int property_changed = ( align != this->align ); property_changed = property_changed || ( this->fgcolor == NULL || ( fg && strcmp( fg, this->fgcolor ) ) ); @@ -273,13 +313,26 @@ static void refresh_image( mlt_frame frame, int width, int height ) rgba_color fgcolor = parse_color( this->fgcolor ); rgba_color bgcolor = parse_color( this->bgcolor ); - mlt_pool_release( this->image_release ); - mlt_pool_release( this->alpha_release ); - this->image_release = NULL; - this->alpha_release = NULL; + mlt_pool_release( this->image ); + mlt_pool_release( this->alpha ); 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 ); @@ -298,10 +351,8 @@ static void refresh_image( mlt_frame frame, int width, int height ) } else if ( width > 0 && ( this->image == NULL || width != this->width || height != this->height ) ) { - mlt_pool_release( this->image_release ); - mlt_pool_release( this->alpha_release ); - this->image_release = NULL; - this->alpha_release = NULL; + mlt_pool_release( this->image ); + mlt_pool_release( this->alpha ); this->image = NULL; this->alpha = NULL; @@ -331,8 +382,8 @@ static void refresh_image( mlt_frame frame, int width, int height ) this->height = height; // Allocate/define image - this->image = mlt_pool_allocate( width * ( height + 1 ) * 2, &this->image_release ); - this->alpha = mlt_pool_allocate( this->width * this->height, &this->alpha_release ); + 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 ), @@ -384,16 +435,14 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form if ( writable ) { // Clone our image - void *release = NULL; - uint8_t *copy = mlt_pool_allocate( size, &release ); + uint8_t *copy = mlt_pool_alloc( size ); 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_release", release, 0, ( mlt_destructor )mlt_pool_release, NULL ); - mlt_properties_set_data( properties, "image", copy, size, NULL, NULL ); + mlt_properties_set_data( properties, "image", copy, size, ( mlt_destructor )mlt_pool_release, NULL ); } // Pass on the image @@ -429,7 +478,7 @@ 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", 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; @@ -449,8 +498,8 @@ 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_release ); - mlt_pool_release( this->alpha_release ); + mlt_pool_release( this->image ); + mlt_pool_release( this->alpha ); free( this->fgcolor ); free( this->bgcolor ); free( this->markup ); @@ -492,7 +541,6 @@ static GdkPixbuf *pango_get_pixbuf( const char *markup, const char *text, const uint8_t *src = NULL; uint8_t* dest = NULL; int stride; - void *release = NULL; pango_ft2_font_map_set_resolution( fontmap, 72, 72 ); pango_layout_set_width( layout, -1 ); // set wrapping constraints @@ -515,7 +563,7 @@ static GdkPixbuf *pango_get_pixbuf( const char *markup, const char *text, const bitmap.width = w; bitmap.pitch = 32 * ( ( w + 31 ) / 31 ); bitmap.rows = h; - bitmap.buffer = mlt_pool_allocate( h * bitmap.pitch, &release ); + bitmap.buffer = mlt_pool_alloc( h * bitmap.pitch ); bitmap.num_grays = 256; bitmap.pixel_mode = ft_pixel_mode_grays; @@ -539,11 +587,10 @@ static GdkPixbuf *pango_get_pixbuf( const char *markup, const char *text, const } dest += stride; } - mlt_pool_release( release ); + mlt_pool_release( bitmap.buffer ); g_object_unref( layout ); g_object_unref( context ); g_object_unref( fontmap ); return pixbuf; } -