Memory pooling

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

diff --git a/src/modules/gtk2/producer_pango.c b/src/modules/gtk2/producer_pango.c
index c04d942..bed28f9 100644 (file)
--- a/src/modules/gtk2/producer_pango.c
+++ b/src/modules/gtk2/producer_pango.c
@@ -31,7 +31,9 @@ struct producer_pango_s
        struct mlt_producer_s parent;
        int width;
        int height;
+       void *image_release;
        uint8_t *image;
+       void *alpha_release;
        uint8_t *alpha;
        char *fgcolor;
        char *bgcolor;
@@ -271,8 +273,10 @@ static void refresh_image( mlt_frame frame, int width, int height )
                rgba_color fgcolor = parse_color( this->fgcolor );
                rgba_color bgcolor = parse_color( this->bgcolor );
 
-               free( this->image );
-               free( this->alpha );
+               mlt_pool_release( this->image_release );
+               mlt_pool_release( this->alpha_release );
+               this->image_release = NULL;
+               this->alpha_release = NULL;
                this->image = NULL;
                this->alpha = NULL;
 
@@ -294,8 +298,10 @@ static void refresh_image( mlt_frame frame, int width, int height )
        }
        else if ( width > 0 && ( this->image == NULL || width != this->width || height != this->height ) )
        {
-               free( this->image );
-               free( this->alpha );
+               mlt_pool_release( this->image_release );
+               mlt_pool_release( this->alpha_release );
+               this->image_release = NULL;
+               this->alpha_release = NULL;
                this->image = NULL;
                this->alpha = NULL;
 
@@ -325,25 +331,17 @@ static void refresh_image( mlt_frame frame, int width, int height )
                this->height = height;
 
                // Allocate/define image
-               // IRRIGATE ME
-               uint8_t *image = malloc( width * ( height + 1 ) * 2 );
-               uint8_t *alpha = NULL;
-
-               // Allocate the alpha mask
-               alpha = malloc( this->width * this->height );
+               this->image = mlt_pool_allocate( width * ( height + 1 ) * 2, &this->image_release );
+               this->alpha = mlt_pool_allocate( this->width * this->height, &this->alpha_release );
 
                // 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 );
 
                // Finished with pixbuf now
                g_object_unref( pixbuf );
-               
-               // reference the image in the producer
-               this->image = image;
-               this->alpha = alpha;
        }
 
        // Set width/height
@@ -386,15 +384,16 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form
        if ( writable )
        {
                // Clone our image
-               // IRRIGATE ME
-               uint8_t *copy = malloc( size );
+               void *release = NULL;
+               uint8_t *copy = mlt_pool_allocate( size, &release );
                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_release", release, 0, ( mlt_destructor )mlt_pool_release, NULL );
+               mlt_properties_set_data( properties, "image", copy, size, NULL, NULL );
        }
 
        // Pass on the image
@@ -450,8 +449,8 @@ static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int i
 static void producer_close( mlt_producer parent )
 {
        producer_pango this = parent->child;
-       free( this->image );
-       free( this->alpha );
+       mlt_pool_release( this->image_release );
+       mlt_pool_release( this->alpha_release );
        free( this->fgcolor );
        free( this->bgcolor );
        free( this->markup );
@@ -493,6 +492,7 @@ static GdkPixbuf *pango_get_pixbuf( const char *markup, const char *text, const
        uint8_t *src = NULL;
        uint8_t* dest = NULL;
        int stride;
+       void *release = NULL;
 
        pango_ft2_font_map_set_resolution( fontmap, 72, 72 );
        pango_layout_set_width( layout, -1 ); // set wrapping constraints
@@ -515,10 +515,12 @@ static GdkPixbuf *pango_get_pixbuf( const char *markup, const char *text, const
        bitmap.width     = w;
        bitmap.pitch     = 32 * ( ( w + 31 ) / 31 );
        bitmap.rows      = h;
-       bitmap.buffer    = ( unsigned char * ) calloc( 1, h * bitmap.pitch );
+       bitmap.buffer    = mlt_pool_allocate( h * bitmap.pitch, &release );
        bitmap.num_grays = 256;
        bitmap.pixel_mode = ft_pixel_mode_grays;
 
+       memset( bitmap.buffer, 0, h * bitmap.pitch );
+
        pango_ft2_render_layout( &bitmap, layout, 0, 0 );
 
        src = bitmap.buffer;
@@ -537,8 +539,7 @@ static GdkPixbuf *pango_get_pixbuf( const char *markup, const char *text, const
                }
                dest += stride;
        }
-       free( bitmap.buffer );
-
+       mlt_pool_release( release );
        g_object_unref( layout );
        g_object_unref( context );
        g_object_unref( fontmap );