X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fgtk2%2Fproducer_pixbuf.c;h=95cae13ade88d59a3322b3d80a086b4b75a5d378;hb=2ff111fe322cfdea5b879dd7912a8a375af62aff;hp=5e341fee528e9718db4b3e392b5041d26240da71;hpb=d7ae73d25cf5a38a3a8153ae52409fcbef16bb22;p=melted diff --git a/src/modules/gtk2/producer_pixbuf.c b/src/modules/gtk2/producer_pixbuf.c index 5e341fe..95cae13 100644 --- a/src/modules/gtk2/producer_pixbuf.c +++ b/src/modules/gtk2/producer_pixbuf.c @@ -164,7 +164,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; @@ -219,10 +219,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 +229,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 +243,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 +278,39 @@ 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 ); + + 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 - if ( strchr( filename, '%' ) != NULL ) + else if ( strchr( filename, '%' ) != NULL ) { // handle picture sequences int i = 0; @@ -315,8 +350,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,29 +362,6 @@ 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 ) ); @@ -380,7 +392,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", 1 ); // Set alpha call back ( *frame )->get_alpha_mask = producer_get_alpha_mask; @@ -401,11 +413,8 @@ static void producer_close( mlt_producer parent ) mlt_pool_release( this->image ); parent->close = NULL; mlt_producer_close( parent ); - while ( *this->filenames ) - { - free( *this->filenames ); - this->filenames++; - } + while ( this->count -- ) + free( this->filenames[ this->count ] ); + free( this->filenames ); free( this ); } -