X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fcore%2Fproducer_colour.c;h=ecd9a3ff3b208270f771922cc87660717060f797;hb=2ff111fe322cfdea5b879dd7912a8a375af62aff;hp=2290b9dbfdbdca5d99acee43dc8c6c59877105e5;hpb=8a14fece1e45ba65a3b526ec6fd466f91ea33cce;p=melted

diff --git a/src/modules/core/producer_colour.c b/src/modules/core/producer_colour.c
index 2290b9d..ecd9a3f 100644
--- a/src/modules/core/producer_colour.c
+++ b/src/modules/core/producer_colour.c
@@ -48,9 +48,7 @@ mlt_producer producer_colour_init( char *colour )
 		producer->close = producer_close;
 
 		// Set the default properties
-		if ( colour == NULL )
-			colour = "0x000000ff";
-		mlt_properties_set( properties, "resource", colour );
+		mlt_properties_set( properties, "resource", colour == NULL ? "0x000000ff" : colour );
 		
 		return producer;
 	}
@@ -136,14 +134,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
@@ -185,6 +185,9 @@ static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int i
 		// Obtain properties of 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,6 +196,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 ? 128.0/117.0 : 72.0/79.0 );
 
 		// colour is an alias for resource
 		if ( mlt_properties_get( producer_props, "colour" ) != NULL )
@@ -214,4 +218,3 @@ static void producer_close( mlt_producer producer )
 	mlt_producer_close( producer );
 	free( producer );
 }
-