X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fgtk2%2Fproducer_pixbuf.c;h=3cdd5ed6edbe6ad6086048a85ee6debc04b5d7d7;hb=6405eb05b56e753e9ab7c9ac2c16826d3a0c0ec5;hp=8a74a468fb13849054785bca922ee430764b1450;hpb=661165812e3410fe2f6f49d7af882b36a0efcf82;p=melted diff --git a/src/modules/gtk2/producer_pixbuf.c b/src/modules/gtk2/producer_pixbuf.c index 8a74a46..3cdd5ed 100644 --- a/src/modules/gtk2/producer_pixbuf.c +++ b/src/modules/gtk2/producer_pixbuf.c @@ -20,26 +20,107 @@ #include "producer_pixbuf.h" #include +#include + #include #include #include -#include +#include +#include +#include +#include +#include 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 ) + if ( filename != NULL && 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; + // Set the default properties + mlt_properties_set( properties, "resource", filename ); + mlt_properties_set_int( properties, "ttl", 25 ); + + // Obtain filenames + 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 ++; + } + } + mlt_properties_set_position( properties, "out", this->count * 250 ); + } + 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 ] ); + } + + 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", 250 ); + } + + // Initialise gobject types g_type_init(); return producer; @@ -48,10 +129,145 @@ mlt_producer producer_pixbuf_init( const char *filename ) 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" ); + + // 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_position( frame, mlt_producer_position( producer ) ); + + // 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_properties_set_int( producer_props, "bpp", gdk_pixbuf_get_has_alpha( pixbuf ) ? 4 : 3 ); + free( this->image ); + free( this->alpha ); + this->image = NULL; + this->alpha = NULL; + } + } + else if ( this->image == NULL || image_idx != this->image_idx ) + { + free( this->image ); + free( 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 ); + + mlt_properties_set_int( producer_props, "bpp", gdk_pixbuf_get_has_alpha( pixbuf ) ? 4 : 3 ); + } + } + + int bpp = mlt_properties_get_int( producer_props, "bpp" ); + + // If we have a pixbuf + if ( pixbuf && width > 0 ) + { + + // Note - the original pixbuf is already safe and ready for destruction + pixbuf = gdk_pixbuf_scale_simple( pixbuf, width, height, GDK_INTERP_NEAREST ); + + // Store width and height + this->width = width; + this->height = height; + + //fprintf( stderr, "SCALING PIXBUF from %dx%d to %dx%d %dx%d\n", gdk_pixbuf_get_width( pixbuf ), gdk_pixbuf_get_height( pixbuf ), width, height, this->width, this->height ); + // Allocate/define image + // IRRIGATE ME + uint8_t *image = malloc( width * ( height + 1 ) * bpp ); + uint8_t *alpha = NULL; + + // 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 ); + } + + // Finished with pixbuf now + g_object_unref( pixbuf ); + + // Assign images to producer + this->image = image; + this->alpha = alpha; + } + + // 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 ); +} + +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 ); + + // 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; @@ -64,9 +280,12 @@ static int producer_get_image( mlt_frame this, uint8_t **buffer, mlt_image_forma *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 ) { // Clone our image + // IRRIGATE ME uint8_t *copy = malloc( size ); memcpy( copy, image, size ); @@ -83,7 +302,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,120 +313,30 @@ 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 + // Obtain properties of frame and producer 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 ); + // Set the producer on the frame properties + mlt_properties_set_data( properties, "producer_pixbuf", this, 0, NULL, NULL ); - // 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 ); + // Refresh the image + refresh_image( *frame, 0, 0 ); - // Set alpha mask call back - ( *frame )->get_alpha_mask = producer_get_alpha_mask; + // 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" ) ); - // Stack the get image callback - mlt_frame_push_get_image( *frame, producer_get_image ); + // Set alpha call back + ( *frame )->get_alpha_mask = producer_get_alpha_mask; - } - else if ( strchr( this->filename, '%' ) != NULL ) - { - // handle picture sequences - char filename[1024]; - filename[1023] = 0; - int current = this->counter; - do - { - ++this->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 ); - } - - // If we have a pixbuf - if ( pixbuf ) - { - // Store width and height - this->width = gdk_pixbuf_get_width( pixbuf ); - this->height = gdk_pixbuf_get_height( pixbuf ); - - // Allocate/define image and alpha - uint8_t *image = malloc( this->width * this->height * 2 ); - uint8_t *alpha = NULL; - - // 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 ); - } - - // 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 ); - - // 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; - - // 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 alpha call back - ( *frame )->get_alpha_mask = producer_get_alpha_mask; - - // Push the get_image method - 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 ) ); + // Push the get_image method + mlt_frame_push_get_image( *frame, producer_get_image ); // Calculate the next timecode mlt_producer_prepare_next( producer ); @@ -218,12 +347,7 @@ 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 ); + free( this->image ); parent->close = NULL; mlt_producer_close( parent ); free( this );