git-svn-id: https://mlt.svn.sourceforge.net/svnroot/mlt/trunk/mlt@342
d19143bc-622f-0410-bfdd-
b5b2a6649095
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_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 );
}
}
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 ) )
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 );
mlt_transition_process( luma, this, b_frame );
error = mlt_frame_get_image( this, image, format, width, height, 1 );
error = mlt_frame_get_image( this, image, format, width, height, 1 );
q = p + *width * 2;
if ( !reverse )
{
q = p + *width * 2;
if ( !reverse )
{
{
*p ++ = *( q - 2 );
*p ++ = *( q - 3 );
{
*p ++ = *( q - 2 );
*p ++ = *( q - 3 );
{
*( q - 2 ) = *p ++;
*( q - 3 ) = *p ++;
{
*( q - 2 ) = *p ++;
*( q - 3 ) = *p ++;
for ( i = 0; i < hh; i ++ )
{
p = ( uint16_t * )*image + i * *width;
for ( i = 0; i < hh; i ++ )
{
p = ( uint16_t * )*image + i * *width;
+ q = end - ( i + 1 ) * *width;
j = *width;
if ( !reverse )
{
j = *width;
if ( !reverse )
{
{
p = ( uint8_t * )*image + i * *width * 2;
q = p + *width * 2;
{
p = ( uint8_t * )*image + i * *width * 2;
q = p + *width * 2;
{
t[ 0 ] = p[ 0 ];
t[ 1 ] = p[ 1 ];
{
t[ 0 ] = p[ 0 ];
t[ 1 ] = p[ 1 ];
for ( i = 0; i < hh; i ++ )
{
p = ( uint16_t * )*image + i * *width;
for ( i = 0; i < hh; i ++ )
{
p = ( uint16_t * )*image + i * *width;
+ q = end - ( i + 1 ) * *width;
j = *width;
while ( j -- )
{
j = *width;
while ( j -- )
{
- // Assign to properties to ensure we get destroyed
- mlt_properties_set_data( properties, "geometries", start, 0, transition_destroy_keys, NULL );
-
-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 );
{
// 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
struct geometry_s *start = mlt_properties_get_data( properties, "geometries", NULL );
// Now parse the geometries
+ 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" );
{
// 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 );
// 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 );
h = result.h * height / result.nh;
x &= 0xfffffffe;
h = result.h * height / result.nh;
x &= 0xfffffffe;
// Now we need to create a new destination image
dest = mlt_pool_alloc( w * h * 2 );
// 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 ) )
// Optimisation - no compositing required
if ( result.mix == 0 || ( result.w == 0 && result.h == 0 ) )
- {
- mlt_properties_set_data( properties, "geometries", NULL, 0, NULL, NULL );
// Since we are the consumer of the b_frame, we must pass along these
// consumer properties from the a_frame
// 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 );
-
while ( filter != NULL )
{
// Stack this filter
while ( filter != NULL )
{
// Stack this filter
- mlt_filter_process( filter, b_frame );
+ if ( mlt_properties_get_int( mlt_filter_properties( filter ), "off" ) == 0 )
+ mlt_filter_process( filter, b_frame );
// Generate the key for the next
sprintf( id, "_filter_%d", ++ i );
// Generate the key for the next
sprintf( id, "_filter_%d", ++ i );