Some fixes for alpha masks

[mlt] / src / modules / core / transition_luma.c

diff --git a/src/modules/core/transition_luma.c b/src/modules/core/transition_luma.c
index 609b6105dadc8b2913fed43179cb9136c3013273..c938f0cabf30988547dae8647c488ea24537ddba 100644 (file)
--- a/src/modules/core/transition_luma.c
+++ b/src/modules/core/transition_luma.c
@@ -75,9 +75,16 @@ static inline int dissolve_yuv( mlt_frame this, mlt_frame that, float weight, in
        int32_t weigh = weight * ( 1 << 16 );
        int32_t weigh_complement = ( 1 - weight ) * ( 1 << 16 );
 
+       if ( mlt_properties_get( &this->parent, "distort" ) )
+               mlt_properties_set( &that->parent, "distort", mlt_properties_get( &this->parent, "distort" ) );
+       mlt_properties_set_int( &that->parent, "consumer_deinterlace", mlt_properties_get_int( &this->parent, "consumer_deinterlace" ) );
        mlt_frame_get_image( this, &p_dest, &format, &width, &height, 1 );
        mlt_frame_get_image( that, &p_src, &format, &width_src, &height_src, 0 );
 
+       // Pick the lesser of two evils ;-)
+       width_src = width_src > width ? width : width_src;
+       height_src = height_src > height ? height : height_src;
+       
        p = p_dest;
        limit = p_dest + height_src * width_src * 2;
 
@@ -125,9 +132,16 @@ static void luma_composite( mlt_frame a_frame, mlt_frame b_frame, int luma_width
        format_src = mlt_image_yuv422;
        format_dest = mlt_image_yuv422;
 
+       if ( mlt_properties_get( &a_frame->parent, "distort" ) )
+               mlt_properties_set( &b_frame->parent, "distort", mlt_properties_get( &a_frame->parent, "distort" ) );
+       mlt_properties_set_int( &b_frame->parent, "consumer_deinterlace", mlt_properties_get_int( &a_frame->parent, "consumer_deinterlace" ) );
        mlt_frame_get_image( a_frame, &p_dest, &format_dest, &width_dest, &height_dest, 1 );
        mlt_frame_get_image( b_frame, &p_src, &format_src, &width_src, &height_src, 0 );
 
+       // Pick the lesser of two evils ;-)
+       width_src = width_src > width_dest ? width_dest : width_src;
+       height_src = height_src > height_dest ? height_dest : height_src;
+       
        stride_src = width_src * 2;
        stride_dest = width_dest * 2;
 
@@ -438,12 +452,15 @@ static int transition_get_image( mlt_frame a_frame, uint8_t **image, mlt_image_f
        
        float luma_softness = mlt_properties_get_double( properties, "softness" );
        int progressive = 
-                       mlt_properties_get_int( a_props, "consumer_progressive" ) ||
+                       mlt_properties_get_int( a_props, "consumer_deinterlace" ) ||
                        mlt_properties_get_int( properties, "progressive" ) ||
                        mlt_properties_get_int( b_props, "luma.progressive" );
        int top_field_first =  mlt_properties_get_int( b_props, "top_field_first" );
        int reverse = mlt_properties_get_int( properties, "reverse" );
 
+       if ( mlt_properties_get( a_props, "rescale.interp" ) == NULL )
+               mlt_properties_set( a_props, "rescale.interp", "nearest" );
+
        // Since we are the consumer of the b_frame, we must pass along this
        // consumer property from the a_frame
        if ( !strcmp( mlt_properties_get( a_props, "rescale.interp" ), "none" ) )
@@ -461,6 +478,9 @@ static int transition_get_image( mlt_frame a_frame, uint8_t **image, mlt_image_f
        // Ensure we get scaling on the b_frame
        mlt_properties_set( b_props, "rescale.interp", "nearest" );
 
+       if ( mlt_properties_get( properties, "fixed" ) )
+               mix = mlt_properties_get_double( properties, "fixed" );
+
        if ( luma_width > 0 && luma_height > 0 && luma_bitmap != NULL )
                // Composite the frames using a luma map
                luma_composite( a_frame, b_frame, luma_width, luma_height, luma_bitmap, mix, frame_delta,