X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmodules%2Fgtk2%2Fproducer_pixbuf.c;h=e155f4031d54df6a5eb526cbc30adf774d4e610c;hb=3f84fe14c06956b5092c257fd27da490565566e5;hp=6f39eb809379bc2f96b74d8b7161cb2701c291af;hpb=a8e057ad779c35eb84698d53bb35507e70455229;p=mlt diff --git a/src/modules/gtk2/producer_pixbuf.c b/src/modules/gtk2/producer_pixbuf.c index 6f39eb80..e155f403 100644 --- a/src/modules/gtk2/producer_pixbuf.c +++ b/src/modules/gtk2/producer_pixbuf.c @@ -22,8 +22,13 @@ #include #include #include +#include #include +#ifdef USE_EXIF +#include +#endif + #include #include #include @@ -33,7 +38,9 @@ #include #include #include +#include +// this protects concurrent access to gdk_pixbuf static pthread_mutex_t g_mutex = PTHREAD_MUTEX_INITIALIZER; typedef struct producer_pixbuf_s *producer_pixbuf; @@ -49,26 +56,29 @@ struct producer_pixbuf_s int pixbuf_idx; int width; int height; - int alpha; + uint8_t *alpha; uint8_t *image; mlt_cache_item image_cache; - pthread_mutex_t mutex; + mlt_cache_item alpha_cache; + mlt_cache_item pixbuf_cache; + GdkPixbuf *pixbuf; + mlt_image_format format; }; -static void load_filenames( producer_pixbuf this, mlt_properties producer_properties ); -static void refresh_image( producer_pixbuf this, mlt_frame frame, int width, int height ); +static void load_filenames( producer_pixbuf self, mlt_properties producer_properties ); +static int refresh_pixbuf( producer_pixbuf self, mlt_frame frame ); 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 ( this != NULL && mlt_producer_init( &this->parent, this ) == 0 ) + producer_pixbuf self = calloc( 1, sizeof( struct producer_pixbuf_s ) ); + if ( self != NULL && mlt_producer_init( &self->parent, self ) == 0 ) { - mlt_producer producer = &this->parent; + mlt_producer producer = &self->parent; // Get the properties interface - mlt_properties properties = MLT_PRODUCER_PROPERTIES( &this->parent ); + mlt_properties properties = MLT_PRODUCER_PROPERTIES( &self->parent ); // Callback registration producer->get_frame = producer_get_frame; @@ -79,73 +89,81 @@ mlt_producer producer_pixbuf_init( char *filename ) mlt_properties_set_int( properties, "ttl", 25 ); mlt_properties_set_int( properties, "aspect_ratio", 1 ); mlt_properties_set_int( properties, "progressive", 1 ); + mlt_properties_set_int( properties, "seekable", 1 ); + mlt_properties_set_int( properties, "loop", 1 ); // Validate the resource if ( filename ) - load_filenames( this, properties ); - if ( this->count ) + load_filenames( self, properties ); + if ( self->count ) { mlt_frame frame = mlt_frame_init( MLT_PRODUCER_SERVICE( producer ) ); if ( frame ) { mlt_properties frame_properties = MLT_FRAME_PROPERTIES( frame ); - pthread_mutex_init( &this->mutex, NULL ); - mlt_properties_set_data( frame_properties, "producer_pixbuf", this, 0, NULL, NULL ); + mlt_properties_set_data( frame_properties, "producer_pixbuf", self, 0, NULL, NULL ); mlt_frame_set_position( frame, mlt_producer_position( producer ) ); - mlt_properties_set_position( frame_properties, "pixbuf_position", mlt_producer_position( producer ) ); - refresh_image( this, frame, 0, 0 ); + refresh_pixbuf( self, frame ); + mlt_cache_item_close( self->pixbuf_cache ); mlt_frame_close( frame ); } } - if ( this->width == 0 ) + if ( self->width == 0 ) { producer_close( producer ); producer = NULL; } return producer; } - free( this ); + free( self ); return NULL; } -static void load_filenames( producer_pixbuf this, mlt_properties producer_properties ) +static int load_svg( producer_pixbuf self, mlt_properties properties, const char *filename ) { - char *filename = mlt_properties_get( producer_properties, "resource" ); - this->filenames = mlt_properties_new( ); + int result = 0; // Read xml string if ( strstr( filename, " -1 ) { // Write the svg into the temp file ssize_t remaining_bytes; - char *xml = filename; - + const 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 ); + mlt_properties_set( self->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 ); + mlt_properties_set_data( properties, "__temporary_file__", fullname, 0, ( mlt_destructor )unlink, NULL ); + result = 1; } } - // Obtain filenames - else if ( strchr( filename, '%' ) != NULL ) + return result; +} + +static int load_sequence_sprintf( producer_pixbuf self, mlt_properties properties, const char *filename ) +{ + int result = 0; + + // Obtain filenames with pattern + if ( strchr( filename, '%' ) != NULL ) { // handle picture sequences - int i = mlt_properties_get_int( producer_properties, "begin" ); + int i = mlt_properties_get_int( properties, "begin" ); int gap = 0; char full[1024]; int keyvalue = 0; @@ -158,7 +176,7 @@ static void load_filenames( producer_pixbuf this, mlt_properties producer_proper if ( stat( full, &buf ) == 0 ) { sprintf( key, "%d", keyvalue ++ ); - mlt_properties_set( this->filenames, key, full ); + mlt_properties_set( self->filenames, key, full ); gap = 0; } else @@ -166,10 +184,72 @@ static void load_filenames( producer_pixbuf this, mlt_properties producer_proper gap ++; } } - if ( mlt_properties_count( this->filenames ) > 0 ) - mlt_properties_set_int( producer_properties, "ttl", 1 ); + if ( mlt_properties_count( self->filenames ) > 0 ) + { + mlt_properties_set_int( properties, "ttl", 1 ); + result = 1; + } + } + return result; +} + +static int load_sequence_deprecated( producer_pixbuf self, mlt_properties properties, const char *filename ) +{ + int result = 0; + const char *start; + + // This approach is deprecated in favor of the begin querystring parameter. + // Obtain filenames with pattern containing a begin value, e.g. foo%1234d.png + if ( ( start = strchr( filename, '%' ) ) ) + { + const char *end = ++start; + while ( isdigit( *end ) ) end++; + if ( end > start && ( end[0] == 'd' || end[0] == 'i' || end[0] == 'u' ) ) + { + int n = end - start; + char *s = calloc( 1, n + 1 ); + strncpy( s, start, n ); + mlt_properties_set( properties, "begin", s ); + free( s ); + s = calloc( 1, strlen( filename ) + 2 ); + strncpy( s, filename, start - filename ); + sprintf( s + ( start - filename ), ".%d%s", n, end ); + result = load_sequence_sprintf( self, properties, s ); + free( s ); + } + } + return result; +} + +static int load_sequence_querystring( producer_pixbuf self, mlt_properties properties, const char *filename ) +{ + int result = 0; + + // Obtain filenames with pattern and begin value in query string + if ( strchr( filename, '%' ) && strchr( filename, '?' ) ) + { + // Split filename into pattern and query string + char *s = strdup( filename ); + char *querystring = strrchr( s, '?' ); + *querystring++ = '\0'; + if ( strstr( filename, "begin=" ) ) + mlt_properties_set( properties, "begin", strstr( querystring, "begin=" ) + 6 ); + else if ( strstr( filename, "begin:" ) ) + mlt_properties_set( properties, "begin", strstr( querystring, "begin:" ) + 6 ); + // Coerce to an int value so serialization does not have any extra query string cruft + mlt_properties_set_int( properties, "begin", mlt_properties_get_int( properties, "begin" ) ); + result = load_sequence_sprintf( self, properties, s ); + free( s ); } - else if ( strstr( filename, "/.all." ) != NULL ) + return result; +} + +static int load_folder( producer_pixbuf self, mlt_properties properties, const char *filename ) +{ + int result = 0; + + // Obtain filenames with folder + if ( strstr( filename, "/.all." ) != NULL ) { char wildcard[ 1024 ]; char *dir_name = strdup( filename ); @@ -178,49 +258,107 @@ static void load_filenames( producer_pixbuf this, mlt_properties producer_proper *( strstr( dir_name, "/.all." ) + 1 ) = '\0'; sprintf( wildcard, "*%s", extension ); - mlt_properties_dir_list( this->filenames, dir_name, wildcard, 1 ); + mlt_properties_dir_list( self->filenames, dir_name, wildcard, 1 ); free( dir_name ); + result = 1; } - else + return result; +} + +static void load_filenames( producer_pixbuf self, mlt_properties properties ) +{ + char *filename = mlt_properties_get( properties, "resource" ); + self->filenames = mlt_properties_new( ); + + if (!load_svg( self, properties, filename ) && + !load_sequence_querystring( self, properties, filename ) && + !load_sequence_sprintf( self, properties, filename ) && + !load_sequence_deprecated( self, properties, filename ) && + !load_folder( self, properties, filename ) ) { - mlt_properties_set( this->filenames, "0", filename ); + mlt_properties_set( self->filenames, "0", filename ); } - - this->count = mlt_properties_count( this->filenames ); + self->count = mlt_properties_count( self->filenames ); } -static void refresh_image( producer_pixbuf this, mlt_frame frame, int width, int height ) +static GdkPixbuf* reorient_with_exif( producer_pixbuf self, int image_idx, GdkPixbuf *pixbuf ) { - // Obtain properties of frame - mlt_properties properties = MLT_FRAME_PROPERTIES( frame ); - - // Obtain the producer - mlt_producer producer = &this->parent; +#ifdef USE_EXIF + mlt_properties producer_props = MLT_PRODUCER_PROPERTIES( &self->parent ); + ExifData *d = exif_data_new_from_file( mlt_properties_get_value( self->filenames, image_idx ) ); + ExifEntry *entry; + int exif_orientation = 0; + + /* get orientation and rotate image accordingly if necessary */ + if (d) + { + if ( ( entry = exif_content_get_entry ( d->ifd[EXIF_IFD_0], EXIF_TAG_ORIENTATION ) ) ) + exif_orientation = exif_get_short (entry->data, exif_data_get_byte_order (d)); - // Obtain properties of producer - mlt_properties producer_props = MLT_PRODUCER_PROPERTIES( producer ); + /* Free the EXIF data */ + exif_data_unref(d); + } - // Obtain the cache flag and structure - int use_cache = mlt_properties_get_int( producer_props, "cache" ); - mlt_properties cache = mlt_properties_get_data( producer_props, "_cache", NULL ); - int update_cache = 0; + // Remember EXIF value, might be useful for someone + mlt_properties_set_int( producer_props, "_exif_orientation" , exif_orientation ); - // restore GdkPixbuf - pthread_mutex_lock( &this->mutex ); - mlt_cache_item pixbuf_cache = mlt_service_cache_get( MLT_PRODUCER_SERVICE( producer ), "pixbuf.pixbuf" ); - GdkPixbuf *pixbuf = mlt_cache_item_data( pixbuf_cache, NULL ); - GError *error = NULL; + if ( exif_orientation > 1 ) + { + GdkPixbuf *processed = NULL; + GdkPixbufRotation matrix = GDK_PIXBUF_ROTATE_NONE; + + // Rotate image according to exif data + switch ( exif_orientation ) { + case 2: + processed = gdk_pixbuf_flip ( pixbuf, TRUE ); + break; + case 3: + matrix = GDK_PIXBUF_ROTATE_UPSIDEDOWN; + processed = pixbuf; + break; + case 4: + processed = gdk_pixbuf_flip ( pixbuf, FALSE ); + break; + case 5: + matrix = GDK_PIXBUF_ROTATE_COUNTERCLOCKWISE; + processed = gdk_pixbuf_flip ( pixbuf, TRUE ); + break; + case 6: + matrix = GDK_PIXBUF_ROTATE_CLOCKWISE; + processed = pixbuf; + break; + case 7: + matrix = GDK_PIXBUF_ROTATE_CLOCKWISE; + processed = gdk_pixbuf_flip ( pixbuf, TRUE ); + break; + case 8: + matrix = GDK_PIXBUF_ROTATE_COUNTERCLOCKWISE; + processed = pixbuf; + break; + } + if ( processed ) + { + pixbuf = gdk_pixbuf_rotate_simple( processed, matrix ); + g_object_unref( processed ); + } + } +#endif + return pixbuf; +} - // restore scaled image - this->image_cache = mlt_service_cache_get( MLT_PRODUCER_SERVICE( producer ), "pixbuf.image" ); - this->image = mlt_cache_item_data( this->image_cache, NULL ); +static int refresh_pixbuf( producer_pixbuf self, mlt_frame frame ) +{ + // Obtain properties of frame and producer + mlt_properties properties = MLT_FRAME_PROPERTIES( frame ); + mlt_producer producer = &self->parent; + mlt_properties producer_props = MLT_PRODUCER_PROPERTIES( producer ); // Check if user wants us to reload the image - if ( mlt_properties_get_int( producer_props, "force_reload" ) ) + if ( mlt_properties_get_int( producer_props, "force_reload" ) ) { - pixbuf = NULL; - this->image = NULL; + self->pixbuf = NULL; + self->image = NULL; mlt_properties_set_int( producer_props, "force_reload", 0 ); } @@ -228,108 +366,121 @@ static void refresh_image( producer_pixbuf this, mlt_frame frame, int width, int 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" ); + mlt_position position = mlt_frame_original_position( frame ); position += mlt_producer_get_in( producer ); // Image index - int image_idx = ( int )floor( ( double )position / ttl ) % this->count; + int loop = mlt_properties_get_int( producer_props, "loop" ); + int current_idx; + if (loop) { + current_idx = ( int )floor( ( double )position / ttl ) % self->count; + } else { + current_idx = MIN(( double )position / ttl, self->count - 1); + } // Key for the cache char image_key[ 10 ]; - sprintf( image_key, "%d", image_idx ); + sprintf( image_key, "%d", current_idx ); - pthread_mutex_lock( &g_mutex ); + int disable_exif = mlt_properties_get_int( producer_props, "disable_exif" ); - // Check if the frame is already loaded - if ( use_cache ) + if ( current_idx != self->pixbuf_idx ) + self->pixbuf = NULL; + if ( !self->pixbuf || mlt_properties_get_int( producer_props, "_disable_exif" ) != disable_exif ) { - if ( cache == NULL ) - { - cache = mlt_properties_new( ); - mlt_properties_set_data( producer_props, "_cache", cache, 0, ( mlt_destructor )mlt_properties_close, NULL ); - } - - mlt_frame cached = mlt_properties_get_data( cache, image_key, NULL ); + GError *error = NULL; - if ( cached ) + self->image = NULL; + pthread_mutex_lock( &g_mutex ); + self->pixbuf = gdk_pixbuf_new_from_file( mlt_properties_get_value( self->filenames, current_idx ), &error ); + if ( self->pixbuf ) { - this->image_idx = image_idx; - mlt_properties cached_props = MLT_FRAME_PROPERTIES( cached ); - this->width = mlt_properties_get_int( cached_props, "width" ); - this->height = mlt_properties_get_int( cached_props, "height" ); - mlt_properties_set_int( producer_props, "_real_width", mlt_properties_get_int( cached_props, "real_width" ) ); - mlt_properties_set_int( producer_props, "_real_height", mlt_properties_get_int( cached_props, "real_height" ) ); - this->image = mlt_properties_get_data( cached_props, "image", NULL ); - this->alpha = mlt_properties_get_int( cached_props, "alpha" ); - - if ( width != 0 && ( width != this->width || height != this->height ) ) - this->image = NULL; - } - } - - // optimization for subsequent iterations on single picture - if ( width != 0 && ( image_idx != this->image_idx || width != this->width || height != this->height ) ) - this->image = NULL; - if ( image_idx != this->pixbuf_idx ) - pixbuf = NULL; - mlt_log_debug( MLT_PRODUCER_SERVICE( producer ), "image %p pixbuf %p idx %d image_idx %d pixbuf_idx %d width %d\n", - this->image, pixbuf, image_idx, this->image_idx, this->pixbuf_idx, width ); - if ( !pixbuf && !this->image ) - { - this->image = NULL; - pixbuf = gdk_pixbuf_new_from_file( mlt_properties_get_value( this->filenames, image_idx ), &error ); + // Read the exif value for this file + if ( !disable_exif ) + self->pixbuf = reorient_with_exif( self, current_idx, self->pixbuf ); - if ( pixbuf ) - { // Register this pixbuf for destruction and reuse - mlt_cache_item_close( pixbuf_cache ); - mlt_service_cache_put( MLT_PRODUCER_SERVICE( producer ), "pixbuf.pixbuf", pixbuf, 0, ( mlt_destructor )g_object_unref ); - pixbuf_cache = mlt_service_cache_get( MLT_PRODUCER_SERVICE( producer ), "pixbuf.pixbuf" ); - this->pixbuf_idx = image_idx; + mlt_cache_item_close( self->pixbuf_cache ); + mlt_service_cache_put( MLT_PRODUCER_SERVICE( producer ), "pixbuf.pixbuf", self->pixbuf, 0, ( mlt_destructor )g_object_unref ); + self->pixbuf_cache = mlt_service_cache_get( MLT_PRODUCER_SERVICE( producer ), "pixbuf.pixbuf" ); + self->pixbuf_idx = current_idx; + + // Store the width/height of the pixbuf temporarily + self->width = gdk_pixbuf_get_width( self->pixbuf ); + self->height = gdk_pixbuf_get_height( self->pixbuf ); mlt_events_block( producer_props, 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, "meta.media.width", self->width ); + mlt_properties_set_int( producer_props, "meta.media.height", self->height ); + mlt_properties_set_int( producer_props, "_disable_exif", disable_exif ); 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 ); } + pthread_mutex_unlock( &g_mutex ); } + // Set width/height of frame + mlt_properties_set_int( properties, "width", self->width ); + mlt_properties_set_int( properties, "height", self->height ); + + return current_idx; +} + +static void refresh_image( producer_pixbuf self, mlt_frame frame, mlt_image_format format, int width, int height ) +{ + // Obtain properties of frame and producer + mlt_properties properties = MLT_FRAME_PROPERTIES( frame ); + mlt_producer producer = &self->parent; + + // Get index and pixbuf + int current_idx = refresh_pixbuf( self, frame ); + + // optimization for subsequent iterations on single picture + if ( current_idx != self->image_idx || width != self->width || height != self->height ) + self->image = NULL; + mlt_log_debug( MLT_PRODUCER_SERVICE( producer ), "image %p pixbuf %p idx %d current_idx %d pixbuf_idx %d width %d\n", + self->image, self->pixbuf, current_idx, self->image_idx, self->pixbuf_idx, width ); + // If we have a pixbuf and we need an image - if ( pixbuf && width > 0 && !this->image ) + if ( self->pixbuf && ( !self->image || ( format != mlt_image_none && format != mlt_image_glsl && format != self->format ) ) ) { char *interps = mlt_properties_get( properties, "rescale.interp" ); + if ( interps ) interps = strdup( interps ); int interp = GDK_INTERP_BILINEAR; - if ( strcmp( interps, "nearest" ) == 0 ) + if ( !interps ) { + // Keep bilinear by default + } + else 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 ) + else if ( strcmp( interps, "hyper" ) == 0 || strcmp( interps, "bicubic" ) == 0 ) interp = GDK_INTERP_HYPER; + if ( interps ) free( interps ); // Note - the original pixbuf is already safe and ready for destruction - pixbuf = gdk_pixbuf_scale_simple( pixbuf, width, height, interp ); + pthread_mutex_lock( &g_mutex ); + GdkPixbuf* pixbuf = gdk_pixbuf_scale_simple( self->pixbuf, width, height, interp ); // Store width and height - this->width = width; - this->height = height; - + self->width = width; + self->height = height; + // Allocate/define image - this->alpha = gdk_pixbuf_get_has_alpha( pixbuf ); + int has_alpha = gdk_pixbuf_get_has_alpha( pixbuf ); int src_stride = gdk_pixbuf_get_rowstride( pixbuf ); - int dst_stride = this->width * ( this->alpha ? 4 : 3 ); + int dst_stride = self->width * ( has_alpha ? 4 : 3 ); int image_size = dst_stride * ( height + 1 ); - this->image = mlt_pool_alloc( image_size ); + self->image = mlt_pool_alloc( image_size ); + self->alpha = NULL; + self->format = has_alpha ? mlt_image_rgb24a : mlt_image_rgb24; if ( src_stride != dst_stride ) { - int y = this->height; + int y = self->height; uint8_t *src = gdk_pixbuf_get_pixels( pixbuf ); - uint8_t *dst = this->image; + uint8_t *dst = self->image; while ( y-- ) { memcpy( dst, src, dst_stride ); @@ -339,86 +490,112 @@ static void refresh_image( producer_pixbuf this, mlt_frame frame, int width, int } else { - memcpy( this->image, gdk_pixbuf_get_pixels( pixbuf ), src_stride * height ); + memcpy( self->image, gdk_pixbuf_get_pixels( pixbuf ), src_stride * height ); } - if ( !use_cache ) - mlt_cache_item_close( this->image_cache ); - mlt_service_cache_put( MLT_PRODUCER_SERVICE( producer ), "pixbuf.image", this->image, image_size, mlt_pool_release ); - this->image_cache = mlt_service_cache_get( MLT_PRODUCER_SERVICE( producer ), "pixbuf.image" ); - this->image_idx = image_idx; + pthread_mutex_unlock( &g_mutex ); - // Finished with pixbuf now - g_object_unref( pixbuf ); + // Convert image to requested format + if ( format != mlt_image_none && format != mlt_image_glsl && format != self->format ) + { + uint8_t *buffer = NULL; - // Ensure we update the cache when we need to - update_cache = use_cache; - } + // First, set the image so it can be converted when we get it + mlt_frame_replace_image( frame, self->image, self->format, width, height ); + mlt_frame_set_image( frame, self->image, image_size, mlt_pool_release ); + self->format = format; - // release references no longer needed - mlt_cache_item_close( pixbuf_cache ); - if ( width == 0 ) - { - pthread_mutex_unlock( &this->mutex ); - mlt_cache_item_close( this->image_cache ); - } + // get_image will do the format conversion + mlt_frame_get_image( frame, &buffer, &format, &width, &height, 0 ); - // 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" ) ); + // cache copies of the image and alpha buffers + if ( buffer ) + { + image_size = mlt_image_format_size( format, width, height, NULL ); + self->image = mlt_pool_alloc( image_size ); + memcpy( self->image, buffer, image_size ); + } + if ( ( buffer = mlt_frame_get_alpha_mask( frame ) ) ) + { + self->alpha = mlt_pool_alloc( width * height ); + memcpy( self->alpha, buffer, width * height ); + } + } - if ( update_cache ) - { - mlt_frame cached = mlt_frame_init( MLT_PRODUCER_SERVICE( producer ) ); - mlt_properties cached_props = MLT_FRAME_PROPERTIES( cached ); - mlt_properties_set_int( cached_props, "width", this->width ); - mlt_properties_set_int( cached_props, "height", this->height ); - mlt_properties_set_int( cached_props, "real_width", mlt_properties_get_int( producer_props, "_real_width" ) ); - mlt_properties_set_int( cached_props, "real_height", mlt_properties_get_int( producer_props, "_real_height" ) ); - mlt_properties_set_data( cached_props, "image", this->image, this->width * ( this->alpha ? 4 : 3 ) * this->height, mlt_pool_release, NULL ); - mlt_properties_set_int( cached_props, "alpha", this->alpha ); - mlt_properties_set_data( cache, image_key, cached, 0, ( mlt_destructor )mlt_frame_close, NULL ); + // Update the cache + mlt_cache_item_close( self->image_cache ); + mlt_service_cache_put( MLT_PRODUCER_SERVICE( producer ), "pixbuf.image", self->image, image_size, mlt_pool_release ); + self->image_cache = mlt_service_cache_get( MLT_PRODUCER_SERVICE( producer ), "pixbuf.image" ); + self->image_idx = current_idx; + mlt_cache_item_close( self->alpha_cache ); + self->alpha_cache = NULL; + if ( self->alpha ) + { + mlt_service_cache_put( MLT_PRODUCER_SERVICE( producer ), "pixbuf.alpha", self->alpha, width * height, mlt_pool_release ); + self->alpha_cache = mlt_service_cache_get( MLT_PRODUCER_SERVICE( producer ), "pixbuf.alpha" ); + } + + // Finished with pixbuf now + g_object_unref( pixbuf ); } - pthread_mutex_unlock( &g_mutex ); + // Set width/height of frame + mlt_properties_set_int( properties, "width", self->width ); + mlt_properties_set_int( properties, "height", self->height ); } static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_format *format, int *width, int *height, int writable ) { int error = 0; - // Obtain properties of frame + // Obtain properties of frame and producer mlt_properties properties = MLT_FRAME_PROPERTIES( frame ); - - // Obtain the producer for this frame - producer_pixbuf this = mlt_properties_get_data( properties, "producer_pixbuf", NULL ); - - *width = mlt_properties_get_int( properties, "rescale_width" ); - *height = mlt_properties_get_int( properties, "rescale_height" ); + producer_pixbuf self = mlt_properties_get_data( properties, "producer_pixbuf", NULL ); + mlt_producer producer = &self->parent; + + // Use the width and height suggested by the rescale filter because we can do our own scaling. + if ( mlt_properties_get_int( properties, "rescale_width" ) > 0 ) + *width = mlt_properties_get_int( properties, "rescale_width" ); + if ( mlt_properties_get_int( properties, "rescale_height" ) > 0 ) + *height = mlt_properties_get_int( properties, "rescale_height" ); + + // Restore pixbuf and image + mlt_service_lock( MLT_PRODUCER_SERVICE( producer ) ); + self->pixbuf_cache = mlt_service_cache_get( MLT_PRODUCER_SERVICE( producer ), "pixbuf.pixbuf" ); + self->pixbuf = mlt_cache_item_data( self->pixbuf_cache, NULL ); + self->image_cache = mlt_service_cache_get( MLT_PRODUCER_SERVICE( producer ), "pixbuf.image" ); + self->image = mlt_cache_item_data( self->image_cache, NULL ); + self->alpha_cache = mlt_service_cache_get( MLT_PRODUCER_SERVICE( producer ), "pixbuf.alpha" ); + self->alpha = mlt_cache_item_data( self->alpha_cache, NULL ); // Refresh the image - refresh_image( this, frame, *width, *height ); + refresh_image( self, frame, *format, *width, *height ); // Get width and height (may have changed during the refresh) - *width = this->width; - *height = this->height; + *width = self->width; + *height = self->height; + *format = self->format; // 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 the pixbuf producer... - if ( this->image ) + if ( self->image ) { // Clone the image - int image_size = this->width * this->height * ( this->alpha ? 4 :3 ); + int image_size = mlt_image_format_size( self->format, self->width, self->height, NULL ); uint8_t *image_copy = mlt_pool_alloc( image_size ); - memcpy( image_copy, this->image, image_size ); + memcpy( image_copy, self->image, image_size ); // Now update properties so we free the copy after - mlt_properties_set_data( properties, "image", image_copy, image_size, mlt_pool_release, NULL ); + mlt_frame_set_image( frame, image_copy, image_size, mlt_pool_release ); // We're going to pass the copy on *buffer = image_copy; - *format = this->alpha ? mlt_image_rgb24a : mlt_image_rgb24; - mlt_log_debug( MLT_PRODUCER_SERVICE( &this->parent ), "%dx%d (%s)\n", - this->width, this->height, mlt_image_format_name( *format ) ); + mlt_log_debug( MLT_PRODUCER_SERVICE( &self->parent ), "%dx%d (%s)\n", + self->width, self->height, mlt_image_format_name( *format ) ); + // Clone the alpha channel + if ( self->alpha ) + { + image_copy = mlt_pool_alloc( self->width * self->height ); + memcpy( image_copy, self->alpha, self->width * self->height ); + mlt_frame_set_alpha( frame, image_copy, self->width * self->height, mlt_pool_release ); + } } else { @@ -426,8 +603,10 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form } // Release references and locks - pthread_mutex_unlock( &this->mutex ); - mlt_cache_item_close( this->image_cache ); + mlt_cache_item_close( self->pixbuf_cache ); + mlt_cache_item_close( self->image_cache ); + mlt_cache_item_close( self->alpha_cache ); + mlt_service_unlock( MLT_PRODUCER_SERVICE( &self->parent ) ); return error; } @@ -435,37 +614,42 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form 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; + producer_pixbuf self = 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 ) - load_filenames( this, producer_properties ); + if ( self->filenames == NULL && mlt_properties_get( producer_properties, "resource" ) != NULL ) + load_filenames( self, producer_properties ); // Generate a frame *frame = mlt_frame_init( MLT_PRODUCER_SERVICE( producer ) ); - if ( *frame != NULL && this->count > 0 ) + if ( *frame != NULL && self->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 ); + mlt_properties_set_data( properties, "producer_pixbuf", self, 0, NULL, NULL ); // Update timecode on the frame we're creating mlt_frame_set_position( *frame, mlt_producer_position( producer ) ); - // 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 ) ); - - // Refresh the image - refresh_image( this, *frame, 0, 0 ); + // Refresh the pixbuf + self->pixbuf_cache = mlt_service_cache_get( MLT_PRODUCER_SERVICE( producer ), "pixbuf.pixbuf" ); + self->pixbuf = mlt_cache_item_data( self->pixbuf_cache, NULL ); + refresh_pixbuf( self, *frame ); + mlt_cache_item_close( self->pixbuf_cache ); // 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" ) ); + + double force_ratio = mlt_properties_get_double( producer_properties, "force_aspect_ratio" ); + if ( force_ratio > 0.0 ) + mlt_properties_set_double( properties, "aspect_ratio", force_ratio ); + else + mlt_properties_set_double( properties, "aspect_ratio", mlt_properties_get_double( producer_properties, "aspect_ratio" ) ); // Push the get_image method mlt_frame_push_get_image( *frame, producer_get_image ); @@ -479,11 +663,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; - pthread_mutex_destroy( &this->mutex ); + producer_pixbuf self = parent->child; parent->close = NULL; mlt_service_cache_purge( MLT_PRODUCER_SERVICE(parent) ); mlt_producer_close( parent ); - mlt_properties_close( this->filenames ); - free( this ); + mlt_properties_close( self->filenames ); + free( self ); }