Colour space conversion with gdkpixbuf scaling

[mlt] / src / modules / gtk2 / producer_pixbuf.c

diff --git a/src/modules/gtk2/producer_pixbuf.c b/src/modules/gtk2/producer_pixbuf.c
index 88355b9a2e093d14b1bf6b03cc8175f49e512db2..95cae13ade88d59a3322b3d80a086b4b75a5d378 100644 (file)
--- a/src/modules/gtk2/producer_pixbuf.c
+++ b/src/modules/gtk2/producer_pixbuf.c
@@ -164,7 +164,7 @@ static void refresh_image( mlt_frame frame, int width, int height )
 
                // Note - the original pixbuf is already safe and ready for destruction
                pixbuf = gdk_pixbuf_scale_simple( pixbuf, width, height, interp );
-               
+
                // Store width and height
                this->width = width;
                this->height = height;
@@ -219,10 +219,6 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form
        // Refresh the image
        refresh_image( frame, *width, *height );
 
-       // Determine format
-       //mlt_producer this = mlt_properties_get_data( properties, "producer_pixbuf", NULL );
-       //*format = ( mlt_properties_get_int( mlt_producer_properties( this ), "bpp" ) == 4 ) ? mlt_image_rgb24a : mlt_image_rgb24;
-
        // May need to know the size of the image to clone it
        int size = 0;
 
@@ -233,6 +229,13 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form
        *width = mlt_properties_get_int( properties, "width" );
        *height = mlt_properties_get_int( properties, "height" );
 
+       if ( size == 0 )
+       {
+               *width = mlt_properties_get_int( properties, "normalised_width" );
+               *height = mlt_properties_get_int( properties, "normalised_height" );
+               size = *width * ( *height + 1 );
+       }
+
        // Clone if necessary
        // NB: Cloning is necessary with this producer (due to processing of images ahead of use)
        // The fault is not in the design of mlt, but in the implementation of pixbuf...
@@ -240,7 +243,8 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form
        {
                // Clone our image
                uint8_t *copy = mlt_pool_alloc( size );
-               memcpy( copy, image, size );
+               if ( image != NULL )
+                       memcpy( copy, image, size );
 
                // We're going to pass the copy on
                image = copy;
@@ -274,8 +278,39 @@ static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int i
                mlt_properties properties = mlt_producer_properties( producer );
                char *filename = mlt_properties_get( properties, "resource" );
                
+               // Read xml string
+               if ( strstr( filename, "<svg" ) )
+               {
+                       // Generate a temporary file for the svg
+                       char fullname[ 1024 ] = "/tmp/mlt.XXXXXX";
+                       int fd = mkstemp( fullname );
+
+                       if ( fd > -1 )
+                       {
+                               // Write the svg into the temp file
+                               ssize_t remaining_bytes;
+                               char *xml = filename;
+                               
+                               // Strip leading crap
+                               while ( xml[0] != '<' )
+                                       xml++;
+                               
+                               remaining_bytes = strlen( xml );
+                               while ( remaining_bytes > 0 )
+                                       remaining_bytes -= write( fd, xml + strlen( xml ) - remaining_bytes, remaining_bytes );
+                               close( fd );
+
+                               this->filenames = realloc( this->filenames, sizeof( char * ) * ( this->count + 1 ) );
+                               this->filenames[ this->count ++ ] = strdup( fullname );
+
+                               mlt_properties_set_position( properties, "out", 250 );
+
+                               // Teehe - when the producer closes, delete the temp file and the space allo
+                               mlt_properties_set_data( properties, "__temporary_file__", this->filenames[ this->count - 1 ], 0, ( mlt_destructor )unlink, NULL );
+                       }
+               }
                // Obtain filenames
-               if ( strchr( filename, '%' ) != NULL )
+               else if ( strchr( filename, '%' ) != NULL )
                {
                        // handle picture sequences
                        int i = 0;
@@ -315,8 +350,8 @@ static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int i
                        {
                                snprintf( fullname, 1023, "%s%s", dir_name, de[i]->d_name );
 
-                               if ( lstat( fullname, &info ) == 0 &&
-                                       ( S_ISREG( info.st_mode ) || ( strstr( fullname, extension ) && info.st_mode | S_IXUSR ) ) )
+                               if ( strstr( fullname, extension ) && lstat( fullname, &info ) == 0 &&
+                                       ( S_ISREG( info.st_mode ) || info.st_mode | S_IXUSR ) )
                                {
                                        this->filenames = realloc( this->filenames, sizeof( char * ) * ( this->count + 1 ) );
                                        this->filenames[ this->count ++ ] = strdup( fullname );
@@ -327,29 +362,6 @@ static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int i
                        free( de );
                        free( dir_name );
                }
-               else if ( strstr( filename, "<svg" ) )
-               {
-                       // Generate a temporary file for the svg
-                       char fullname[ 1024 ] = "/tmp/mlt.XXXXXX";
-                       int fd = mkstemp( fullname );
-
-                       if ( fd > -1 )
-                       {
-                               // Write the svg into the temp file
-                               ssize_t remaining_bytes = strlen( filename );
-                               while ( remaining_bytes > 0 )
-                                       remaining_bytes -= write( fd, filename + strlen( filename ) - remaining_bytes, remaining_bytes );
-                               close( fd );
-
-                               this->filenames = realloc( this->filenames, sizeof( char * ) * ( this->count + 1 ) );
-                               this->filenames[ this->count ++ ] = strdup( fullname );
-
-                               mlt_properties_set_position( properties, "out", 250 );
-
-                               // Teehe - when the producer closes, delete the temp file and the space allo
-                               mlt_properties_set_data( properties, "__temporary_file__", this->filenames[ this->count - 1 ], 0, ( mlt_destructor )unlink, NULL );
-                       }
-               }
                else
                {
                        this->filenames = realloc( this->filenames, sizeof( char * ) * ( this->count + 1 ) );
@@ -380,7 +392,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", mlt_properties_get_double( properties, "real_width" )/mlt_properties_get_double( properties, "real_height" ) );
+               mlt_properties_set_double( properties, "aspect_ratio", 1 );
 
                // Set alpha call back
                ( *frame )->get_alpha_mask = producer_get_alpha_mask;
@@ -406,4 +418,3 @@ static void producer_close( mlt_producer parent )
        free( this->filenames );
        free( this );
 }
-