mlt_properties_set_int( luma_properties, "in", 0 );
mlt_properties_set_int( luma_properties, "out", out );
mlt_properties_set_int( luma_properties, "reverse", 1 );
- mlt_properties_pass( luma_properties, properties, "luma." );
mlt_properties_set_data( properties, "luma", luma, 0, ( mlt_destructor )mlt_transition_close, NULL );
}
}
if ( luma != NULL &&
( mlt_properties_get( properties, "blur" ) != NULL ||
mlt_frame_get_position( this ) % ( out + 1 ) != out ) )
+ {
+ mlt_properties luma_properties = mlt_transition_properties( luma );
+ mlt_properties_pass( luma_properties, properties, "luma." );
mlt_transition_process( luma, this, b_frame );
+ }
error = mlt_frame_get_image( this, image, format, width, height, 1 );
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;
}
}
-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 );
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" );
// 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
h = result.h * height / result.nh;
x &= 0xfffffffe;
- //w &= 0xfffffffe;
+ w &= 0xfffffffe;
// Now we need to create a new destination image
dest = mlt_pool_alloc( w * h * 2 );
// Optimisation - no compositing required
if ( result.mix == 0 || ( result.w == 0 && result.h == 0 ) )
- {
- mlt_properties_set_data( properties, "geometries", NULL, 0, NULL, NULL );
return 0;
- }
// Since we are the consumer of the b_frame, we must pass along these
// consumer properties from the a_frame
}
}
- // Force geometries to be recalculated
- mlt_properties_set_data( properties, "geometries", NULL, 0, NULL, NULL );
-
return 0;
}