+
/*
* producer_pixbuf.c -- raster image loader based upon gdk-pixbuf
* Copyright (C) 2003-2004 Ushodaya Enterprises Limited
#include <unistd.h>
#include <dirent.h>
-pthread_mutex_t fastmutex = PTHREAD_MUTEX_INITIALIZER;
+static pthread_mutex_t fastmutex = PTHREAD_MUTEX_INITIALIZER;
typedef struct producer_pixbuf_s *producer_pixbuf;
struct mlt_producer_s parent;
// File name list
- char **filenames;
+ mlt_properties filenames;
int count;
int image_idx;
static int producer_get_frame( mlt_producer parent, mlt_frame_ptr frame, int index );
static void producer_close( mlt_producer parent );
-static int filter_files( const struct dirent *de )
-{
- if ( de->d_name[ 0 ] != '.' )
- return 1;
- else
- return 0;
-}
-
mlt_producer producer_pixbuf_init( char *filename )
{
producer_pixbuf this = calloc( sizeof( struct producer_pixbuf_s ), 1 );
// Set the default properties
mlt_properties_set( properties, "resource", filename );
mlt_properties_set_int( properties, "ttl", 25 );
+ mlt_properties_set_int( properties, "aspect_ratio", 1 );
+ mlt_properties_set_int( properties, "progressive", 1 );
return producer;
}
static void refresh_image( mlt_frame frame, int width, int height )
{
// Pixbuf
- GdkPixbuf *pixbuf = NULL;
+ GdkPixbuf *pixbuf = mlt_properties_get_data( MLT_FRAME_PROPERTIES( frame ), "pixbuf", NULL );
GError *error = NULL;
// Obtain properties of frame
{
if ( width != this->width || height != this->height )
{
- pixbuf = mlt_properties_get_data( producer_props, "pixbuf", NULL );
+ pixbuf = mlt_properties_get_data( producer_props, "_pixbuf", 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 )
+ else if ( pixbuf == NULL && ( this->image == NULL || image_idx != this->image_idx ) )
{
mlt_pool_release( this->image );
mlt_pool_release( this->alpha );
this->alpha = NULL;
this->image_idx = image_idx;
- pixbuf = gdk_pixbuf_new_from_file( this->filenames[ image_idx ], &error );
+ pixbuf = gdk_pixbuf_new_from_file( mlt_properties_get_value( this->filenames, image_idx ), &error );
if ( pixbuf != NULL )
{
// Register this pixbuf for destruction and reuse
- mlt_properties_set_data( producer_props, "pixbuf", pixbuf, 0, ( mlt_destructor )g_object_unref, NULL );
+ mlt_events_block( producer_props, NULL );
+ mlt_properties_set_data( producer_props, "_pixbuf", pixbuf, 0, ( mlt_destructor )g_object_unref, NULL );
+ g_object_ref( pixbuf );
+ mlt_properties_set_data( MLT_FRAME_PROPERTIES( frame ), "pixbuf", pixbuf, 0, ( mlt_destructor )g_object_unref, NULL );
- mlt_properties_set_int( producer_props, "real_width", gdk_pixbuf_get_width( pixbuf ) );
- mlt_properties_set_int( producer_props, "real_height", gdk_pixbuf_get_height( pixbuf ) );
+ mlt_properties_set_int( producer_props, "_real_width", gdk_pixbuf_get_width( pixbuf ) );
+ mlt_properties_set_int( producer_props, "_real_height", gdk_pixbuf_get_height( pixbuf ) );
+ mlt_events_unblock( producer_props, NULL );
// Store the width/height of the pixbuf temporarily
this->width = gdk_pixbuf_get_width( pixbuf );
// Set width/height of frame
mlt_properties_set_int( properties, "width", this->width );
mlt_properties_set_int( properties, "height", this->height );
- mlt_properties_set_int( properties, "real_width", mlt_properties_get_int( producer_props, "real_width" ) );
- mlt_properties_set_int( properties, "real_height", mlt_properties_get_int( producer_props, "real_height" ) );
+ mlt_properties_set_int( properties, "real_width", mlt_properties_get_int( producer_props, "_real_width" ) );
+ mlt_properties_set_int( properties, "real_height", mlt_properties_get_int( producer_props, "_real_height" ) );
// pass the image data without destructor
mlt_properties_set_data( properties, "image", this->image, this->width * ( this->height + 1 ) * 2, NULL, NULL );
// Obtain properties of frame
mlt_properties properties = MLT_FRAME_PROPERTIES( frame );
+ // We need to know the size of the image to clone it
+ int image_size = 0;
+ int alpha_size = 0;
+
+ // Alpha channel
+ uint8_t *alpha = NULL;
+
*width = mlt_properties_get_int( properties, "rescale_width" );
*height = mlt_properties_get_int( properties, "rescale_height" );
// Refresh the image
refresh_image( frame, *width, *height );
- // May need to know the size of the image to clone it
- int size = 0;
-
// Get the image
- uint8_t *image = mlt_properties_get_data( properties, "image", &size );
+ *buffer = mlt_properties_get_data( properties, "image", &image_size );
+ alpha = mlt_properties_get_data( properties, "alpha", &alpha_size );
- // Get width and height
+ // Get width and height (may have changed during the refresh)
*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 )
+ // The fault is not in the design of mlt, but in the implementation of the pixbuf producer...
+ if ( *buffer != NULL )
{
- // Clone our image
- uint8_t *copy = mlt_pool_alloc( size );
- if ( image != NULL )
- memcpy( copy, image, size );
+ // Clone the image and the alpha
+ uint8_t *image_copy = mlt_pool_alloc( image_size );
+ uint8_t *alpha_copy = mlt_pool_alloc( alpha_size );
- // We're going to pass the copy on
- image = copy;
+ memcpy( image_copy, *buffer, image_size );
+
+ // Copy or default the alpha
+ if ( alpha != NULL )
+ memcpy( alpha_copy, alpha, alpha_size );
+ else
+ memset( alpha_copy, 255, alpha_size );
// Now update properties so we free the copy after
- mlt_properties_set_data( properties, "image", copy, size, mlt_pool_release, NULL );
- }
+ mlt_properties_set_data( properties, "image", image_copy, image_size, mlt_pool_release, NULL );
+ mlt_properties_set_data( properties, "alpha", alpha_copy, alpha_size, mlt_pool_release, NULL );
- // Pass on the image
- *buffer = image;
+ // We're going to pass the copy on
+ *buffer = image_copy;
+ }
+ else
+ {
+ // TODO: Review all cases of invalid images
+ *buffer = mlt_pool_alloc( 50 * 50 * 2 );
+ mlt_properties_set_data( properties, "image", *buffer, image_size, mlt_pool_release, NULL );
+ *width = 50;
+ *height = 50;
+ }
return 0;
}
// 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 )
+ // Fetch the producers properties
+ mlt_properties producer_properties = MLT_PRODUCER_PROPERTIES( producer );
+
+ if ( this->filenames == NULL && mlt_properties_get( producer_properties, "resource" ) != NULL )
{
- mlt_properties properties = MLT_PRODUCER_PROPERTIES( producer );
- char *filename = mlt_properties_get( properties, "resource" );
-
+ char *filename = mlt_properties_get( producer_properties, "resource" );
+ this->filenames = mlt_properties_new( );
+
// Read xml string
if ( strstr( filename, "<svg" ) )
{
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( this->filenames, "0", 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 );
+ mlt_properties_set_data( producer_properties, "__temporary_file__", fullname, 0, ( mlt_destructor )unlink, NULL );
}
}
// Obtain filenames
else if ( strchr( filename, '%' ) != NULL )
{
// handle picture sequences
- int i = mlt_properties_get_int( properties, "begin" );
+ int i = mlt_properties_get_int( producer_properties, "begin" );
int gap = 0;
char full[1024];
+ int keyvalue = 0;
+ char key[ 50 ];
while ( gap < 100 )
{
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 );
+ sprintf( key, "%d", keyvalue ++ );
+ mlt_properties_set( this->filenames, "0", full );
gap = 0;
}
else
}
else if ( strstr( filename, "/.all." ) != NULL )
{
+ char wildcard[ 1024 ];
char *dir_name = strdup( filename );
- char *extension = strrchr( filename, '.' );
+ char *extension = strrchr( dir_name, '.' );
+
*( 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 );
+ sprintf( wildcard, "*%s", extension );
- 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 ] );
- }
+ mlt_properties_dir_list( this->filenames, dir_name, wildcard, 1 );
- 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( this->filenames, "0", filename );
}
+
+ this->count = mlt_properties_count( this->filenames );
}
// Generate a frame
// Obtain properties of frame and producer
mlt_properties properties = MLT_FRAME_PROPERTIES( *frame );
- // Determine if we're rendering for PAL or NTSC
- int is_pal = mlt_properties_get_int( properties, "normalised_height" ) == 576;
-
// Set the producer on the frame properties
mlt_properties_set_data( properties, "producer_pixbuf", this, 0, NULL, NULL );
refresh_image( *frame, 0, 0 );
// 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_int( properties, "progressive", mlt_properties_get_int( producer_properties, "progressive" ) );
+ mlt_properties_set_double( properties, "aspect_ratio", mlt_properties_get_double( producer_properties, "aspect_ratio" ) );
// Set alpha call back
( *frame )->get_alpha_mask = producer_get_alpha_mask;
{
producer_pixbuf this = parent->child;
mlt_pool_release( this->image );
+ mlt_pool_release( this->alpha );
parent->close = NULL;
mlt_producer_close( parent );
- while ( this->count -- )
- free( this->filenames[ this->count ] );
- free( this->filenames );
+ mlt_properties_close( this->filenames );
free( this );
}
projects / melted / blobdiff