src/framework/mlt_consumer.c

[mlt] / src / modules / core / producer_colour.c

diff --git a/src/modules/core/producer_colour.c b/src/modules/core/producer_colour.c
index f7966ed8322c5a32d8decfcd331a384d746272ea..75e7aa920790272b9689cc1e1692b2c2feb61e08 100644 (file)
--- a/src/modules/core/producer_colour.c
+++ b/src/modules/core/producer_colour.c
@@ -49,6 +49,7 @@ mlt_producer producer_colour_init( char *colour )
 
                // Set the default properties
                mlt_properties_set( properties, "resource", colour == NULL ? "0x000000ff" : colour );
+               mlt_properties_set( properties, "_resource", "" );
                
                return producer;
        }
@@ -117,29 +118,35 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form
        // Obtain properties of 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 and previous colour strings
+       char *now = mlt_properties_get( producer_props, "resource" );
+       char *then = 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 );
-       int current_width = mlt_properties_get_int( producer_props, "width" );
-       int current_height = mlt_properties_get_int( producer_props, "height" );
+       int current_width = mlt_properties_get_int( producer_props, "_width" );
+       int current_height = mlt_properties_get_int( producer_props, "_height" );
+
+       // Parse the colour
+       rgba_color color = parse_color( now );
 
        // See if we need to regenerate
-       if ( *width != current_width || *height != current_height )
+       if ( strcmp( now, then ) || *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 );
 
                // Update the producer
                mlt_properties_set_data( producer_props, "image", image, size, mlt_pool_release, NULL );
-               mlt_properties_set_int( producer_props, "width", *width );
-               mlt_properties_set_int( producer_props, "height", *height );
+               mlt_properties_set_int( producer_props, "_width", *width );
+               mlt_properties_set_int( producer_props, "_height", *height );
+               mlt_properties_set( producer_props, "_resource", now );
 
-               // Color the image
-               uint8_t y, u, v;
-               int i = 0;
                RGB2YUV( color.r, color.g, color.b, y, u, v );
 
                while ( i < size )
@@ -152,12 +159,11 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form
        }
 
        // Update the frame
-       mlt_properties_set_data( properties, "image", image, size, NULL, NULL );
        mlt_properties_set_int( properties, "width", *width );
        mlt_properties_set_int( properties, "height", *height );
        
-       // Clone if necessary
-       if ( writable )
+       // Clone if necessary (deemed always necessary)
+       if ( 1 )
        {
                // Create the alpha channel
                uint8_t *alpha = mlt_pool_alloc( size >> 1 );
@@ -198,9 +204,6 @@ 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 );
 
@@ -209,7 +212,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 );
+               mlt_properties_set_double( properties, "aspect_ratio", 0 );
 
                // colour is an alias for resource
                if ( mlt_properties_get( producer_props, "colour" ) != NULL )