X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fcore%2Fproducer_colour.c;h=0c40f99b0ff17c68f2153fd9de015343555c564e;hb=22b237f78474fdca383d29df1e58ae7021e9df58;hp=970cacb9536caf946a9b99c090a618e6372f1bbb;hpb=2e4eb8e703760fb408f86152451aeaf425f6a579;p=melted

diff --git a/src/modules/core/producer_colour.c b/src/modules/core/producer_colour.c
index 970cacb..0c40f99 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,13 @@ 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 );
 
 	// Get the current image and dimensions cached in the producer
 	uint8_t *image = mlt_properties_get_data( producer_props, "image", &size );
@@ -134,14 +137,16 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form
 		// Color the image
 		rgba_color color = parse_color( mlt_properties_get( producer_props, "resource" ) );
 		uint8_t y, u, v;
-		int i;
+		int i = 0;
 		RGB2YUV( color.r, color.g, color.b, y, u, v );
-		color.r = y;
-		color.g = u;
-		color.b = y;
-		color.a = v;
-		for ( i = 0; i < size; i += 4 )
-			memcpy( &image[ i ], &color, 4 );
+
+		while ( i < size )
+		{
+			image[ i ++ ] = y;
+			image[ i ++ ] = u;
+			image[ i ++ ] = y;
+			image[ i ++ ] = v;
+		}
 	}
 
 	// Update the frame
@@ -178,10 +183,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 );
@@ -191,6 +199,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", is_pal ? 59.0/54.0 : 10.0/11.0 );
 
 		// colour is an alias for resource
 		if ( mlt_properties_get( producer_props, "colour" ) != NULL )
@@ -212,4 +221,3 @@ static void producer_close( mlt_producer producer )
 	mlt_producer_close( producer );
 	free( producer );
 }
-