mlt_producer producer_pixbuf_init( char *filename )
{
producer_pixbuf this = calloc( sizeof( struct producer_pixbuf_s ), 1 );
- if ( filename != NULL && this != NULL && mlt_producer_init( &this->parent, this ) == 0 )
+ if ( this != NULL && mlt_producer_init( &this->parent, this ) == 0 )
{
mlt_producer producer = &this->parent;
// 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", filename );
mlt_properties_set_int( properties, "ttl", 25 );
- // Obtain filenames
- if ( strchr( filename, '%' ) != NULL )
- {
- // handle picture sequences
- int i = 0;
- int gap = 0;
- char full[1024];
-
- while ( gap < 100 )
- {
- struct stat buf;
- snprintf( full, 1023, filename, i ++ );
- if ( stat( full, &buf ) == 0 )
- {
- this->filenames = realloc( this->filenames, sizeof( char * ) * ( this->count + 1 ) );
- this->filenames[ this->count ++ ] = strdup( full );
- gap = 0;
- }
- else
- {
- gap ++;
- }
- }
- mlt_properties_set_position( properties, "out", this->count * 250 );
- }
- else if ( strstr( filename, "/.all." ) != NULL )
- {
- char *dir_name = strdup( filename );
- char *extension = strrchr( filename, '.' );
- *( strstr( dir_name, "/.all." ) + 1 ) = '\0';
- char fullname[ 1024 ];
- strcpy( fullname, dir_name );
- struct dirent **de = NULL;
- int n = scandir( fullname, &de, filter_files, alphasort );
- int i;
- struct stat info;
-
- for (i = 0; i < n; 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 ) ) )
- {
- this->filenames = realloc( this->filenames, sizeof( char * ) * ( this->count + 1 ) );
- this->filenames[ this->count ++ ] = strdup( fullname );
- }
- free( de[ i ] );
- }
-
- free( de );
- free( dir_name );
- }
- else
- {
- this->filenames = realloc( this->filenames, sizeof( char * ) * ( this->count + 1 ) );
- this->filenames[ this->count ++ ] = strdup( filename );
- mlt_properties_set_position( properties, "out", 250 );
- }
-
// Initialise gobject types
g_type_init();
// 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;
// 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;
*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...
{
// 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;
// Get the real structure for this producer
producer_pixbuf this = producer->child;
+ if ( this->count == 0 && mlt_properties_get( mlt_producer_properties( producer ), "resource" ) != NULL )
+ {
+ 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 );
+
+ // 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
+ else if ( strchr( filename, '%' ) != NULL )
+ {
+ // handle picture sequences
+ int i = 0;
+ int gap = 0;
+ char full[1024];
+
+ while ( gap < 100 )
+ {
+ struct stat buf;
+ snprintf( full, 1023, filename, i ++ );
+ if ( stat( full, &buf ) == 0 )
+ {
+ this->filenames = realloc( this->filenames, sizeof( char * ) * ( this->count + 1 ) );
+ this->filenames[ this->count ++ ] = strdup( full );
+ gap = 0;
+ }
+ else
+ {
+ gap ++;
+ }
+ }
+ }
+ else if ( strstr( filename, "/.all." ) != NULL )
+ {
+ char *dir_name = strdup( filename );
+ char *extension = strrchr( filename, '.' );
+ *( strstr( dir_name, "/.all." ) + 1 ) = '\0';
+ char fullname[ 1024 ];
+ strcpy( fullname, dir_name );
+ struct dirent **de = NULL;
+ int n = scandir( fullname, &de, filter_files, alphasort );
+ int i;
+ struct stat info;
+
+ for (i = 0; i < n; i++ )
+ {
+ snprintf( fullname, 1023, "%s%s", dir_name, de[i]->d_name );
+
+ 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 );
+ }
+ free( de[ i ] );
+ }
+
+ free( de );
+ free( dir_name );
+ }
+ else
+ {
+ this->filenames = realloc( this->filenames, sizeof( char * ) * ( this->count + 1 ) );
+ this->filenames[ this->count ++ ] = strdup( filename );
+ }
+ }
+
// Generate a frame
*frame = mlt_frame_init( );
// 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;
mlt_pool_release( this->image );
parent->close = NULL;
mlt_producer_close( parent );
+ while ( this->count -- )
+ free( this->filenames[ this->count ] );
+ free( this->filenames );
free( this );
}
-