* Copyright (C) 2003-2004 Ushodaya Enterprises Limited
* Author: Dan Dennedy <dan@dennedy.org>
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful,
+ * This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "producer_pixbuf.h"
+#include <framework/mlt_producer.h>
#include <framework/mlt_frame.h>
+#include <framework/mlt_cache.h>
+#include <framework/mlt_log.h>
+#include <framework/mlt_tokeniser.h>
#include <gdk-pixbuf/gdk-pixbuf.h>
+#ifdef USE_EXIF
+#include <libexif/exif-data.h>
+#endif
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <sys/stat.h>
#include <unistd.h>
#include <dirent.h>
+#include <ctype.h>
-pthread_mutex_t fastmutex = PTHREAD_MUTEX_INITIALIZER;
+// this protects concurrent access to gdk_pixbuf
+static pthread_mutex_t g_mutex = PTHREAD_MUTEX_INITIALIZER;
typedef struct producer_pixbuf_s *producer_pixbuf;
struct mlt_producer_s parent;
// File name list
- char **filenames;
+ mlt_properties filenames;
int count;
int image_idx;
-
+ int pixbuf_idx;
int width;
int height;
- uint8_t *image;
uint8_t *alpha;
+ uint8_t *image;
+ mlt_cache_item image_cache;
+ mlt_cache_item alpha_cache;
+ mlt_cache_item pixbuf_cache;
+ GdkPixbuf *pixbuf;
+ mlt_image_format format;
};
+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 );
-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 )
+ 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;
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( 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 );
+ mlt_properties_set_data( frame_properties, "producer_pixbuf", self, 0, NULL, NULL );
+ mlt_frame_set_position( frame, mlt_producer_position( producer ) );
+ refresh_pixbuf( self, frame );
+ mlt_cache_item_close( self->pixbuf_cache );
+ mlt_frame_close( frame );
+ }
+ }
+ if ( self->width == 0 )
+ {
+ producer_close( producer );
+ producer = NULL;
+ }
return producer;
}
- free( this );
+ free( self );
return NULL;
}
-static void refresh_image( mlt_frame frame, int width, int height )
+static int load_svg( producer_pixbuf self, mlt_properties properties, const char *filename )
{
- // Pixbuf
- GdkPixbuf *pixbuf = NULL;
- GError *error = NULL;
+ int result = 0;
- // Obtain properties of frame
- mlt_properties properties = MLT_FRAME_PROPERTIES( frame );
+ // Read xml string
+ if ( strstr( filename, "<svg" ) )
+ {
+ // Generate a temporary file for the svg
+ char fullname[ 1024 ] = "/tmp/mlt.XXXXXX";
+ int fd = g_mkstemp( fullname );
- // Obtain the producer for this frame
- producer_pixbuf this = mlt_properties_get_data( properties, "producer_pixbuf", NULL );
+ if ( fd > -1 )
+ {
+ // Write the svg into the temp file
+ ssize_t remaining_bytes;
+ const char *xml = filename;
- // Obtain the producer
- mlt_producer producer = &this->parent;
+ // Strip leading crap
+ while ( xml[0] != '<' )
+ xml++;
- // Obtain properties of producer
- mlt_properties producer_props = MLT_PRODUCER_PROPERTIES( producer );
+ remaining_bytes = strlen( xml );
+ while ( remaining_bytes > 0 )
+ remaining_bytes -= write( fd, xml + strlen( xml ) - remaining_bytes, remaining_bytes );
+ close( fd );
- // Get the time to live for each frame
- double ttl = mlt_properties_get_int( producer_props, "ttl" );
+ mlt_properties_set( self->filenames, "0", fullname );
- // Get the original position of this frame
- mlt_position position = mlt_properties_get_position( properties, "pixbuf_position" );
+ // Teehe - when the producer closes, delete the temp file and the space allo
+ mlt_properties_set_data( properties, "__temporary_file__", fullname, 0, ( mlt_destructor )unlink, NULL );
+ result = 1;
+ }
+ }
+ return result;
+}
- // Image index
- int image_idx = ( int )floor( ( double )position / ttl ) % this->count;
+static int load_sequence_sprintf( producer_pixbuf self, mlt_properties properties, const char *filename )
+{
+ int result = 0;
- pthread_mutex_lock( &fastmutex );
+ // Obtain filenames with pattern
+ if ( strchr( filename, '%' ) != NULL )
+ {
+ // handle picture sequences
+ int i = mlt_properties_get_int( 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( self->filenames, key, full );
+ gap = 0;
+ }
+ else
+ {
+ gap ++;
+ }
+ }
+ if ( mlt_properties_count( self->filenames ) > 0 )
+ {
+ mlt_properties_set_int( properties, "ttl", 1 );
+ result = 1;
+ }
+ }
+ return result;
+}
- // optimization for subsequent iterations on single picture
- if ( width != 0 && this->image != NULL && image_idx == this->image_idx )
+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, '%' ) ) )
{
- if ( width != this->width || height != this->height )
+ const char *end = ++start;
+ while ( isdigit( *end ) ) end++;
+ if ( end > start && ( end[0] == 'd' || end[0] == 'i' || end[0] == 'u' ) )
{
- 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;
+ 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 );
}
}
- else if ( this->image == NULL || image_idx != this->image_idx )
+ 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 );
+ }
+ 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 );
+ char *extension = strrchr( dir_name, '.' );
+
+ *( strstr( dir_name, "/.all." ) + 1 ) = '\0';
+ sprintf( wildcard, "*%s", extension );
+
+ mlt_properties_dir_list( self->filenames, dir_name, wildcard, 1 );
+
+ free( dir_name );
+ result = 1;
+ }
+ 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( self->filenames, "0", filename );
+ }
+ self->count = mlt_properties_count( self->filenames );
+}
+
+static GdkPixbuf* reorient_with_exif( producer_pixbuf self, int image_idx, GdkPixbuf *pixbuf )
+{
+#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)
{
- mlt_pool_release( this->image );
- mlt_pool_release( this->alpha );
- this->image = NULL;
- this->alpha = NULL;
+ 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));
+
+ /* Free the EXIF data */
+ exif_data_unref(d);
+ }
- this->image_idx = image_idx;
- pixbuf = gdk_pixbuf_new_from_file( this->filenames[ image_idx ], &error );
+ // Remember EXIF value, might be useful for someone
+ mlt_properties_set_int( producer_props, "_exif_orientation" , exif_orientation );
- if ( pixbuf != 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 )
{
- // Register this pixbuf for destruction and reuse
- mlt_properties_set_data( producer_props, "pixbuf", pixbuf, 0, ( mlt_destructor )g_object_unref, NULL );
+ pixbuf = gdk_pixbuf_rotate_simple( processed, matrix );
+ g_object_unref( processed );
+ }
+ }
+#endif
+ return pixbuf;
+}
+
+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" ) )
+ {
+ self->pixbuf = NULL;
+ self->image = NULL;
+ mlt_properties_set_int( producer_props, "force_reload", 0 );
+ }
+
+ // 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_frame_original_position( frame );
+ position += mlt_producer_get_in( producer );
- 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 ) );
+ // Image index
+ 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", current_idx );
+
+ int disable_exif = mlt_properties_get_int( producer_props, "disable_exif" );
+
+ if ( current_idx != self->pixbuf_idx )
+ self->pixbuf = NULL;
+ if ( !self->pixbuf || mlt_properties_get_int( producer_props, "_disable_exif" ) != disable_exif )
+ {
+ GError *error = NULL;
+
+ 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 )
+ {
+ // Read the exif value for this file
+ if ( !disable_exif )
+ self->pixbuf = reorient_with_exif( self, current_idx, self->pixbuf );
+
+ // Register this pixbuf for destruction and reuse
+ 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
- this->width = gdk_pixbuf_get_width( pixbuf );
- this->height = gdk_pixbuf_get_height( pixbuf );
+ 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, "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 );
+
}
+ pthread_mutex_unlock( &g_mutex );
}
- // If we have a pixbuf
- if ( pixbuf && width > 0 )
+ // 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 ( self->pixbuf && ( !self->image || ( format != mlt_image_none && 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;
-
- // Allocate/define image
- this->image = mlt_pool_alloc( width * ( height + 1 ) * 2 );
+ self->width = width;
+ self->height = height;
- // Extract YUV422 and alpha
- if ( gdk_pixbuf_get_has_alpha( pixbuf ) )
+ // Allocate/define image
+ int has_alpha = gdk_pixbuf_get_has_alpha( pixbuf );
+ int src_stride = gdk_pixbuf_get_rowstride( pixbuf );
+ int dst_stride = self->width * ( has_alpha ? 4 : 3 );
+ int image_size = dst_stride * ( height + 1 );
+ 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 )
{
- // 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 );
+ int y = self->height;
+ uint8_t *src = gdk_pixbuf_get_pixels( pixbuf );
+ uint8_t *dst = self->image;
+ while ( y-- )
+ {
+ memcpy( dst, src, dst_stride );
+ dst += dst_stride;
+ src += src_stride;
+ }
}
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 );
+ {
+ memcpy( self->image, gdk_pixbuf_get_pixels( pixbuf ), src_stride * height );
+ }
+ pthread_mutex_unlock( &g_mutex );
+
+ // Convert image to requested format
+ if ( format != mlt_image_none && format != self->format )
+ {
+ uint8_t *buffer = NULL;
+
+ // 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;
+
+ // get_image will do the format conversion
+ mlt_frame_get_image( frame, &buffer, &format, &width, &height, 0 );
+
+ // 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 );
+ }
+ }
+
+ // 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
}
// 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 );
+ 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 )
{
- // Obtain properties of frame
+ int error = 0;
+
+ // Obtain properties of frame and producer
mlt_properties properties = MLT_FRAME_PROPERTIES( frame );
-
- // We need to know the size of the image to clone it
- int image_size = 0;
- int alpha_size = 0;
-
- // Alpha channel
- uint8_t *alpha = 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( frame, *width, *height );
-
- // Get the image
- *buffer = mlt_properties_get_data( properties, "image", &image_size );
- alpha = mlt_properties_get_data( properties, "alpha", &alpha_size );
+ refresh_image( self, frame, *format, *width, *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" );
+ *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 ( *buffer != NULL )
+ if ( self->image )
{
- // Clone the image and the alpha
+ // Clone the image
+ int image_size = mlt_image_format_size( self->format, self->width, self->height, NULL );
uint8_t *image_copy = mlt_pool_alloc( image_size );
- uint8_t *alpha_copy = mlt_pool_alloc( alpha_size );
-
- 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 );
-
+ 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_properties_set_data( properties, "alpha", alpha_copy, alpha_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;
+ 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
{
- // Fall back to the test card...
- mlt_frame_get_image( frame, buffer, format, width, height, writable );
+ error = 1;
}
- return 0;
-}
-
-static uint8_t *producer_get_alpha_mask( mlt_frame this )
-{
- // Obtain properties of frame
- mlt_properties properties = MLT_FRAME_PROPERTIES( this );
+ // Release references and locks
+ 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 the alpha mask
- return mlt_properties_get_data( properties, "alpha", NULL );
+ return error;
}
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->count == 0 && mlt_properties_get( producer_properties, "resource" ) != NULL )
- {
- char *filename = mlt_properties_get( producer_properties, "resource" );
-
- // Read xml string
- if ( strstr( filename, "<svg" ) )
- {
- // 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( producer_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 = mlt_properties_get_int( producer_properties, "begin" );
- 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 ( self->filenames == NULL && mlt_properties_get( producer_properties, "resource" ) != NULL )
+ load_filenames( self, producer_properties );
// Generate a frame
- *frame = mlt_frame_init( );
+ *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( *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" ) );
-
- // Set alpha call back
- ( *frame )->get_alpha_mask = producer_get_alpha_mask;
+
+ 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 );
static void producer_close( mlt_producer parent )
{
- producer_pixbuf this = parent->child;
- mlt_pool_release( this->image );
+ producer_pixbuf self = parent->child;
parent->close = NULL;
+ mlt_service_cache_purge( MLT_PRODUCER_SERVICE(parent) );
mlt_producer_close( parent );
- while ( this->count -- )
- free( this->filenames[ this->count ] );
- free( this->filenames );
- free( this );
+ mlt_properties_close( self->filenames );
+ free( self );
}
projects / mlt / blobdiff