Fix for serialising multiple overlapping mixes

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

diff --git a/src/modules/core/transition_composite.c b/src/modules/core/transition_composite.c
index 2d4535c..e737671 100644 (file)
--- a/src/modules/core/transition_composite.c
+++ b/src/modules/core/transition_composite.c
@@ -275,9 +275,6 @@ static struct geometry_s *transition_parse_keys( mlt_transition this,  int norma
        else
                end->position = 1;
 
-       // Assign to properties to ensure we get destroyed
-       mlt_properties_set_data( properties, "geometries", start, 0, transition_destroy_keys, NULL );
-
        return start;
 }
 
@@ -549,8 +546,8 @@ static int composite_yuv( uint8_t *p_dest, int width_dest, int height_dest, uint
        int y = geometry.y * height_dest / geometry.nh;
 
        // Align x to a full YUYV group
-       x &= 0xfffffffe;
-       width_src &= 0xfffffffe;
+       x = ( x | 1 ) ^ 1;
+       width_src = ( width_src | 1 ) ^ 1;
 
        // optimization points - no work to do
        if ( width_src <= 0 || height_src <= 0 )
@@ -576,6 +573,7 @@ static int composite_yuv( uint8_t *p_dest, int width_dest, int height_dest, uint
        {
                y_src = -y;
                height_src -= y_src;
+               y = 0;
        }
        
        // crop overlay below bottom edge of frame
@@ -848,7 +846,7 @@ static int get_b_frame_image( mlt_transition this, mlt_frame b_frame, uint8_t **
        *width = geometry->sw * *width / geometry->nw;
        *height = geometry->sh * *height / geometry->nh;
 
-       x &= 0xfffffffe;
+       x = ( x | 1 ) ^ 1;
 
        // optimization points - no work to do
        if ( *width < 1 || *height < 1 )
@@ -863,7 +861,7 @@ static int get_b_frame_image( mlt_transition this, mlt_frame b_frame, uint8_t **
 }
 
 
-struct geometry_s *composite_calculate( struct geometry_s *result, mlt_transition this, mlt_frame a_frame, float position )
+static struct geometry_s *composite_calculate( struct geometry_s *result, mlt_transition this, mlt_frame a_frame, float position )
 {
        // Get the properties from the transition
        mlt_properties properties = mlt_transition_properties( this );
@@ -875,7 +873,7 @@ struct geometry_s *composite_calculate( struct geometry_s *result, mlt_transitio
        struct geometry_s *start = mlt_properties_get_data( properties, "geometries", NULL );
 
        // Now parse the geometries
-       if ( start == NULL )
+       if ( start == NULL || mlt_properties_get_int( properties, "refresh" ) )
        {
                // Obtain the normalised width and height from the a_frame
                int normalised_width = mlt_properties_get_int( a_props, "normalised_width" );
@@ -883,6 +881,10 @@ struct geometry_s *composite_calculate( struct geometry_s *result, mlt_transitio
 
                // Parse the transitions properties
                start = transition_parse_keys( this, normalised_width, normalised_height );
+
+               // Assign to properties to ensure we get destroyed
+               mlt_properties_set_data( properties, "geometries", start, 0, transition_destroy_keys, NULL );
+               mlt_properties_set_int( properties, "refresh", 0 );
        }
 
        // Do the calculation
@@ -895,6 +897,16 @@ struct geometry_s *composite_calculate( struct geometry_s *result, mlt_transitio
        return start;
 }
 
+static inline void inline_memcpy( uint8_t *dest, uint8_t *src, int length )
+{
+       uint8_t *end = src + length;
+       while ( src < end )
+       {
+               *dest ++ = *src ++;
+               *dest ++ = *src ++;
+       }
+}
+
 mlt_frame composite_copy_region( mlt_transition this, mlt_frame a_frame, mlt_position frame_position )
 {
        // Create a frame to return
@@ -940,8 +952,17 @@ mlt_frame composite_copy_region( mlt_transition this, mlt_frame a_frame, mlt_pos
        w = result.w * width / result.nw;
        h = result.h * height / result.nh;
 
-       x &= 0xfffffffe;
-       //w &= 0xfffffffe;
+       if ( y < 0 )
+       {
+               h = h + y;
+               y = 0;
+       }
+
+       if ( y + h > height )
+               h = height - y;
+
+       x = ( x | 1 ) ^ 1;
+       w = ( w | 1 ) ^ 1;
 
        // Now we need to create a new destination image
        dest = mlt_pool_alloc( w * h * 2 );
@@ -953,7 +974,7 @@ mlt_frame composite_copy_region( mlt_transition this, mlt_frame a_frame, mlt_pos
 
        while ( q < r )
        {
-               memcpy( q, p, w * 2 );
+               inline_memcpy( q, p, w * 2 );
                q += w * 2;
                p += width * 2;
        }
@@ -1053,9 +1074,6 @@ static int transition_get_image( mlt_frame a_frame, uint8_t **image, mlt_image_f
                }
        }
 
-       // Force geometries to be recalculated
-       mlt_properties_set_data( properties, "geometries", NULL, 0, NULL, NULL );
-
        return 0;
 }