X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fgtk2%2Fproducer_pixbuf.c;h=95cae13ade88d59a3322b3d80a086b4b75a5d378;hb=9596911e0c624a73e354ecabfa9a565503d0ddf0;hp=699550d92d31b9286c0f2112466c36e7b60b1cf4;hpb=36aad7b318537612374acfd3f626a8c1364ad95d;p=melted diff --git a/src/modules/gtk2/producer_pixbuf.c b/src/modules/gtk2/producer_pixbuf.c index 699550d..95cae13 100644 --- a/src/modules/gtk2/producer_pixbuf.c +++ b/src/modules/gtk2/producer_pixbuf.c @@ -31,14 +31,25 @@ #include #include -static int producer_get_frame( mlt_producer parent, mlt_frame_ptr frame, int index ); -static void producer_close( mlt_producer parent ); +typedef struct producer_pixbuf_s *producer_pixbuf; -typedef enum +struct producer_pixbuf_s { - SIGNAL_FORMAT_PAL, - SIGNAL_FORMAT_NTSC -} mlt_signal_format; + struct mlt_producer_s parent; + + // File name list + char **filenames; + int count; + int image_idx; + + int width; + int height; + uint8_t *image; + uint8_t *alpha; +}; + +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 ) { @@ -48,85 +59,24 @@ static int filter_files( const struct dirent *de ) return 0; } - mlt_producer producer_pixbuf_init( char *filename ) { producer_pixbuf this = calloc( sizeof( struct producer_pixbuf_s ), 1 ); - if ( filename != NULL && this != NULL && mlt_producer_init( &this->parent, this ) == 0 ) + if ( this != NULL && mlt_producer_init( &this->parent, this ) == 0 ) { mlt_producer producer = &this->parent; - producer->get_frame = producer_get_frame; - producer->close = producer_close; - // Get the properties interface mlt_properties properties = mlt_producer_properties( &this->parent ); + // Callback registration + producer->get_frame = producer_get_frame; + producer->close = producer_close; + // Set the default properties mlt_properties_set( properties, "resource", filename ); - mlt_properties_set_int( properties, "video_standard", mlt_video_standard_pal ); mlt_properties_set_int( properties, "ttl", 25 ); - // Obtain filenames - 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 ++; - } - } - mlt_properties_set_position( properties, "out", this->count * 25 ); - } - 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 ( lstat( fullname, &info ) == 0 && - ( S_ISREG( info.st_mode ) || ( strstr( fullname, extension ) && 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 ); - mlt_properties_set_position( properties, "out", 25 ); - } - // Initialise gobject types g_type_init(); @@ -145,7 +95,7 @@ static void refresh_image( mlt_frame frame, int width, int height ) // Obtain properties of frame mlt_properties properties = mlt_frame_properties( frame ); - // Obtain the producer pango for this frame + // Obtain the producer for this frame producer_pixbuf this = mlt_properties_get_data( properties, "producer_pixbuf", NULL ); // Obtain the producer @@ -157,26 +107,31 @@ static void refresh_image( mlt_frame frame, int width, int height ) // Get the time to live for each frame double ttl = mlt_properties_get_int( producer_props, "ttl" ); - // Image index - int image_idx = ( int )floor( mlt_producer_position( producer ) / ttl ) % this->count; + // Get the original position of this frame + mlt_position position = mlt_properties_get_position( properties, "pixbuf_position" ); - // Update timecode on the frame we're creating - mlt_frame_set_position( frame, mlt_producer_position( producer ) ); + // Image index + int image_idx = ( int )floor( ( double )position / ttl ) % this->count; // optimization for subsequent iterations on single picture - if ( this->image != NULL && image_idx == this->image_idx ) + 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 ); + this->image = NULL; + this->alpha = NULL; } } - else + else if ( this->image == NULL || image_idx != this->image_idx ) { - free( this->image ); + mlt_pool_release( this->image ); + mlt_pool_release( this->alpha ); this->image = NULL; - free( this->alpha ); this->alpha = NULL; + this->image_idx = image_idx; pixbuf = gdk_pixbuf_new_from_file( this->filenames[ image_idx ], &error ); @@ -197,28 +152,37 @@ static void refresh_image( mlt_frame frame, int width, int height ) // If we have a pixbuf if ( pixbuf && width > 0 ) { + char *interps = mlt_properties_get( properties, "rescale.interp" ); + int interp = GDK_INTERP_BILINEAR; + + 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 ) + interp = GDK_INTERP_HYPER; + // Note - the original pixbuf is already safe and ready for destruction - pixbuf = gdk_pixbuf_scale_simple( pixbuf, width, height, GDK_INTERP_HYPER ); + pixbuf = gdk_pixbuf_scale_simple( pixbuf, width, height, interp ); // Store width and height - this->width = gdk_pixbuf_get_width( pixbuf ); - this->height = gdk_pixbuf_get_height( pixbuf ); - - // Allocate/define image and alpha - uint8_t *image = malloc( this->width * this->height * 2 ); - uint8_t *alpha = NULL; + this->width = width; + this->height = height; + + // Allocate/define image + this->image = mlt_pool_alloc( width * ( height + 1 ) * 2 ); // Extract YUV422 and alpha if ( gdk_pixbuf_get_has_alpha( pixbuf ) ) { // Allocate the alpha mask - alpha = malloc( this->width * this->height ); + 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 ), - image, alpha ); + this->image, this->alpha ); } else { @@ -226,15 +190,11 @@ static void refresh_image( mlt_frame frame, int width, int height ) mlt_convert_rgb24_to_yuv422( gdk_pixbuf_get_pixels( pixbuf ), this->width, this->height, gdk_pixbuf_get_rowstride( pixbuf ), - image ); + this->image ); } // Finished with pixbuf now g_object_unref( pixbuf ); - - // Pass alpha and image on properties with or without destructor - this->image = image; - this->alpha = alpha; } // Set width/height of frame @@ -243,8 +203,8 @@ static void refresh_image( mlt_frame frame, int width, int 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 and alpha data without destructor - mlt_properties_set_data( properties, "image", this->image, this->width * this->height * 2, NULL, NULL ); + // 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 ); } @@ -253,6 +213,9 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form // Obtain properties of frame mlt_properties properties = mlt_frame_properties( frame ); + *width = mlt_properties_get_int( properties, "rescale_width" ); + *height = mlt_properties_get_int( properties, "rescale_height" ); + // Refresh the image refresh_image( frame, *width, *height ); @@ -266,22 +229,28 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form *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 ) { - size = *width * *height * 2; - // Clone our image - uint8_t *copy = malloc( size ); - memcpy( copy, image, size ); + uint8_t *copy = mlt_pool_alloc( size ); + if ( image != NULL ) + memcpy( copy, image, size ); // 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", copy, size, free, NULL ); + mlt_properties_set_data( properties, "image", copy, size, mlt_pool_release, NULL ); } // Pass on the image @@ -304,23 +273,133 @@ 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 ) + { + mlt_properties properties = mlt_producer_properties( producer ); + char *filename = mlt_properties_get( properties, "resource" ); + + // Read xml string + if ( strstr( filename, " -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 ); + + 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 ); + } + } + // 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 ++; + } + } + mlt_properties_set_position( properties, "out", this->count * 250 ); + } + 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 ); + mlt_properties_set_position( properties, "out", 250 ); + } + } + // Generate a frame *frame = mlt_frame_init( ); - // Obtain properties of frame and producer - mlt_properties properties = mlt_frame_properties( *frame ); + if ( *frame != NULL && this->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 ); - // Set the producer on the frame properties - mlt_properties_set_data( properties, "producer_pixbuf", this, 0, NULL, NULL ); + // Update timecode on the frame we're creating + mlt_frame_set_position( *frame, mlt_producer_position( producer ) ); - // Refresh the pango image - refresh_image( *frame, 0, 0 ); + // 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 ) ); - // Set alpha call back - ( *frame )->get_alpha_mask = producer_get_alpha_mask; + // Refresh the image + refresh_image( *frame, 0, 0 ); - // Push the get_image method - mlt_frame_push_get_image( *frame, producer_get_image ); + // Set producer-specific frame properties + mlt_properties_set_int( properties, "progressive", 1 ); + mlt_properties_set_double( properties, "aspect_ratio", 1 ); + + // Set alpha call back + ( *frame )->get_alpha_mask = producer_get_alpha_mask; + + // Push the get_image method + mlt_frame_push_get_image( *frame, producer_get_image ); + } // Calculate the next timecode mlt_producer_prepare_next( producer ); @@ -331,10 +410,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; - free( this->image ); - free( this->alpha ); + mlt_pool_release( this->image ); parent->close = NULL; mlt_producer_close( parent ); + while ( this->count -- ) + free( this->filenames[ this->count ] ); + free( this->filenames ); free( this ); } -