Fix crashing when using opengl services with wrapper producers.

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

diff --git a/src/modules/core/producer_colour.c b/src/modules/core/producer_colour.c
index 670bd403123f4cd3d971941f524dc2b46a481c45..80ca7a61b79e97ca4afe687bb5d6cc44845747ce 100644 (file)
--- a/src/modules/core/producer_colour.c
+++ b/src/modules/core/producer_colour.c
@@ -27,11 +27,6 @@
 #include <string.h>
 
 
-typedef struct
-{
-       uint8_t r, g, b, a;
-} rgba_color;
-
 static int producer_get_frame( mlt_producer parent, mlt_frame_ptr frame, int index );
 static void producer_close( mlt_producer parent );
 
@@ -58,45 +53,6 @@ mlt_producer producer_colour_init( mlt_profile profile, mlt_service_type type, c
        return NULL;
 }
 
-rgba_color parse_color( char *color, unsigned int color_int )
-{
-       rgba_color result = { 0xff, 0xff, 0xff, 0xff };
-
-       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 if ( !strcmp( color, "black" ) )
-       {
-               result.r = 0x00;
-               result.g = 0x00;
-               result.b = 0x00;
-       }
-       else if ( strcmp( color, "white" ) )
-       {
-               result.r = ( color_int >> 24 ) & 0xff;
-               result.g = ( color_int >> 16 ) & 0xff;
-               result.b = ( color_int >> 8 ) & 0xff;
-               result.a = ( color_int ) & 0xff;
-       }
-
-       return result;
-}
-
 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
@@ -129,10 +85,10 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form
                free( now );
                now = mlt_properties_get( producer_props, "resource" );
        }
-       rgba_color color = parse_color( now, mlt_properties_get_int( producer_props, "resource" ) );
+       mlt_color color = mlt_properties_get_color( producer_props, "resource" );
 
        // Choose suitable out values if nothing specific requested
-       if ( *format == mlt_image_none )
+       if ( *format == mlt_image_none || *format == mlt_image_glsl )
                *format = mlt_image_rgb24a;
        if ( *width <= 0 )
                *width = mlt_service_profile( MLT_PRODUCER_SERVICE(producer) )->width;
@@ -195,7 +151,12 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form
                                *p ++ = color.b;
                        }
                        break;
+               case mlt_image_glsl:
+               case mlt_image_glsl_texture:
+                       memset(p, 0, size);
+                       break;
                default:
+                       *format = mlt_image_rgb24a;
                        while ( --i )
                        {
                                *p ++ = color.r;