#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>
+#include <dirent.h>
static int producer_get_frame( mlt_producer parent, mlt_frame_ptr frame, int index );
static void producer_close( mlt_producer parent );
SIGNAL_FORMAT_NTSC
} mlt_signal_format;
-mlt_producer producer_pixbuf_init( const char *filename )
+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 );
- if ( this != NULL && mlt_producer_init( &this->parent, this ) == 0 )
+ if ( filename != NULL && this != NULL && mlt_producer_init( &this->parent, this ) == 0 )
{
mlt_producer producer = &this->parent;
mlt_properties properties = mlt_producer_properties( &this->parent );
// Set the default properties
+ mlt_properties_set( properties, "resource", filename );
mlt_properties_set_int( properties, "video_standard", mlt_video_standard_pal );
mlt_properties_set_double( properties, "ttl", 5 );
gap ++;
}
}
+ mlt_properties_set_position( properties, "out", this->count * 25 );
+ }
+ 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 ] );
+ }
+
+ mlt_properties_set_position( properties, "out", this->count * 25 );
+ 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", 25 );
}
// Initialise gobject types
*height = mlt_properties_get_int( properties, "height" );
// Clone if necessary
- if ( writable )
+ // 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 )
{
+ size = *width * *height * 2;
+
// Clone our image
uint8_t *copy = malloc( size );
memcpy( copy, image, size );
// Obtain properties of frame
mlt_properties properties = mlt_frame_properties( *frame );
+ // Obtain properties of producer
+ mlt_properties producer_props = mlt_producer_properties( producer );
+
// Get the time to live for each frame
- double ttl = mlt_properties_get_double( mlt_producer_properties( producer ), "ttl" );
+ double ttl = mlt_properties_get_double( producer_props, "ttl" );
// Image index
int image_idx = ( int )floor( mlt_producer_position( producer ) / ttl ) % this->count;
// Update timecode on the frame we're creating
- mlt_frame_set_timecode( *frame, mlt_producer_position( producer ) );
+ mlt_frame_set_position( *frame, mlt_producer_position( producer ) );
// optimization for subsequent iterations on single picture
if ( this->image != NULL && image_idx == this->image_idx )
mlt_properties_set_int( properties, "width", this->width );
mlt_properties_set_int( properties, "height", this->height );
+ // Set the compositing properties
+ if ( mlt_properties_get( producer_props, "x" ) != NULL )
+ mlt_properties_set_int( properties, "x", mlt_properties_get_int( producer_props, "x" ) );
+ if ( mlt_properties_get( producer_props, "y" ) != NULL )
+ mlt_properties_set_int( properties, "y", mlt_properties_get_int( producer_props, "y" ) );
+ if ( mlt_properties_get( producer_props, "mix" ) != NULL )
+ mlt_properties_set_double( properties, "image.mix", mlt_properties_get_double( producer_props, "mix" ) );
+
// if picture sequence pass the image and alpha data without destructor
mlt_properties_set_data( properties, "image", this->image, 0, NULL, NULL );
mlt_properties_set_data( properties, "alpha", this->alpha, 0, NULL, NULL );
// Stack the get image callback
mlt_frame_push_get_image( *frame, producer_get_image );
-
}
else
{
// Store width and height
this->width = gdk_pixbuf_get_width( pixbuf );
this->height = gdk_pixbuf_get_height( pixbuf );
+ this->width -= this->width % 4;
+ this->height -= this->height % 2;
// Allocate/define image and alpha
uint8_t *image = malloc( this->width * this->height * 2 );
mlt_properties_set_int( properties, "width", this->width );
mlt_properties_set_int( properties, "height", this->height );
+ // Set the compositing properties
+ if ( mlt_properties_get( producer_props, "x" ) != NULL )
+ mlt_properties_set_int( properties, "x", mlt_properties_get_int( producer_props, "x" ) );
+ if ( mlt_properties_get( producer_props, "y" ) != NULL )
+ mlt_properties_set_int( properties, "y", mlt_properties_get_int( producer_props, "y" ) );
+ if ( mlt_properties_get( producer_props, "mix" ) != NULL )
+ mlt_properties_set_double( properties, "mix", mlt_properties_get_double( producer_props, "mix" ) );
+
// Pass alpha and image on properties with or without destructor
this->image = image;
this->alpha = alpha;
// pass the image and alpha data without destructor
- mlt_properties_set_data( properties, "image", image, 0, NULL, NULL );
- mlt_properties_set_data( properties, "alpha", alpha, 0, NULL, NULL );
+ mlt_properties_set_data( properties, "image", image, this->width * this->height * 2, NULL, NULL );
+ mlt_properties_set_data( properties, "alpha", alpha, this->width * this->height, NULL, NULL );
// Set alpha call back
( *frame )->get_alpha_mask = producer_get_alpha_mask;
projects / melted / blobdiff