X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fcore%2Fproducer_colour.c;h=c1fa1681e3d558814e2f944b5540194a93711ccf;hb=91fb4d73caa09a606c46393c7565462bf926e6a8;hp=43d019dc50c922ab47934629b3fc2de96059d95d;hpb=5b59ce704d4f317e845afa30c5ade12c0fd22d43;p=melted

diff --git a/src/modules/core/producer_colour.c b/src/modules/core/producer_colour.c
index 43d019d..c1fa168 100644
--- a/src/modules/core/producer_colour.c
+++ b/src/modules/core/producer_colour.c
@@ -41,11 +41,11 @@ mlt_producer producer_colour_init( char *colour )
 	if ( producer != NULL && mlt_producer_init( producer, NULL ) == 0 )
 	{
 		// Get the properties interface
-		mlt_properties properties = mlt_producer_properties( producer );
+		mlt_properties properties = MLT_PRODUCER_PROPERTIES( producer );
 	
 		// Callback registration
 		producer->get_frame = producer_get_frame;
-		producer->close = producer_close;
+		producer->close = ( mlt_destructor )producer_close;
 
 		// Set the default properties
 		mlt_properties_set( properties, "resource", colour == NULL ? "0x000000ff" : colour );
@@ -60,6 +60,9 @@ rgba_color parse_color( char *color )
 {
 	rgba_color result = { 0xff, 0xff, 0xff, 0xff };
 
+	if ( strchr( color, '/' ) )
+		color = strrchr( color, '/' ) + 1;
+
 	if ( !strncmp( color, "0x", 2 ) )
 	{
 		unsigned int temp = 0;
@@ -106,13 +109,16 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form
 	int size = 0;
 	
 	// Obtain properties of frame
-	mlt_properties properties = mlt_frame_properties( frame );
+	mlt_properties properties = MLT_FRAME_PROPERTIES( frame );
 
 	// Obtain the producer for this frame
 	mlt_producer producer = mlt_properties_get_data( properties, "producer_colour", NULL );
 
 	// Obtain properties of producer
-	mlt_properties producer_props = mlt_producer_properties( producer );
+	mlt_properties producer_props = MLT_PRODUCER_PROPERTIES( producer );
+
+	// Parse the colour
+	rgba_color color = parse_color( mlt_properties_get( producer_props, "resource" ) );
 
 	// Get the current image and dimensions cached in the producer
 	uint8_t *image = mlt_properties_get_data( producer_props, "image", &size );
@@ -122,6 +128,10 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form
 	// See if we need to regenerate
 	if ( *width != current_width || *height != current_height )
 	{
+		// Color the image
+		uint8_t y, u, v;
+		int i = 0;
+
 		// Allocate the image
 		size = *width * *height * 2;
 		image = mlt_pool_alloc( size );
@@ -131,10 +141,6 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form
 		mlt_properties_set_int( producer_props, "width", *width );
 		mlt_properties_set_int( producer_props, "height", *height );
 
-		// Color the image
-		rgba_color color = parse_color( mlt_properties_get( producer_props, "resource" ) );
-		uint8_t y, u, v;
-		int i = 0;
 		RGB2YUV( color.r, color.g, color.b, y, u, v );
 
 		while ( i < size )
@@ -154,6 +160,9 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form
 	// Clone if necessary
 	if ( writable )
 	{
+		// Create the alpha channel
+		uint8_t *alpha = mlt_pool_alloc( size >> 1 );
+
 		// Clone our image
 		uint8_t *copy = mlt_pool_alloc( size );
 		memcpy( copy, image, size );
@@ -161,8 +170,13 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form
 		// We're going to pass the copy on
 		image = copy;
 
+		// Initialise the alpha
+		if ( alpha )
+			memset( alpha, color.a, size >> 1 );
+
 		// Now update properties so we free the copy after
 		mlt_properties_set_data( properties, "image", copy, size, mlt_pool_release, NULL );
+		mlt_properties_set_data( properties, "alpha", alpha, size >> 1, mlt_pool_release, NULL );
 	}
 
 	// Pass on the image
@@ -180,10 +194,13 @@ static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int i
 	if ( *frame != NULL )
 	{
 		// Obtain properties of frame and producer
-		mlt_properties properties = mlt_frame_properties( *frame );
+		mlt_properties properties = MLT_FRAME_PROPERTIES( *frame );
 
 		// Obtain properties of producer
-		mlt_properties producer_props = mlt_producer_properties( producer );
+		mlt_properties producer_props = MLT_PRODUCER_PROPERTIES( producer );
+
+		// Determine if we're producing PAL or NTSC
+		int is_pal = mlt_properties_get_double( producer_props, "fps" ) == 25.0;
 
 		// Set the producer on the frame properties
 		mlt_properties_set_data( properties, "producer_colour", producer, 0, NULL, NULL );
@@ -193,9 +210,9 @@ 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", is_pal ? 59.0/54.0 : 10.0/11.0 );
 
 		// colour is an alias for resource
-		// CY: Do we really need this?
 		if ( mlt_properties_get( producer_props, "colour" ) != NULL )
 			mlt_properties_set( producer_props, "resource", mlt_properties_get( producer_props, "colour" ) );
 		
@@ -215,4 +232,3 @@ static void producer_close( mlt_producer producer )
 	mlt_producer_close( producer );
 	free( producer );
 }
-