mlt_properties properties = mlt_filter_properties( base->filters[ i ] );
mlt_position in = mlt_properties_get_position( properties, "in" );
mlt_position out = mlt_properties_get_position( properties, "out" );
- if ( ( in == 0 && out == 0 ) || ( position >= in && position <= out ) )
+ if ( ( in == 0 && out == 0 ) || ( position >= in && ( position <= out || out == 0 ) ) )
{
- mlt_properties_set_position( frame_properties, "_position", position - in );
mlt_filter_process( base->filters[ i ], frame );
+ mlt_properties_set_position( frame_properties, "_position", position - in );
mlt_service_apply_filters( mlt_filter_service( base->filters[ i ] ), frame, index + 1 );
- mlt_properties_set_position( frame_properties, "_position", position + in );
+ mlt_properties_set_position( frame_properties, "_position", position );
}
}
}
// Get the b frame and process with composite if successful
if ( mlt_service_get_frame( service, &b_frame, 0 ) == 0 )
{
+ // Set the b frame to be in the same position
+ mlt_frame_set_position( b_frame, position );
+
if ( mlt_properties_get_int( properties, "reverse" ) == 0 )
{
// Apply all filters that are attached to this filter to the b frame
mlt_transition_process( composite, b_frame, frame );
mlt_properties_set( a_props, "rescale.interp", "nearest" );
mlt_properties_set( b_props, "rescale.interp", "nearest" );
- mlt_properties_set_int( b_props, "consumer_aspect_ratio", 1 );
+ mlt_properties_set_int( b_props, "consumer_aspect_ratio", mlt_properties_get_double( a_props, "consumer_aspect_ratio" ) );
mlt_service_apply_filters( mlt_filter_service( this ), frame, 0 );
error = mlt_frame_get_image( b_frame, image, format, width, height, 1 );
mlt_properties_set_data( b_props, "image", *image, 0, NULL, NULL );
char *name = mlt_properties_get( mlt_filter_properties( this ), "_unique_id" );
// Assign the current position to the name
- mlt_properties_set_position( properties, name, mlt_frame_get_position( frame ) );
+ mlt_properties_set_position( properties, name, mlt_frame_get_position( frame ) - mlt_filter_get_in( this ) );
// Push the filter on to the stack
mlt_frame_push_service( frame, this );
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 )
*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 )
if ( y + h > height )
h = height - y;
- x &= 0xfffffffe;
- w &= 0xfffffffe;
+ x = ( x | 1 ) ^ 1;
+ w = ( w | 1 ) ^ 1;
// Now we need to create a new destination image
dest = mlt_pool_alloc( w * h * 2 );