producer_pango.c

[melted] / src / modules / gtk2 / producer_pixbuf.c

diff --git a/src/modules/gtk2/producer_pixbuf.c b/src/modules/gtk2/producer_pixbuf.c
index 8a7fbaf..ee7c951 100644 (file)
--- a/src/modules/gtk2/producer_pixbuf.c
+++ b/src/modules/gtk2/producer_pixbuf.c
@@ -91,7 +91,7 @@ mlt_producer producer_pixbuf_init( char *filename )
 static void refresh_image( mlt_frame frame, int width, int height )
 {
        // Pixbuf 
-       GdkPixbuf *pixbuf = NULL;
+       GdkPixbuf *pixbuf = mlt_properties_get_data( MLT_FRAME_PROPERTIES( frame ), "pixbuf", NULL );
        GError *error = NULL;
 
        // Obtain properties of frame
@@ -129,7 +129,7 @@ static void refresh_image( mlt_frame frame, int width, int height )
                        this->alpha = NULL;
                }
        }
-       else if ( this->image == NULL || image_idx != this->image_idx )
+       else if ( pixbuf == NULL && ( this->image == NULL || image_idx != this->image_idx ) )
        {
                mlt_pool_release( this->image );
                mlt_pool_release( this->alpha );
@@ -143,6 +143,8 @@ static void refresh_image( mlt_frame frame, int width, int height )
                {
                        // Register this pixbuf for destruction and reuse
                        mlt_properties_set_data( producer_props, "pixbuf", pixbuf, 0, ( mlt_destructor )g_object_unref, NULL );
+                       g_object_ref( pixbuf );
+                       mlt_properties_set_data( MLT_FRAME_PROPERTIES( frame ), "pixbuf", pixbuf, 0, ( mlt_destructor )g_object_unref, 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 ) );
@@ -265,8 +267,11 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form
        }
        else
        {
-               // Fall back to the test card...
-               mlt_frame_get_image( frame, buffer, format, width, height, writable );
+               // 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;
        }
 
        return 0;