X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fgtk2%2Fproducer_pixbuf.c;h=4e27d658f047e4d91d3430d7fefd119a9bb16bae;hb=cc529cc40228368ad022902a9c8b550e425a6150;hp=dad221ce4f1a45f7e274b0d46e704bf7f625a863;hpb=05b29b78bfb59b49836719573f4c7503066bad04;p=melted diff --git a/src/modules/gtk2/producer_pixbuf.c b/src/modules/gtk2/producer_pixbuf.c index dad221c..4e27d65 100644 --- a/src/modules/gtk2/producer_pixbuf.c +++ b/src/modules/gtk2/producer_pixbuf.c @@ -1,25 +1,24 @@ - /* * producer_pixbuf.c -- raster image loader based upon gdk-pixbuf * Copyright (C) 2003-2004 Ushodaya Enterprises Limited * Author: Dan Dennedy * - * 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 #include #include @@ -55,7 +54,6 @@ struct producer_pixbuf_s 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 ); @@ -100,33 +98,76 @@ static void refresh_image( mlt_frame frame, int width, int height ) // Obtain properties of 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; + // 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; + // Key for the cache + char image_key[ 10 ]; + sprintf( image_key, "%d", image_idx ); + pthread_mutex_lock( &fastmutex ); + // Check if the frame is already loaded + if ( use_cache ) + { + 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 ); + + 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; + } + } + // optimization for subsequent iterations on single picture if ( width != 0 && this->image != NULL && image_idx == this->image_idx ) { if ( width != this->width || height != this->height ) { pixbuf = mlt_properties_get_data( producer_props, "_pixbuf", NULL ); - mlt_pool_release( this->image ); - mlt_pool_release( this->alpha ); + if ( !use_cache ) + { + mlt_pool_release( this->image ); + mlt_pool_release( this->alpha ); + } this->image = NULL; this->alpha = NULL; } } else if ( pixbuf == NULL && ( this->image == NULL || image_idx != this->image_idx ) ) { - mlt_pool_release( this->image ); - mlt_pool_release( this->alpha ); + if ( !use_cache ) + { + mlt_pool_release( this->image ); + mlt_pool_release( this->alpha ); + } this->image = NULL; this->alpha = NULL; @@ -197,6 +238,9 @@ static void refresh_image( mlt_frame frame, int width, int height ) // Finished with pixbuf now g_object_unref( pixbuf ); + + // Ensure we update the cache when we need to + update_cache = use_cache; } // Set width/height of frame @@ -209,6 +253,19 @@ static void refresh_image( mlt_frame frame, int width, int height ) 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 ); } @@ -242,7 +299,6 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form // The fault is not in the design of mlt, but in the implementation of the pixbuf producer... if ( *buffer != NULL ) { - if ( *format == mlt_image_yuv422 || *format == mlt_image_yuv420p ) { // Clone the image and the alpha @@ -281,6 +337,7 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form // We're going to pass the copy on *buffer = image_copy; } + } else { @@ -294,7 +351,6 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form return 0; } - static uint8_t *producer_get_alpha_mask( mlt_frame this ) { // Obtain properties of frame @@ -362,7 +418,7 @@ static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int i if ( stat( full, &buf ) == 0 ) { sprintf( key, "%d", keyvalue ++ ); - mlt_properties_set( this->filenames, "0", full ); + mlt_properties_set( this->filenames, key, full ); gap = 0; } else @@ -393,7 +449,7 @@ static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int i } // Generate a frame - *frame = mlt_frame_init( ); + *frame = mlt_frame_init( MLT_PRODUCER_SERVICE( producer ) ); if ( *frame != NULL && this->count > 0 ) { @@ -432,8 +488,11 @@ 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; - mlt_pool_release( this->image ); - mlt_pool_release( this->alpha ); + if ( !mlt_properties_get_int( MLT_PRODUCER_PROPERTIES( parent ), "cache" ) ) + { + mlt_pool_release( this->image ); + mlt_pool_release( this->alpha ); + } parent->close = NULL; mlt_producer_close( parent ); mlt_properties_close( this->filenames );