X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fgtk2%2Fproducer_pixbuf.c;h=be66990ce00b33f2ce48c4bdaabd185fc06de7be;hb=e727806e894128be3004502eee4d41537fb31c7d;hp=8a74a468fb13849054785bca922ee430764b1450;hpb=661165812e3410fe2f6f49d7af882b36a0efcf82;p=melted diff --git a/src/modules/gtk2/producer_pixbuf.c b/src/modules/gtk2/producer_pixbuf.c index 8a74a46..be66990 100644 --- a/src/modules/gtk2/producer_pixbuf.c +++ b/src/modules/gtk2/producer_pixbuf.c @@ -20,38 +20,208 @@ #include "producer_pixbuf.h" #include +#include + #include #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 +{ + struct mlt_producer_s parent; + + // File name list + char **filenames; + int count; + int image_idx; + + int width; + int height; + uint8_t *image; + uint8_t *alpha; +}; static int producer_get_frame( mlt_producer parent, mlt_frame_ptr frame, int index ); static void producer_close( mlt_producer parent ); -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 ) { mlt_producer producer = &this->parent; + // Get the properties interface + mlt_properties properties = mlt_producer_properties( &this->parent ); + + // Callback registration producer->get_frame = producer_get_frame; - producer->close = producer_close; - - this->filename = strdup( filename ); - this->counter = -1; - g_type_init(); + producer->close = ( mlt_destructor )producer_close; + // Set the default properties + mlt_properties_set( properties, "resource", filename ); + mlt_properties_set_int( properties, "ttl", 25 ); + return producer; } free( this ); return NULL; } -static int producer_get_image( mlt_frame this, uint8_t **buffer, mlt_image_format *format, int *width, int *height, int writable ) +static void refresh_image( mlt_frame frame, int width, int height ) { + // Pixbuf + GdkPixbuf *pixbuf = NULL; + GError *error = NULL; + // Obtain properties of frame - mlt_properties properties = mlt_frame_properties( this ); + mlt_properties properties = mlt_frame_properties( frame ); + + // Obtain the producer for this frame + producer_pixbuf this = mlt_properties_get_data( properties, "producer_pixbuf", NULL ); + + // Obtain the producer + mlt_producer producer = &this->parent; + + // 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_int( producer_props, "ttl" ); + + // Get the original position of this frame + mlt_position position = mlt_properties_get_position( properties, "pixbuf_position" ); + + // 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 ) + { + if ( width != this->width || height != this->height ) + { + 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 ) + { + mlt_pool_release( this->image ); + mlt_pool_release( this->alpha ); + this->image = NULL; + this->alpha = NULL; + + this->image_idx = image_idx; + pixbuf = gdk_pixbuf_new_from_file( 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_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 ) ); + + // Store the width/height of the pixbuf temporarily + this->width = gdk_pixbuf_get_width( pixbuf ); + this->height = gdk_pixbuf_get_height( pixbuf ); + } + } + + // If we have a pixbuf + if ( pixbuf && width > 0 ) + { + char *interps = mlt_properties_get( properties, "rescale.interp" ); + int interp = GDK_INTERP_BILINEAR; + + if ( strcmp( interps, "nearest" ) == 0 ) + interp = GDK_INTERP_NEAREST; + else if ( strcmp( interps, "tiles" ) == 0 ) + interp = GDK_INTERP_TILES; + else if ( strcmp( interps, "hyper" ) == 0 ) + interp = GDK_INTERP_HYPER; + + // 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; + + // Allocate/define image + this->image = mlt_pool_alloc( width * ( height + 1 ) * 2 ); + + // Extract YUV422 and alpha + if ( gdk_pixbuf_get_has_alpha( pixbuf ) ) + { + // Allocate the alpha mask + this->alpha = mlt_pool_alloc( this->width * this->height ); + + // Convert the image + mlt_convert_rgb24a_to_yuv422( gdk_pixbuf_get_pixels( pixbuf ), + this->width, this->height, + gdk_pixbuf_get_rowstride( pixbuf ), + this->image, this->alpha ); + } + else + { + // No alpha to extract + mlt_convert_rgb24_to_yuv422( gdk_pixbuf_get_pixels( pixbuf ), + this->width, this->height, + gdk_pixbuf_get_rowstride( pixbuf ), + this->image ); + } + + // Finished with pixbuf now + g_object_unref( 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" ) ); + + // 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 ) +{ + // Obtain properties of frame + mlt_properties properties = mlt_frame_properties( frame ); + + *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; @@ -63,18 +233,28 @@ static int producer_get_image( mlt_frame this, uint8_t **buffer, mlt_image_forma *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 - 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 ) { // Clone our image - uint8_t *copy = malloc( size ); - memcpy( copy, image, size ); + uint8_t *copy = mlt_pool_alloc( size ); + if ( image != NULL ) + memcpy( copy, image, size ); // We're going to pass the copy on image = copy; // Now update properties so we free the copy after - mlt_properties_set_data( properties, "image", copy, size, free, NULL ); + mlt_properties_set_data( properties, "image", copy, size, mlt_pool_release, NULL ); } // Pass on the image @@ -83,7 +263,7 @@ static int producer_get_image( mlt_frame this, uint8_t **buffer, mlt_image_forma return 0; } -uint8_t *producer_get_alpha_mask( mlt_frame this ) +static uint8_t *producer_get_alpha_mask( mlt_frame this ) { // Obtain properties of frame mlt_properties properties = mlt_frame_properties( this ); @@ -94,110 +274,128 @@ uint8_t *producer_get_alpha_mask( mlt_frame this ) static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int index ) { + // Get the real structure for this producer producer_pixbuf this = producer->child; - GdkPixbuf *pixbuf = NULL; - GError *error = NULL; - - // Generate a frame - *frame = mlt_frame_init( ); - - // Obtain properties of frame - mlt_properties properties = mlt_frame_properties( *frame ); - - // optimization for subsequent iterations on single picture - if ( this->image != NULL ) - { - // Set width/height - mlt_properties_set_int( properties, "width", this->width ); - mlt_properties_set_int( properties, "height", this->height ); - - // 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 ); - // Set alpha mask call back - ( *frame )->get_alpha_mask = producer_get_alpha_mask; - - // Stack the get image callback - mlt_frame_push_get_image( *frame, producer_get_image ); - - } - else if ( strchr( this->filename, '%' ) != NULL ) + if ( this->count == 0 && mlt_properties_get( mlt_producer_properties( producer ), "resource" ) != NULL ) { - // handle picture sequences - char filename[1024]; - filename[1023] = 0; - int current = this->counter; - do + mlt_properties properties = mlt_producer_properties( producer ); + char *filename = mlt_properties_get( properties, "resource" ); + + // Read xml string + if ( strstr( filename, "counter; - snprintf( filename, 1023, this->filename, this->counter ); - pixbuf = gdk_pixbuf_new_from_file( filename, &error ); - // allow discontinuity in frame numbers up to 99 - error = NULL; - } while ( pixbuf == NULL && ( this->counter - current ) < 100 ); - } - else - { - pixbuf = gdk_pixbuf_new_from_file( this->filename, &error ); + // 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 + else if ( strchr( filename, '%' ) != NULL ) + { + // handle picture sequences + int i = 0; + int gap = 0; + char full[1024]; + + while ( gap < 100 ) + { + struct stat buf; + 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 ); + gap = 0; + } + else + { + gap ++; + } + } + } + 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 ( 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 ] ); + } + + free( de ); + free( dir_name ); + } + else + { + this->filenames = realloc( this->filenames, sizeof( char * ) * ( this->count + 1 ) ); + this->filenames[ this->count ++ ] = strdup( filename ); + } } - // If we have a pixbuf - if ( pixbuf ) + // Generate a frame + *frame = mlt_frame_init( ); + + if ( *frame != NULL && this->count > 0 ) { - // Store width and height - this->width = gdk_pixbuf_get_width( pixbuf ); - this->height = gdk_pixbuf_get_height( pixbuf ); + // Obtain properties of frame and producer + mlt_properties properties = mlt_frame_properties( *frame ); - // Allocate/define image and alpha - uint8_t *image = malloc( this->width * this->height * 2 ); - uint8_t *alpha = NULL; + // Determine if we're rendering for PAL or NTSC + int is_pal = mlt_properties_get_int( properties, "normalised_height" ) == 576; - // Extract YUV422 and alpha - if ( gdk_pixbuf_get_has_alpha( pixbuf ) ) - { - // Allocate the alpha mask - alpha = malloc( this->width * this->height ); - - // Convert the image - mlt_convert_rgb24a_to_yuv422( gdk_pixbuf_get_pixels( pixbuf ), - this->width, this->height, - gdk_pixbuf_get_rowstride( pixbuf ), - image, alpha ); - } - else - { - // No alpha to extract - mlt_convert_rgb24_to_yuv422( gdk_pixbuf_get_pixels( pixbuf ), - this->width, this->height, - gdk_pixbuf_get_rowstride( pixbuf ), - image ); - } + // Set the producer on the frame properties + mlt_properties_set_data( properties, "producer_pixbuf", this, 0, NULL, NULL ); - // Finished with pixbuf now - g_object_unref( pixbuf ); + // Update timecode on the frame we're creating + mlt_frame_set_position( *frame, mlt_producer_position( producer ) ); - // Set width/height of frame - mlt_properties_set_int( properties, "width", this->width ); - mlt_properties_set_int( properties, "height", this->height ); + // Ensure that we have a way to obtain the position in the get_image + mlt_properties_set_position( properties, "pixbuf_position", mlt_producer_position( producer ) ); - // Pass alpha and image on properties with or without destructor - if ( this->counter >= 0 ) - { - // if picture sequence pass the image and alpha data with destructor - mlt_properties_set_data( properties, "image", image, 0, free, NULL ); - mlt_properties_set_data( properties, "alpha", alpha, 0, free, NULL ); - } - else - { - // if single picture, reference the image and alpha in the producer - this->image = image; - this->alpha = alpha; + // Refresh the image + refresh_image( *frame, 0, 0 ); - // 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 ); - } + // 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 ); // Set alpha call back ( *frame )->get_alpha_mask = producer_get_alpha_mask; @@ -206,9 +404,6 @@ static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int i mlt_frame_push_get_image( *frame, producer_get_image ); } - // Update timecode on the frame we're creating - mlt_frame_set_timecode( *frame, mlt_producer_position( producer ) ); - // Calculate the next timecode mlt_producer_prepare_next( producer ); @@ -218,14 +413,11 @@ static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int i static void producer_close( mlt_producer parent ) { producer_pixbuf this = parent->child; - if ( this->filename ) - free( this->filename ); - if ( this->image ) - free( this->image ); - if ( this->alpha ) - free( this->alpha ); + mlt_pool_release( this->image ); parent->close = NULL; mlt_producer_close( parent ); + while ( this->count -- ) + free( this->filenames[ this->count ] ); + free( this->filenames ); free( this ); } -