consumer_sdl.c: let it work without filter_avcolour_space
[melted] / src / modules / gtk2 / producer_pixbuf.c
index b6dc1ba..0918597 100644 (file)
@@ -1,25 +1,24 @@
-
 /*
  * producer_pixbuf.c -- raster image loader based upon gdk-pixbuf
  * 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 <gdk-pixbuf/gdk-pixbuf.h>
 
@@ -52,6 +51,8 @@ struct producer_pixbuf_s
        uint8_t *alpha;
 };
 
+static void load_filenames( producer_pixbuf this, mlt_properties producer_properties );
+static void refresh_image( 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 );
 
@@ -74,13 +75,114 @@ mlt_producer producer_pixbuf_init( char *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 properties = MLT_FRAME_PROPERTIES( frame );
+                               mlt_properties_set_data( properties, "producer_pixbuf", this, 0, NULL, NULL );
+                               mlt_frame_set_position( frame, mlt_producer_position( producer ) );
+                               mlt_properties_set_position( properties, "pixbuf_position", mlt_producer_position( producer ) );
+                               refresh_image( frame, 0, 0 );
+                               mlt_frame_close( frame );
+                       }
+               }
+               if ( this->width == 0 )
+               {
+                       producer_close( producer );
+                       producer = NULL;
+               }
                return producer;
        }
        free( this );
        return NULL;
 }
 
+static void load_filenames( producer_pixbuf this, mlt_properties producer_properties )
+{
+       char *filename = mlt_properties_get( producer_properties, "resource" );
+       this->filenames = mlt_properties_new( );
+
+       // 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 );
+
+                       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( mlt_frame frame, int width, int height )
 {
        // Pixbuf 
@@ -99,6 +201,14 @@ static void refresh_image( mlt_frame frame, int width, int height )
        // Obtain properties of producer
        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" ) ) 
+       {
+               pixbuf = NULL;
+               this->image = NULL;
+               mlt_properties_set_int( producer_props, "force_reload", 0 );
+       }
+
        // 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 );
@@ -109,6 +219,7 @@ static void refresh_image( mlt_frame frame, int width, int height )
 
        // 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;
@@ -255,7 +366,7 @@ static void refresh_image( mlt_frame frame, int width, int height )
 
        if ( update_cache )
        {
-               mlt_frame cached = mlt_frame_init( );
+               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 );
@@ -299,24 +410,45 @@ 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 )
        {
-               // Clone the image and the alpha
-               uint8_t *image_copy = mlt_pool_alloc( image_size );
-               uint8_t *alpha_copy = mlt_pool_alloc( alpha_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, *buffer, image_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 );
+                       // Copy or default the alpha
+                       if ( alpha != NULL )
+                               memcpy( alpha_copy, 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 );
 
-               // 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(*buffer, image_copy, (*width)*(*height));
+
+                       // 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;
+               }
 
-               // We're going to pass the copy on
-               *buffer = image_copy;
        }
        else
        {
@@ -348,87 +480,10 @@ static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int i
        mlt_properties producer_properties = MLT_PRODUCER_PROPERTIES( producer );
 
        if ( this->filenames == NULL && mlt_properties_get( producer_properties, "resource" ) != NULL )
-       {
-               char *filename = mlt_properties_get( producer_properties, "resource" );
-               this->filenames = mlt_properties_new( );
-
-               // 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 );
-
-                               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, "0", 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 );
-       }
+               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 )
        {