X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fgtk2%2Fproducer_pixbuf.c;h=be66990ce00b33f2ce48c4bdaabd185fc06de7be;hb=e727806e894128be3004502eee4d41537fb31c7d;hp=88355b9a2e093d14b1bf6b03cc8175f49e512db2;hpb=12d4027b3039f13c4b5f9fdb12f2fb4b7d3c3f44;p=melted diff --git a/src/modules/gtk2/producer_pixbuf.c b/src/modules/gtk2/producer_pixbuf.c index 88355b9..be66990 100644 --- a/src/modules/gtk2/producer_pixbuf.c +++ b/src/modules/gtk2/producer_pixbuf.c @@ -25,12 +25,15 @@ #include #include #include +#include #include #include #include #include #include +pthread_mutex_t fastmutex = PTHREAD_MUTEX_INITIALIZER; + typedef struct producer_pixbuf_s *producer_pixbuf; struct producer_pixbuf_s @@ -71,15 +74,12 @@ mlt_producer producer_pixbuf_init( char *filename ) // 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 ); @@ -113,6 +113,8 @@ static void refresh_image( mlt_frame frame, int width, int height ) // 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 ) { @@ -164,7 +166,7 @@ static void refresh_image( mlt_frame frame, int width, int height ) // 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; @@ -206,6 +208,8 @@ static void refresh_image( mlt_frame frame, int width, int 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 ) @@ -219,10 +223,6 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form // 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; @@ -233,6 +233,13 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form *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... @@ -240,7 +247,8 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form { // 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; @@ -274,8 +282,37 @@ static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int i mlt_properties properties = mlt_producer_properties( producer ); char *filename = mlt_properties_get( properties, "resource" ); + // Read xml string + if ( strstr( filename, " -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; @@ -297,7 +334,6 @@ static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int i gap ++; } } - mlt_properties_set_position( properties, "out", this->count * 250 ); } else if ( strstr( filename, "/.all." ) != NULL ) { @@ -315,8 +351,8 @@ static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int 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 ) ) ) + 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 ); @@ -327,34 +363,10 @@ static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int i free( de ); free( dir_name ); } - else if ( strstr( filename, " -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 ); } } @@ -366,6 +378,9 @@ static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int i // 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 ); @@ -380,7 +395,7 @@ static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int i // 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; @@ -406,4 +421,3 @@ static void producer_close( mlt_producer parent ) free( this->filenames ); free( this ); } -