#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <pthread.h>
#include <math.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>
#include <dirent.h>
+pthread_mutex_t fastmutex = PTHREAD_MUTEX_INITIALIZER;
+
typedef struct producer_pixbuf_s *producer_pixbuf;
struct producer_pixbuf_s
// 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 );
- // Initialise gobject types
- g_type_init();
-
return producer;
}
free( this );
// Image index
int image_idx = ( int )floor( ( double )position / ttl ) % this->count;
+ pthread_mutex_lock( &fastmutex );
+
// optimization for subsequent iterations on single picture
if ( width != 0 && this->image != NULL && image_idx == this->image_idx )
{
// 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;
// pass the image data without destructor
mlt_properties_set_data( properties, "image", this->image, this->width * ( this->height + 1 ) * 2, NULL, NULL );
mlt_properties_set_data( properties, "alpha", this->alpha, this->width * this->height, NULL, NULL );
+
+ pthread_mutex_unlock( &fastmutex );
}
static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_format *format, int *width, int *height, int writable )
// 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;
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
- if ( strchr( filename, '%' ) != NULL )
+ else if ( strchr( filename, '%' ) != NULL )
{
// handle picture sequences
int i = 0;
gap ++;
}
}
- mlt_properties_set_position( properties, "out", this->count * 250 );
}
else if ( strstr( filename, "/.all." ) != NULL )
{
{
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 );
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 ) );
this->filenames[ this->count ++ ] = strdup( filename );
- mlt_properties_set_position( properties, "out", 250 );
}
}
// 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 );
// 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", is_pal ? 59.0/54.0 : 10.0/11.0 );
// Set alpha call back
( *frame )->get_alpha_mask = producer_get_alpha_mask;
free( this->filenames );
free( this );
}
-
projects / melted / blobdiff