producer_pango.c

producer_pixbuf.c
+ More efficient use of pixbuf objects and sequences/mlt pango lists

git-svn-id: https://mlt.svn.sourceforge.net/svnroot/mlt/trunk/mlt@802 d19143bc-622f-0410-bfdd-b5b2a6649095

diff --git a/src/modules/gtk2/producer_pango.c b/src/modules/gtk2/producer_pango.c
index 7da47d1710071f5b23172ec234710824223c1364..69b1c2527b5cb8d4f4e4fb7da95efcd56a15fd43 100644 (file)
--- a/src/modules/gtk2/producer_pango.c
+++ b/src/modules/gtk2/producer_pango.c
@@ -303,7 +303,7 @@ static int iconv_utf8( mlt_properties properties, char *prop_name, const char* e
 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 );
 
        // Obtain properties of frame
        mlt_properties properties = MLT_FRAME_PROPERTIES( frame );
@@ -328,41 +328,45 @@ static void refresh_image( mlt_frame frame, int width, int height )
        char *encoding = mlt_properties_get( producer_props, "encoding" );
        int weight = mlt_properties_get_int( producer_props, "weight" );
        int size = mlt_properties_get_int( producer_props, "size" );
-       int property_changed = ( align != this->align );
-
-       // Check for file support
-       int position = mlt_properties_get_position( properties, "pango_position" );
-       mlt_properties contents = mlt_properties_get_data( producer_props, "contents", NULL );
-       mlt_geometry key_frames = mlt_properties_get_data( producer_props, "key_frames", NULL );
-       struct mlt_geometry_item_s item;
-       if ( contents != NULL )
+       int property_changed = 0;
+
+       if ( pixbuf == NULL )
        {
-               char temp[ 20 ];
-               mlt_geometry_prev_key( key_frames, &item, position );
-               sprintf( temp, "%d", item.frame );
-               markup = mlt_properties_get( contents, temp );
-       }
+               // Check for file support
+               int position = mlt_properties_get_position( properties, "pango_position" );
+               mlt_properties contents = mlt_properties_get_data( producer_props, "contents", NULL );
+               mlt_geometry key_frames = mlt_properties_get_data( producer_props, "key_frames", NULL );
+               struct mlt_geometry_item_s item;
+               if ( contents != NULL )
+               {
+                       char temp[ 20 ];
+                       mlt_geometry_prev_key( key_frames, &item, position );
+                       sprintf( temp, "%d", item.frame );
+                       markup = mlt_properties_get( contents, temp );
+               }
        
-       // See if any properties changed
-       property_changed = property_changed || ( this->fgcolor == NULL || ( fg && strcmp( fg, this->fgcolor ) ) );
-       property_changed = property_changed || ( this->bgcolor == NULL || ( bg && strcmp( bg, this->bgcolor ) ) );
-       property_changed = property_changed || ( pad != this->pad );
-       property_changed = property_changed || ( markup && this->markup && strcmp( markup, this->markup ) );
-       property_changed = property_changed || ( text && this->text && strcmp( text, this->text ) );
-       property_changed = property_changed || ( font && this->font && strcmp( font, this->font ) );
-       property_changed = property_changed || ( weight != this->weight );
-
-       // Save the properties for next comparison
-       this->align = align;
-       this->pad = pad;
-       set_string( &this->fgcolor, fg, "0xffffffff" );
-       set_string( &this->bgcolor, bg, "0x00000000" );
-       set_string( &this->markup, markup, NULL );
-       set_string( &this->text, text, NULL );
-       set_string( &this->font, font, "Sans 48" );
-       this->weight = weight;
-
-       if ( property_changed )
+               // See if any properties changed
+               property_changed = ( align != this->align );
+               property_changed = property_changed || ( this->fgcolor == NULL || ( fg && strcmp( fg, this->fgcolor ) ) );
+               property_changed = property_changed || ( this->bgcolor == NULL || ( bg && strcmp( bg, this->bgcolor ) ) );
+               property_changed = property_changed || ( pad != this->pad );
+               property_changed = property_changed || ( markup && this->markup && strcmp( markup, this->markup ) );
+               property_changed = property_changed || ( text && this->text && strcmp( text, this->text ) );
+               property_changed = property_changed || ( font && this->font && strcmp( font, this->font ) );
+               property_changed = property_changed || ( weight != this->weight );
+
+               // Save the properties for next comparison
+               this->align = align;
+               this->pad = pad;
+               set_string( &this->fgcolor, fg, "0xffffffff" );
+               set_string( &this->bgcolor, bg, "0x00000000" );
+               set_string( &this->markup, markup, NULL );
+               set_string( &this->text, text, NULL );
+               set_string( &this->font, font, "Sans 48" );
+               this->weight = weight;
+       }
+
+       if ( pixbuf == NULL && property_changed )
        {
                rgba_color fgcolor = parse_color( this->fgcolor );
                rgba_color bgcolor = parse_color( this->bgcolor );
@@ -394,6 +398,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 ) );
@@ -403,7 +409,7 @@ static void refresh_image( mlt_frame frame, int width, int height )
                        this->height = gdk_pixbuf_get_height( pixbuf );
                }
        }
-       else if ( width > 0 && ( this->image == NULL || width != this->width || height != this->height ) )
+       else if ( pixbuf == NULL && ( width > 0 && ( this->image == NULL || width != this->width || height != this->height ) ) )
        {
                mlt_pool_release( this->image );
                mlt_pool_release( this->alpha );

diff --git a/src/modules/gtk2/producer_pixbuf.c b/src/modules/gtk2/producer_pixbuf.c
index b475d4e57771ba3e2d35f51cc0ba463123a87f02..ee7c951f5bc44d16f0a8b4a3d308d1e4b764eb4f 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 ) );