src/framework/mlt_consumer.c

[melted] / src / modules / core / transition_composite.c

diff --git a/src/modules/core/transition_composite.c b/src/modules/core/transition_composite.c
index 4cbf324..4b514e0 100644 (file)
--- a/src/modules/core/transition_composite.c
+++ b/src/modules/core/transition_composite.c
@@ -872,6 +872,7 @@ mlt_frame composite_copy_region( mlt_transition this, mlt_frame a_frame, mlt_pos
        uint8_t *image = mlt_properties_get_data( a_props, "image", NULL );
        int width = mlt_properties_get_int( a_props, "width" );
        int height = mlt_properties_get_int( a_props, "height" );
+       int format = mlt_properties_get_int( a_props, "format" );
 
        // Pointers for copy operation
        uint8_t *p;
@@ -922,6 +923,7 @@ mlt_frame composite_copy_region( mlt_transition this, mlt_frame a_frame, mlt_pos
        mlt_properties_set_data( b_props, "image", dest, w * h * 2, mlt_pool_release, NULL );
        mlt_properties_set_int( b_props, "width", w );
        mlt_properties_set_int( b_props, "height", h );
+       mlt_properties_set_int( b_props, "format", format );
 
        if ( y < 0 )
        {
@@ -1023,7 +1025,10 @@ static int transition_get_image( mlt_frame a_frame, uint8_t **image, mlt_image_f
                mlt_properties_set( b_props, "rescale.interp", rescale );
 
                // Do the calculation
+               // NB: Locks needed here since the properties are being modified
+               mlt_service_lock( MLT_TRANSITION_SERVICE( this ) );
                composite_calculate( this, &result, a_frame, position );
+               mlt_service_unlock( MLT_TRANSITION_SERVICE( this ) );
 
                // Since we are the consumer of the b_frame, we must pass along these
                // consumer properties from the a_frame
@@ -1129,7 +1134,10 @@ static int transition_get_image( mlt_frame a_frame, uint8_t **image, mlt_image_f
                                double field_position = position + field * delta;
                                
                                // Do the calculation if we need to
+                               // NB: Locks needed here since the properties are being modified
+                               mlt_service_lock( MLT_TRANSITION_SERVICE( this ) );
                                composite_calculate( this, &result, a_frame, field_position );
+                               mlt_service_unlock( MLT_TRANSITION_SERVICE( this ) );
 
                                if ( mlt_properties_get_int( properties, "titles" ) )
                                {