* 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 <gdk-pixbuf/gdk-pixbuf.h>
#include <stdio.h>
#include <unistd.h>
#include <dirent.h>
-pthread_mutex_t fastmutex = PTHREAD_MUTEX_INITIALIZER;
+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 height;
uint8_t *image;
uint8_t *alpha;
+ mlt_cache_item image_cache;
+ mlt_cache_item alpha_cache;
+ pthread_mutex_t mutex;
};
+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 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 );
mlt_producer producer = &this->parent;
// 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;
// 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 );
+
+ // Validate the resource
+ if ( filename )
+ load_filenames( this, properties );
+ if ( this->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_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 );
+ mlt_frame_close( frame );
+ }
+ }
+ if ( this->width == 0 )
+ {
+ producer_close( producer );
+ producer = NULL;
+ }
return producer;
}
free( this );
return NULL;
}
-static void refresh_image( mlt_frame frame, int width, int height )
+static void load_filenames( producer_pixbuf this, mlt_properties producer_properties )
{
- // Pixbuf
- GdkPixbuf *pixbuf = NULL;
- GError *error = NULL;
+ char *filename = mlt_properties_get( producer_properties, "resource" );
+ this->filenames = mlt_properties_new( );
- // 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 = 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;
+ 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, key, 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 );
+}
+
+static void refresh_image( producer_pixbuf this, mlt_frame frame, int width, int height )
+{
+ // Obtain properties of frame
+ mlt_properties properties = MLT_FRAME_PROPERTIES( frame );
- // Obtain the producer
+ // Obtain the producer
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 );
+
+ // 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;
+
+ // 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;
+
+ // 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 );
+
+ // restore alpha channel
+ this->alpha_cache = mlt_service_cache_get( MLT_PRODUCER_SERVICE( producer ), "pixbuf.alpha" );
+ this->alpha = mlt_cache_item_data( this->alpha_cache, NULL );
+
+ // Check if user wants us to reload the image
+ if ( mlt_properties_get_int( producer_props, "force_reload" ) )
+ {
+ pixbuf = NULL;
+ this->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_properties_get_position( properties, "pixbuf_position" );
+ position += mlt_producer_get_in( producer );
// Image index
int image_idx = ( int )floor( ( double )position / ttl ) % this->count;
- pthread_mutex_lock( &fastmutex );
+ // Key for the cache
+ char image_key[ 10 ];
+ sprintf( image_key, "%d", image_idx );
- // optimization for subsequent iterations on single picture
- if ( width != 0 && this->image != NULL && image_idx == this->image_idx )
+ pthread_mutex_lock( &g_mutex );
+
+ // Check if the frame is already loaded
+ if ( use_cache )
{
- if ( width != this->width || height != this->height )
+ if ( cache == NULL )
{
- 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;
+ 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 );
+
+ if ( cached )
+ {
+ 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_data( cached_props, "alpha", NULL );
+
+ if ( width != 0 && ( width != this->width || height != this->height ) )
+ this->image = NULL;
}
}
- else if ( this->image == NULL || image_idx != this->image_idx )
+
+ // 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->image_idx )
+ pixbuf = NULL;
+ if ( pixbuf == NULL && ( width == 0 || this->image == NULL ) )
{
- 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 )
+ if ( pixbuf )
{
// Register this pixbuf for destruction and reuse
- mlt_properties_set_data( producer_props, "pixbuf", pixbuf, 0, ( mlt_destructor )g_object_unref, NULL );
+ 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" );
- 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_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_events_unblock( producer_props, NULL );
// Store the width/height of the pixbuf temporarily
this->width = gdk_pixbuf_get_width( pixbuf );
}
}
- // If we have a pixbuf
- if ( pixbuf && width > 0 )
+ // If we have a pixbuf and we need an image
+ if ( pixbuf && width > 0 && this->image == NULL )
{
char *interps = mlt_properties_get( properties, "rescale.interp" );
int interp = GDK_INTERP_BILINEAR;
// Allocate/define image
this->image = mlt_pool_alloc( width * ( height + 1 ) * 2 );
+ if ( !use_cache )
+ mlt_cache_item_close( this->image_cache );
+ mlt_service_cache_put( MLT_PRODUCER_SERVICE( producer ), "pixbuf.image", this->image, width * ( height + 1 ) * 2, mlt_pool_release );
+ this->image_cache = mlt_service_cache_get( MLT_PRODUCER_SERVICE( producer ), "pixbuf.image" );
// Extract YUV422 and alpha
if ( gdk_pixbuf_get_has_alpha( pixbuf ) )
{
// Allocate the alpha mask
this->alpha = mlt_pool_alloc( this->width * this->height );
+ if ( !use_cache )
+ mlt_cache_item_close( this->alpha_cache );
+ mlt_service_cache_put( MLT_PRODUCER_SERVICE( producer ), "pixbuf.alpha", this->alpha, width * height, mlt_pool_release );
+ this->alpha_cache = mlt_service_cache_get( MLT_PRODUCER_SERVICE( producer ), "pixbuf.alpha" );
// Convert the image
mlt_convert_rgb24a_to_yuv422( gdk_pixbuf_get_pixels( pixbuf ),
// Finished with pixbuf now
g_object_unref( pixbuf );
+
+ // Ensure we update the cache when we need to
+ update_cache = use_cache;
+ }
+
+ // 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 );
+ mlt_cache_item_close( this->alpha_cache );
}
// 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 ) * 2, NULL, NULL );
- mlt_properties_set_data( properties, "alpha", this->alpha, this->width * this->height, NULL, NULL );
+ 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->height + 1 ) * 2, mlt_pool_release, NULL );
+ mlt_properties_set_data( cached_props, "alpha", this->alpha, this->width * this->height, mlt_pool_release, NULL );
+ mlt_properties_set_data( cache, image_key, cached, 0, ( mlt_destructor )mlt_frame_close, NULL );
+ }
- pthread_mutex_unlock( &fastmutex );
+ pthread_mutex_unlock( &g_mutex );
}
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 );
+
+ // 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" );
// Refresh the image
- refresh_image( frame, *width, *height );
-
- // May need to know the size of the image to clone it
- int size = 0;
+ refresh_image( this, frame, *width, *height );
- // Get the image
- uint8_t *image = mlt_properties_get_data( properties, "image", &size );
+ // Get the image size
+ int image_size = this->width * ( this->height + 1 ) * 2;
+ int alpha_size = this->width * this->height;
- // 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" );
- if ( size == 0 )
- {
- *width = mlt_properties_get_int( properties, "normalised_width" );
- *height = mlt_properties_get_int( properties, "normalised_height" );
- size = *width * ( *height + 1 );
- }
-
- // 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 ( this->image )
{
- // Clone our image
- uint8_t *copy = mlt_pool_alloc( size );
- if ( image != NULL )
- memcpy( copy, image, size );
+ if ( *format == mlt_image_yuv422 || *format == mlt_image_yuv420p )
+ {
+ // Clone the image and the alpha
+ uint8_t *image_copy = mlt_pool_alloc( image_size );
+ uint8_t *alpha_copy = mlt_pool_alloc( alpha_size );
+
+ memcpy( image_copy, this->image, image_size );
+
+ // Copy or default the alpha
+ if ( this->alpha != NULL )
+ memcpy( alpha_copy, this->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", image_copy, image_size, mlt_pool_release, NULL );
+ mlt_properties_set_data( properties, "alpha", alpha_copy, alpha_size, mlt_pool_release, NULL );
+
+ // We're going to pass the copy on
+ *buffer = image_copy;
+ }
+ else if ( *format == mlt_image_rgb24a )
+ {
+ // Clone the image and the alpha
+ image_size = *width * ( *height + 1 ) * 4;
+ alpha_size = *width * ( *height + 1 );
+ uint8_t *image_copy = mlt_pool_alloc( image_size );
+ uint8_t *alpha_copy = mlt_pool_alloc( alpha_size );
+
+ mlt_convert_yuv422_to_rgb24a( this->image, image_copy, (*width)*(*height) );
- // 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", image_copy, image_size, mlt_pool_release, NULL );
+ mlt_properties_set_data( properties, "alpha", alpha_copy, alpha_size, mlt_pool_release, NULL );
+
+ // We're going to pass the copy on
+ *buffer = image_copy;
+ }
- // Now update properties so we free the copy after
- mlt_properties_set_data( properties, "image", copy, size, mlt_pool_release, NULL );
+ }
+ 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;
}
- // Pass on the image
- *buffer = image;
+ // Release references and locks
+ pthread_mutex_unlock( &this->mutex );
+ mlt_cache_item_close( this->image_cache );
+ mlt_cache_item_close( this->alpha_cache );
return 0;
}
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( this );
// Return the alpha mask
return mlt_properties_get_data( properties, "alpha", NULL );
// Get the real structure for this producer
producer_pixbuf this = producer->child;
- if ( this->count == 0 && mlt_properties_get( mlt_producer_properties( producer ), "resource" ) != NULL )
- {
- mlt_properties properties = mlt_producer_properties( producer );
- char *filename = mlt_properties_get( 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 );
+ // Fetch the producers properties
+ mlt_properties producer_properties = MLT_PRODUCER_PROPERTIES( producer );
- 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( 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 = 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 ++;
- }
- }
- }
- 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 ( this->filenames == NULL && mlt_properties_get( producer_properties, "resource" ) != NULL )
+ load_filenames( this, producer_properties );
// Generate a frame
- *frame = mlt_frame_init( );
+ *frame = mlt_frame_init( MLT_PRODUCER_SERVICE( producer ) );
if ( *frame != NULL && this->count > 0 )
{
// Obtain properties of frame and producer
- mlt_properties properties = mlt_frame_properties( *frame );
-
- // Determine if we're rendering for PAL or NTSC
- int is_pal = mlt_properties_get_int( properties, "normalised_height" ) == 576;
+ 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_position( properties, "pixbuf_position", mlt_producer_position( producer ) );
// Refresh the image
- refresh_image( *frame, 0, 0 );
+ refresh_image( this, *frame, 0, 0 );
// Set producer-specific frame properties
- mlt_properties_set_int( properties, "progressive", 1 );
- mlt_properties_set_double( properties, "aspect_ratio", is_pal ? 59.0/54.0 : 10.0/11.0 );
+ 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;
static void producer_close( mlt_producer parent )
{
producer_pixbuf this = parent->child;
- mlt_pool_release( this->image );
+ pthread_mutex_destroy( &this->mutex );
parent->close = NULL;
mlt_producer_close( parent );
- while ( this->count -- )
- free( this->filenames[ this->count ] );
- free( this->filenames );
+ mlt_properties_close( this->filenames );
free( this );
}