X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fgtk2%2Fproducer_pixbuf.c;h=3cdd5ed6edbe6ad6086048a85ee6debc04b5d7d7;hb=6405eb05b56e753e9ab7c9ac2c16826d3a0c0ec5;hp=7114979ae3538a7633a2d1aa03bf8776e7f60e10;hpb=1a50e779cfd5e1bc6a80054f6f56e64280c2dc41;p=melted diff --git a/src/modules/gtk2/producer_pixbuf.c b/src/modules/gtk2/producer_pixbuf.c index 7114979..3cdd5ed 100644 --- a/src/modules/gtk2/producer_pixbuf.c +++ b/src/modules/gtk2/producer_pixbuf.c @@ -34,12 +34,6 @@ static int producer_get_frame( mlt_producer parent, mlt_frame_ptr frame, int index ); static void producer_close( mlt_producer parent ); -typedef enum -{ - SIGNAL_FORMAT_PAL, - SIGNAL_FORMAT_NTSC -} mlt_signal_format; - static int filter_files( const struct dirent *de ) { if ( de->d_name[ 0 ] != '.' ) @@ -48,23 +42,23 @@ static int filter_files( const struct dirent *de ) return 0; } - -mlt_producer producer_pixbuf_init( const char *filename ) +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; - producer->get_frame = producer_get_frame; - producer->close = producer_close; - // Get the properties interface mlt_properties properties = mlt_producer_properties( &this->parent ); + // Callback registration + producer->get_frame = producer_get_frame; + producer->close = producer_close; + // Set the default properties - mlt_properties_set_int( properties, "video_standard", mlt_video_standard_pal ); - mlt_properties_set_double( properties, "ttl", 5 ); + mlt_properties_set( properties, "resource", filename ); + mlt_properties_set_int( properties, "ttl", 25 ); // Obtain filenames if ( strchr( filename, '%' ) != NULL ) @@ -89,7 +83,7 @@ mlt_producer producer_pixbuf_init( const char *filename ) gap ++; } } - mlt_properties_set_timecode( properties, "out", this->count ); + mlt_properties_set_position( properties, "out", this->count * 250 ); } else if ( strstr( filename, "/.all." ) != NULL ) { @@ -116,7 +110,6 @@ mlt_producer producer_pixbuf_init( const char *filename ) free( de[ i ] ); } - mlt_properties_set_timecode( properties, "out", this->count ); free( de ); free( dir_name ); } @@ -124,7 +117,7 @@ mlt_producer producer_pixbuf_init( const char *filename ) { this->filenames = realloc( this->filenames, sizeof( char * ) * ( this->count + 1 ) ); this->filenames[ this->count ++ ] = strdup( filename ); - mlt_properties_set_timecode( properties, "out", 1 ); + mlt_properties_set_position( properties, "out", 250 ); } // Initialise gobject types @@ -136,131 +129,89 @@ 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 ) { - // Obtain properties of frame - mlt_properties properties = mlt_frame_properties( this ); - - // May need to know the size of the image to clone it - int size = 0; - - // Get the image - uint8_t *image = mlt_properties_get_data( properties, "image", &size ); - - // Get width and height - *width = mlt_properties_get_int( properties, "width" ); - *height = mlt_properties_get_int( properties, "height" ); - - // 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... - //if ( writable ) - { - size = *width * *height * 2; - - // Clone our image - uint8_t *copy = malloc( size ); - 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 ); - } - - // Pass on the image - *buffer = image; - - return 0; -} + // Pixbuf + GdkPixbuf *pixbuf = NULL; + GError *error = NULL; -static uint8_t *producer_get_alpha_mask( mlt_frame this ) -{ // Obtain properties of frame - mlt_properties properties = mlt_frame_properties( this ); + mlt_properties properties = mlt_frame_properties( frame ); - // Return the alpha mask - return mlt_properties_get_data( properties, "alpha", NULL ); -} + // Obtain the producer for this frame + producer_pixbuf this = mlt_properties_get_data( properties, "producer_pixbuf", NULL ); -static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int index ) -{ - producer_pixbuf this = producer->child; - GdkPixbuf *pixbuf = NULL; - GError *error = NULL; + // Obtain the producer + mlt_producer producer = &this->parent; - // Generate a frame - *frame = mlt_frame_init( ); - - // Obtain properties of frame - mlt_properties properties = mlt_frame_properties( *frame ); + // 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_double( mlt_producer_properties( producer ), "ttl" ); + 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_timecode( *frame, mlt_producer_position( producer ) ); + mlt_frame_set_position( frame, mlt_producer_position( producer ) ); // optimization for subsequent iterations on single picture - if ( this->image != NULL && image_idx == this->image_idx ) + if ( width != 0 && this->image != NULL && image_idx == this->image_idx ) { - // 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 ); + 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 + 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 we have a pixbuf - if ( pixbuf ) - { - // Scale to adjust for sample aspect ratio - if ( mlt_properties_get_int( properties, "video_standard" ) == mlt_video_standard_pal ) - { - GdkPixbuf *temp = pixbuf; - GdkPixbuf *scaled = gdk_pixbuf_scale_simple( pixbuf, - (gint) ( (float) gdk_pixbuf_get_width( pixbuf ) * 54.0/59.0), - gdk_pixbuf_get_height( pixbuf ), GDK_INTERP_HYPER ); - pixbuf = scaled; - g_object_unref( temp ); - } - else + if ( pixbuf != NULL ) { - GdkPixbuf *temp = pixbuf; - GdkPixbuf *scaled = gdk_pixbuf_scale_simple( pixbuf, - (gint) ( (float) gdk_pixbuf_get_width( pixbuf ) * 11.0/10.0 ), - gdk_pixbuf_get_height( pixbuf ), GDK_INTERP_HYPER ); - pixbuf = scaled; - g_object_unref( temp ); + // 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 = gdk_pixbuf_get_width( pixbuf ); - this->height = gdk_pixbuf_get_height( pixbuf ); - this->width -= this->width % 4; - this->height -= this->height % 2; - - // Allocate/define image and alpha - uint8_t *image = malloc( this->width * this->height * 2 ); + 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 @@ -287,25 +238,106 @@ static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int i // 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 + // 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" ); - // 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 ); + // 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; + + // Get the image + uint8_t *image = mlt_properties_get_data( properties, "image", &size ); + + // Get width and height + *width = mlt_properties_get_int( properties, "width" ); + *height = mlt_properties_get_int( properties, "height" ); + + // 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... + //if ( writable ) + { + // Clone our image + // IRRIGATE ME + uint8_t *copy = malloc( size ); + memcpy( copy, image, size ); - // Set alpha call back - ( *frame )->get_alpha_mask = producer_get_alpha_mask; + // We're going to pass the copy on + image = copy; - // Push the get_image method - mlt_frame_push_get_image( *frame, producer_get_image ); + // Now update properties so we free the copy after + mlt_properties_set_data( properties, "image", copy, size, free, NULL ); } + // Pass on the image + *buffer = image; + + return 0; +} + +static uint8_t *producer_get_alpha_mask( mlt_frame this ) +{ + // Obtain properties of frame + mlt_properties properties = mlt_frame_properties( this ); + + // Return the alpha mask + return mlt_properties_get_data( properties, "alpha", NULL ); +} + +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; + + // Generate a frame + *frame = mlt_frame_init( ); + + // Obtain properties of frame and producer + mlt_properties properties = mlt_frame_properties( *frame ); + + // Set the producer on the frame properties + mlt_properties_set_data( properties, "producer_pixbuf", this, 0, NULL, NULL ); + + // Refresh the image + refresh_image( *frame, 0, 0 ); + + // 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" ) ); + + // 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 ); + // Calculate the next timecode mlt_producer_prepare_next( producer ); @@ -315,10 +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->image ) - free( this->image ); - if ( this->alpha ) - free( this->alpha ); + free( this->image ); parent->close = NULL; mlt_producer_close( parent ); free( this );