X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fgtk2%2Fproducer_pixbuf.c;h=e2f4d252bf5b23c3cab864a137e8c6b8378b4dd0;hb=1f6faabf5ef11e6321d186772d88fb6958cdd057;hp=95cae13ade88d59a3322b3d80a086b4b75a5d378;hpb=9596911e0c624a73e354ecabfa9a565503d0ddf0;p=melted diff --git a/src/modules/gtk2/producer_pixbuf.c b/src/modules/gtk2/producer_pixbuf.c index 95cae13..e2f4d25 100644 --- a/src/modules/gtk2/producer_pixbuf.c +++ b/src/modules/gtk2/producer_pixbuf.c @@ -25,12 +25,15 @@ #include #include #include +#include #include #include #include #include #include +pthread_mutex_t fastmutex = PTHREAD_MUTEX_INITIALIZER; + typedef struct producer_pixbuf_s *producer_pixbuf; struct producer_pixbuf_s @@ -67,19 +70,18 @@ mlt_producer producer_pixbuf_init( char *filename ) 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; - producer->close = producer_close; + 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 ); - // Initialise gobject types - g_type_init(); - return producer; } free( this ); @@ -93,7 +95,7 @@ static void refresh_image( mlt_frame frame, int width, int height ) 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 ); @@ -102,7 +104,7 @@ 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" ); @@ -113,6 +115,8 @@ static void refresh_image( mlt_frame frame, int width, int height ) // Image index int image_idx = ( int )floor( ( double )position / ttl ) % this->count; + pthread_mutex_lock( &fastmutex ); + // optimization for subsequent iterations on single picture if ( width != 0 && this->image != NULL && image_idx == this->image_idx ) { @@ -206,12 +210,14 @@ static void refresh_image( mlt_frame frame, int width, int 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 ); } 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 ); *width = mlt_properties_get_int( properties, "rescale_width" ); *height = mlt_properties_get_int( properties, "rescale_height" ); @@ -238,8 +244,8 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form // 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 ( image != NULL ) { // Clone our image uint8_t *copy = mlt_pool_alloc( size ); @@ -252,6 +258,11 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form // Now update properties so we free the copy after mlt_properties_set_data( properties, "image", copy, size, mlt_pool_release, NULL ); } + else + { + // Fall back to the test card... + mlt_frame_get_image( frame, buffer, format, width, height, writable ); + } // Pass on the image *buffer = image; @@ -262,7 +273,7 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form 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 ); @@ -273,10 +284,12 @@ static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int i // 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 ) + // Fetch the producers properties + mlt_properties producer_properties = MLT_PRODUCER_PROPERTIES( producer ); + + if ( this->count == 0 && mlt_properties_get( producer_properties, "resource" ) != NULL ) { - mlt_properties properties = mlt_producer_properties( producer ); - char *filename = mlt_properties_get( properties, "resource" ); + char *filename = mlt_properties_get( producer_properties, "resource" ); // Read xml string if ( strstr( filename, "filenames = realloc( this->filenames, sizeof( char * ) * ( this->count + 1 ) ); this->filenames[ this->count ++ ] = strdup( fullname ); - mlt_properties_set_position( properties, "out", 250 ); - // 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 ); + 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 = 0; + int i = mlt_properties_get_int( producer_properties, "begin" ); int gap = 0; char full[1024]; @@ -332,7 +343,6 @@ static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int i gap ++; } } - mlt_properties_set_position( properties, "out", this->count * 250 ); } else if ( strstr( filename, "/.all." ) != NULL ) { @@ -366,7 +376,6 @@ static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int i { this->filenames = realloc( this->filenames, sizeof( char * ) * ( this->count + 1 ) ); this->filenames[ this->count ++ ] = strdup( filename ); - mlt_properties_set_position( properties, "out", 250 ); } } @@ -376,7 +385,7 @@ static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int i if ( *frame != NULL && this->count > 0 ) { // Obtain properties of frame and producer - mlt_properties properties = mlt_frame_properties( *frame ); + 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 ); @@ -391,8 +400,8 @@ static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int i refresh_image( *frame, 0, 0 ); // Set producer-specific frame properties - mlt_properties_set_int( properties, "progressive", 1 ); - mlt_properties_set_double( properties, "aspect_ratio", 1 ); + 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;