X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fgtk2%2Fproducer_pango.c;h=11f9285093fb90f405bf1df9999babd4e42f3a08;hb=8a3795b090723264c973d274eedc28da480e76fd;hp=2a8d99f45c05b8adf44e628c690ba96963fc5962;hpb=7c518e80321a87a22d2e48835442c9f5b70dcd17;p=melted

diff --git a/src/modules/gtk2/producer_pango.c b/src/modules/gtk2/producer_pango.c
index 2a8d99f..11f9285 100644
--- a/src/modules/gtk2/producer_pango.c
+++ b/src/modules/gtk2/producer_pango.c
@@ -33,8 +33,8 @@ 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;
@@ -72,22 +72,31 @@ mlt_producer producer_pango_init( const char *filename )
 		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, "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 );
 
 		if ( filename == NULL )
 		{
 			mlt_properties_set( properties, "resource", "pango" );
 			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" );
@@ -103,7 +112,7 @@ mlt_producer producer_pango_init( const char *filename )
 					size += strlen( line ) + 1;
 					if ( markup )
 					{
-						realloc( markup, size );
+						markup = realloc( markup, size );
 						strcat( markup, line );
 					}
 					else
@@ -112,10 +121,13 @@ mlt_producer producer_pango_init( const char *filename )
 					}
 				}
 				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 ) );
-				if ( markup )
-					free( markup );
+				free( markup );
 			}
 			else
 			{
@@ -130,10 +142,210 @@ mlt_producer producer_pango_init( const char *filename )
 	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 )
+{
+	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;
+	}
+}
+
+rgba_color parse_color( char *color )
+{
+	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" ) )
+	{
+		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;
+	}
+
+	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( this );
+	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 );
+
+	// Obtain the producer 
+	mlt_producer producer = &this->parent;
+
+	// Obtain the producer properties
+	mlt_properties producer_props = mlt_producer_properties( producer );
+
+	// Get producer properties
+	char *fg = mlt_properties_get( producer_props, "fgcolour" );
+	char *bg = mlt_properties_get( producer_props, "bgcolour" );
+	int align = mlt_properties_get_int( 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" );
+
+	// See if any properties changed
+	int property_changed = ( this->fgcolor == NULL || strcmp( fg, this->fgcolor ) );
+	property_changed = property_changed || ( this->bgcolor == NULL || strcmp( bg, this->bgcolor ) );
+	property_changed = property_changed || ( align != this->align );
+	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 ) );
+
+	// Save the properties for next comparison
+	this->align = align;
+	this->pad = pad;
+	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" );
+
+	if ( property_changed )
+	{
+		rgba_color fgcolor = parse_color( this->fgcolor );
+		rgba_color bgcolor = parse_color( this->bgcolor );
+
+		free( this->image );
+		free( this->alpha );
+		this->image = NULL;
+		this->alpha = NULL;
+
+		// Render the title
+		pixbuf = pango_get_pixbuf( markup, text, font, fgcolor, bgcolor, pad, align );
+
+		if ( pixbuf != NULL )
+		{
+			// 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 );
+
+			mlt_properties_set_int( producer_props, "bpp", gdk_pixbuf_get_has_alpha( pixbuf ) ? 4 : 3 );
+		}
+	}
+	else if ( this->image == NULL || width != this->width || height != this->height )
+	{
+		free( this->image );
+		free( this->alpha );
+		this->image = NULL;
+		this->alpha = NULL;
+
+		pixbuf = mlt_properties_get_data( producer_props, "pixbuf", NULL );
+		mlt_properties_set_int( producer_props, "bpp", gdk_pixbuf_get_has_alpha( pixbuf ) ? 4 : 3 );
+	}
+
+	int bpp = mlt_properties_get_int( producer_props, "bpp" );
+
+	// If we have a pixbuf and a valid width
+	if ( pixbuf && width > 0 )
+	{
+		// Note - the original pixbuf is already safe and ready for destruction
+		pixbuf = gdk_pixbuf_scale_simple( pixbuf, width, height, GDK_INTERP_NEAREST );
+
+		// Store width and height
+		this->width = width;
+		this->height = height;
+
+		// Allocate/define image
+		// IRRIGATE ME
+		uint8_t *image = malloc( width * ( height + 1 ) * bpp );
+		uint8_t *alpha = NULL;
+
+		// 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 );
+
+		// Finished with pixbuf now
+		g_object_unref( pixbuf );
+		
+		// reference the image in the producer
+		this->image = image;
+		this->alpha = alpha;
+	}
+
+	// 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 ) * bpp, 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 );
+
+	*width = mlt_properties_get_int( properties, "rescale_width" );
+	*height = mlt_properties_get_int( properties, "rescale_height" );
+
+	// Refresh the image
+	refresh_image( frame, *width, *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;
 
 	// May need to know the size of the image to clone it
 	int size = 0;
@@ -149,6 +361,7 @@ static int producer_get_image( mlt_frame this, uint8_t **buffer, mlt_image_forma
 	if ( writable )
 	{
 		// Clone our image
+		// IRRIGATE ME
 		uint8_t *copy = malloc( size );
 		memcpy( copy, image, size );
 
@@ -177,167 +390,28 @@ static uint8_t *producer_get_alpha_mask( mlt_frame this )
 static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int index )
 {
 	producer_pango this = producer->child;
-	GdkPixbuf *pixbuf = NULL;
 
 	// Generate a frame
 	*frame = mlt_frame_init( );
 
 	// 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" );
-	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" );
 
-	// 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 );
-	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 ) );
+	// Set the producer on the frame properties
+	mlt_properties_set_data( properties, "producer_pango", this, 0, NULL, NULL );
 
-	// 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 );
-	}
-
-	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 )
-		};
+	// Refresh the pango image
+	refresh_image( *frame, 0, 0 );
 
