int width;
int height;
- void *image_release;
uint8_t *image;
- void *alpha_release;
uint8_t *alpha;
};
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;
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();
// Get the time to live for each frame
double ttl = mlt_properties_get_int( producer_props, "ttl" );
- // Image index
- int image_idx = ( int )floor( mlt_producer_position( producer ) / ttl ) % this->count;
+ // Get the original position of this frame
+ mlt_position position = mlt_properties_get_position( properties, "pixbuf_position" );
- // Update timecode on the frame we're creating
- mlt_frame_set_position( frame, mlt_producer_position( producer ) );
+ // Image index
+ int image_idx = ( int )floor( ( double )position / ttl ) % this->count;
// optimization for subsequent iterations on single picture
if ( width != 0 && this->image != NULL && image_idx == this->image_idx )
if ( width != this->width || height != this->height )
{
pixbuf = mlt_properties_get_data( producer_props, "pixbuf", NULL );
- mlt_pool_release( this->image_release );
- mlt_pool_release( this->alpha_release );
- this->image_release = NULL;
- this->alpha_release = NULL;
+ mlt_pool_release( this->image );
+ mlt_pool_release( this->alpha );
this->image = NULL;
this->alpha = NULL;
}
}
else if ( this->image == NULL || image_idx != this->image_idx )
{
- mlt_pool_release( this->image_release );
- mlt_pool_release( this->alpha_release );
- this->image_release = NULL;
- this->alpha_release = NULL;
+ mlt_pool_release( this->image );
+ mlt_pool_release( this->alpha );
this->image = NULL;
this->alpha = NULL;
this->height = height;
// Allocate/define image
- this->image = mlt_pool_allocate( width * ( height + 1 ) * 2, &this->image_release );
+ this->image = mlt_pool_alloc( width * ( height + 1 ) * 2 );
// Extract YUV422 and alpha
if ( gdk_pixbuf_get_has_alpha( pixbuf ) )
{
// Allocate the alpha mask
- this->alpha = mlt_pool_allocate( this->width * this->height, &this->alpha_release );
+ this->alpha = mlt_pool_alloc( this->width * this->height );
// Convert the image
mlt_convert_rgb24a_to_yuv422( gdk_pixbuf_get_pixels( pixbuf ),
// 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...
//if ( writable )
{
// Clone our image
- void *release = NULL;
- uint8_t *copy = mlt_pool_allocate( size, &release );
- memcpy( copy, image, size );
+ uint8_t *copy = mlt_pool_alloc( size );
+ if ( image != NULL )
+ memcpy( copy, image, size );
// We're going to pass the copy on
image = copy;
// Now update properties so we free the copy after
- mlt_properties_set_data( properties, "image_release", release, 0, mlt_pool_release, NULL );
- mlt_properties_set_data( properties, "image", copy, size, NULL, NULL );
+ mlt_properties_set_data( properties, "image", copy, size, mlt_pool_release, NULL );
}
// Pass on the image
// 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 );
+
+ 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
+ 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 ++;
+ }
+ }
+ 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 ( 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 );
+ mlt_properties_set_position( properties, "out", 250 );
+ }
+ }
+
// Generate a frame
*frame = mlt_frame_init( );
- // Obtain properties of frame and producer
- mlt_properties properties = mlt_frame_properties( *frame );
+ if ( *frame != NULL && this->count > 0 )
+ {
+ // Obtain properties of frame and producer
+ mlt_properties properties = mlt_frame_properties( *frame );
- // Set the producer on the frame properties
- mlt_properties_set_data( properties, "producer_pixbuf", this, 0, NULL, NULL );
+ // Set the producer on the frame properties
+ mlt_properties_set_data( properties, "producer_pixbuf", this, 0, NULL, NULL );
- // Refresh the image
- refresh_image( *frame, 0, 0 );
+ // Update timecode on the frame we're creating
+ mlt_frame_set_position( *frame, mlt_producer_position( producer ) );
- // 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" ) );
+ // Ensure that we have a way to obtain the position in the get_image
+ mlt_properties_set_position( properties, "pixbuf_position", mlt_producer_position( producer ) );
- // Set alpha call back
- ( *frame )->get_alpha_mask = producer_get_alpha_mask;
+ // Refresh the image
+ refresh_image( *frame, 0, 0 );
- // Push the get_image method
- mlt_frame_push_get_image( *frame, producer_get_image );
+ // Set producer-specific frame properties
+ mlt_properties_set_int( properties, "progressive", 1 );
+ mlt_properties_set_double( properties, "aspect_ratio", 1 );
+
+ // Set alpha call back
+ ( *frame )->get_alpha_mask = producer_get_alpha_mask;
+
+ // Push the get_image method
+ mlt_frame_push_get_image( *frame, producer_get_image );
+ }
// Calculate the next timecode
mlt_producer_prepare_next( producer );
static void producer_close( mlt_producer parent )
{
producer_pixbuf this = parent->child;
- free( this->image );
+ 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 );
}
-
projects / mlt / blobdiff