X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fgtk2%2Fproducer_pixbuf.c;h=1217bdf434908fa8bcbfd59fa94d9e48ed89366d;hb=8ea022814e4781856eea6767391274dfd5771a37;hp=cc474248bd503eb64a80ce52246481145581a157;hpb=74268cd86c30a0af9f03981c799aa4bba253c6e9;p=melted diff --git a/src/modules/gtk2/producer_pixbuf.c b/src/modules/gtk2/producer_pixbuf.c index cc47424..1217bdf 100644 --- a/src/modules/gtk2/producer_pixbuf.c +++ b/src/modules/gtk2/producer_pixbuf.c @@ -1,3 +1,4 @@ + /* * producer_pixbuf.c -- raster image loader based upon gdk-pixbuf * Copyright (C) 2003-2004 Ushodaya Enterprises Limited @@ -25,110 +26,55 @@ #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 ); +static pthread_mutex_t fastmutex = PTHREAD_MUTEX_INITIALIZER; -typedef enum -{ - SIGNAL_FORMAT_PAL, - SIGNAL_FORMAT_NTSC -} mlt_signal_format; +typedef struct producer_pixbuf_s *producer_pixbuf; -static int filter_files( const struct dirent *de ) +struct producer_pixbuf_s { - if ( de->d_name[ 0 ] != '.' ) - return 1; - else - return 0; -} + struct mlt_producer_s parent; + + // File name list + mlt_properties 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( char *filename ) { producer_pixbuf this = calloc( sizeof( struct producer_pixbuf_s ), 1 ); - if ( filename != NULL && this != NULL && mlt_producer_init( &this->parent, this ) == 0 ) + if ( 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 ); + mlt_properties properties = MLT_PRODUCER_PROPERTIES( &this->parent ); + // Callback registration + producer->get_frame = producer_get_frame; + producer->close = ( mlt_destructor )producer_close; + // Set the default properties mlt_properties_set( properties, "resource", filename ); mlt_properties_set_int( properties, "ttl", 25 ); + mlt_properties_set_int( properties, "aspect_ratio", 1 ); + mlt_properties_set_int( properties, "progressive", 1 ); - // 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 * 25 ); - } - 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", 25 ); - } - - // Initialise gobject types - g_type_init(); - return producer; } free( this ); @@ -138,11 +84,11 @@ mlt_producer producer_pixbuf_init( char *filename ) static void refresh_image( mlt_frame frame, int width, int height ) { // Pixbuf - GdkPixbuf *pixbuf = NULL; + GdkPixbuf *pixbuf = mlt_properties_get_data( MLT_FRAME_PROPERTIES( frame ), "pixbuf", NULL ); GError *error = NULL; // Obtain properties of frame - mlt_properties properties = mlt_frame_properties( frame ); + mlt_properties properties = MLT_FRAME_PROPERTIES( frame ); // Obtain the producer for this frame producer_pixbuf this = mlt_properties_get_data( properties, "producer_pixbuf", NULL ); @@ -151,157 +97,308 @@ static void refresh_image( mlt_frame frame, int width, int height ) mlt_producer producer = &this->parent; // Obtain properties of producer - mlt_properties producer_props = mlt_producer_properties( 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( mlt_producer_position( producer ) / ttl ) % this->count; + int image_idx = ( int )floor( ( double )position / ttl ) % this->count; - // Update timecode on the frame we're creating - mlt_frame_set_position( frame, mlt_producer_position( producer ) ); + pthread_mutex_lock( &fastmutex ); // 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 ) { 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 ); + 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 + else if ( pixbuf == NULL && ( 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 ); + pixbuf = gdk_pixbuf_new_from_file( mlt_properties_get_value( 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_events_block( producer_props, NULL ); + mlt_properties_set_data( producer_props, "_pixbuf", pixbuf, 0, ( mlt_destructor )g_object_unref, NULL ); + g_object_ref( pixbuf ); + mlt_properties_set_data( MLT_FRAME_PROPERTIES( frame ), "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 ) ); + 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 ) ); + mlt_events_unblock( producer_props, NULL ); // 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 ) { - int i; - //fprintf( stderr, "SCALING PIXBUF from %dx%d to %dx%d\n", gdk_pixbuf_get_width( pixbuf ), gdk_pixbuf_get_height( pixbuf ), width, height ); - + 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, GDK_INTERP_HYPER ); - + pixbuf = gdk_pixbuf_scale_simple( pixbuf, width, height, interp ); + // Store width and height - this->width = gdk_pixbuf_get_width( pixbuf ); - this->height = gdk_pixbuf_get_height( pixbuf ); + this->width = width; + this->height = height; // Allocate/define image - // IRRIGATE ME - uint8_t *image = malloc( width * ( height + 1 ) * bpp ); + this->image = mlt_pool_alloc( width * ( height + 1 ) * 2 ); - for ( i = 0; i < height; i++ ) - memcpy( image + i * width * bpp, - gdk_pixbuf_get_pixels( pixbuf ) + i * gdk_pixbuf_get_rowstride( pixbuf ), - gdk_pixbuf_get_width( pixbuf ) * bpp ); + // 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 ); - - // Pass image on properties with or without destructor - free( this->image ); - this->image = image; } // 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" ) ); + 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 ) * bpp, NULL, NULL ); + 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 ); + mlt_properties properties = MLT_FRAME_PROPERTIES( frame ); - // Refresh the image - refresh_image( frame, *width, *height ); + // We need to know the size of the image to clone it + int image_size = 0; + int alpha_size = 0; - // 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; + // Alpha channel + uint8_t *alpha = NULL; - // May need to know the size of the image to clone it - int size = 0; + *width = mlt_properties_get_int( properties, "rescale_width" ); + *height = mlt_properties_get_int( properties, "rescale_height" ); + + // Refresh the image + refresh_image( frame, *width, *height ); // Get the image - uint8_t *image = mlt_properties_get_data( properties, "image", &size ); + *buffer = mlt_properties_get_data( properties, "image", &image_size ); + alpha = mlt_properties_get_data( properties, "alpha", &alpha_size ); - // Get width and height + // Get width and height (may have changed during the refresh) *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 ) + // The fault is not in the design of mlt, but in the implementation of the pixbuf producer... + if ( *buffer != NULL ) { - // Clone our image - // IRRIGATE ME - uint8_t *copy = malloc( size ); - memcpy( copy, image, size ); + // Clone the image and the alpha + uint8_t *image_copy = mlt_pool_alloc( image_size ); + uint8_t *alpha_copy = mlt_pool_alloc( alpha_size ); - // We're going to pass the copy on - image = copy; + memcpy( image_copy, *buffer, image_size ); + + // Copy or default the alpha + if ( alpha != NULL ) + memcpy( alpha_copy, alpha, alpha_size ); + else + memset( alpha_copy, 255, alpha_size ); // 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", image_copy, image_size, mlt_pool_release, NULL ); + mlt_properties_set_data( properties, "alpha", alpha_copy, alpha_size, mlt_pool_release, NULL ); - // Pass on the image - *buffer = image; + // We're going to pass the copy on + *buffer = image_copy; + } + else + { + // TODO: Review all cases of invalid images + *buffer = mlt_pool_alloc( 50 * 50 * 2 ); + mlt_properties_set_data( properties, "image", *buffer, image_size, mlt_pool_release, NULL ); + *width = 50; + *height = 50; + } 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; + // Fetch the producers properties + mlt_properties producer_properties = MLT_PRODUCER_PROPERTIES( producer ); + + if ( this->filenames == NULL && mlt_properties_get( producer_properties, "resource" ) != NULL ) + { + char *filename = mlt_properties_get( producer_properties, "resource" ); + this->filenames = mlt_properties_new( ); + + // 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 ); + + mlt_properties_set( this->filenames, "0", fullname ); + + // Teehe - when the producer closes, delete the temp file and the space allo + mlt_properties_set_data( producer_properties, "__temporary_file__", fullname, 0, ( mlt_destructor )unlink, NULL ); + } + } + // Obtain filenames + else if ( strchr( filename, '%' ) != NULL ) + { + // handle picture sequences + int i = mlt_properties_get_int( producer_properties, "begin" ); + int gap = 0; + char full[1024]; + int keyvalue = 0; + char key[ 50 ]; + + while ( gap < 100 ) + { + struct stat buf; + snprintf( full, 1023, filename, i ++ ); + if ( stat( full, &buf ) == 0 ) + { + sprintf( key, "%d", keyvalue ++ ); + mlt_properties_set( this->filenames, "0", full ); + gap = 0; + } + else + { + gap ++; + } + } + } + else if ( strstr( filename, "/.all." ) != NULL ) + { + char wildcard[ 1024 ]; + char *dir_name = strdup( filename ); + char *extension = strrchr( dir_name, '.' ); + + *( strstr( dir_name, "/.all." ) + 1 ) = '\0'; + sprintf( wildcard, "*%s", extension ); + + mlt_properties_dir_list( this->filenames, dir_name, wildcard, 1 ); + + free( dir_name ); + } + else + { + mlt_properties_set( this->filenames, "0", filename ); + } + + this->count = mlt_properties_count( this->filenames ); + } + // Generate a frame *frame = mlt_frame_init( ); - // Obtain properties of frame and producer - mlt_properties properties = mlt_frame_properties( *frame ); + if ( *frame != NULL && this->count > 0 ) + { + // 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 ); - // Set the producer on the frame properties - mlt_properties_set_data( properties, "producer_pixbuf", this, 0, NULL, NULL ); + // Update timecode on the frame we're creating + mlt_frame_set_position( *frame, mlt_producer_position( producer ) ); - // Refresh the image - refresh_image( *frame, 0, 0 ); + // 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 ) ); - // 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" ) ); + // Refresh the image + refresh_image( *frame, 0, 0 ); - // Push the get_image method - mlt_frame_push_get_image( *frame, producer_get_image ); + // Set producer-specific frame properties + mlt_properties_set_int( properties, "progressive", mlt_properties_get_int( producer_properties, "progressive" ) ); + mlt_properties_set_double( properties, "aspect_ratio", mlt_properties_get_double( producer_properties, "aspect_ratio" ) ); + + // 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 ); @@ -312,9 +409,10 @@ 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; - free( this->image ); + mlt_pool_release( this->image ); + mlt_pool_release( this->alpha ); parent->close = NULL; mlt_producer_close( parent ); + mlt_properties_close( this->filenames ); free( this ); } -