-		// Render the title
-		pixbuf = pango_get_pixbuf( markup, text, font, fgcolor, bgcolor, pad, align );
-	}
+	// 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" ) );
 
-	// 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 )
-		{
-			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 );
-		}
-		else
-		{
-			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 );
-		}
+	// Set alpha call back
+	( *frame )->get_alpha_mask = producer_get_alpha_mask;
 
-		// Store width and height
-		this->width = gdk_pixbuf_get_width( pixbuf );
-		this->height = gdk_pixbuf_get_height( pixbuf );
-
-		// Allocate/define image and alpha
-		uint8_t *image = malloc( this->width * this->height * 2 );
-		uint8_t *alpha = NULL;
-
-		// 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 );
-		}
-
-		// 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 the compositing properties
-		if ( mlt_properties_get( producer_props, "x" ) != NULL )
-			mlt_properties_set_int( properties, "x", mlt_properties_get_int( producer_props, "x" ) );
-		if ( mlt_properties_get( producer_props, "y" ) != NULL )
-			mlt_properties_set_int( properties, "y", mlt_properties_get_int( producer_props, "y" ) );
-		if ( mlt_properties_get( producer_props, "mix" ) != NULL )
-			mlt_properties_set_double( properties, "mix",  mlt_properties_get_double( producer_props, "mix" ) );
-
-		// if picture sequence pass the image and alpha data without destructor
-		mlt_properties_set_data( properties, "image", this->image, this->width * this->height * 2, NULL, NULL );
-		mlt_properties_set_data( properties, "alpha", this->alpha, this->width * this->height, NULL, NULL );
-
-		// Set alpha mask call back
-		( *frame )->get_alpha_mask = producer_get_alpha_mask;
-
-		// Stack the get image callback
-		mlt_frame_push_get_image( *frame, producer_get_image );
-	}
+	// 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_position( *frame, mlt_producer_position( producer ) );
@@ -351,16 +425,13 @@ 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;
-	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 );
+	free( this->image );
+	free( 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 );