mlt_filter filter = mlt_frame_pop_service( this );
// Get the properties
- mlt_properties properties = mlt_filter_properties( filter );
+ mlt_properties properties = MLT_FILTER_PROPERTIES( filter );
// Get the image
int error = mlt_frame_get_image( this, image, format, width, height, 0 );
if ( producer != NULL && transition != NULL )
{
char *name = mlt_properties_get( properties, "_unique_id" );
- mlt_position position = mlt_properties_get_position( mlt_frame_properties( this ), name );
- mlt_properties frame_properties = mlt_frame_properties( this );
+ mlt_position position = mlt_properties_get_position( MLT_FRAME_PROPERTIES( this ), name );
+ mlt_properties frame_properties = MLT_FRAME_PROPERTIES( this );
+ double consumer_ar = mlt_properties_get_double( frame_properties, "consumer_aspect_ratio" );
+ mlt_properties_set_position( MLT_TRANSITION_PROPERTIES( transition ), "in", mlt_filter_get_in( filter ) );
+ mlt_properties_set_position( MLT_TRANSITION_PROPERTIES( transition ), "out", mlt_filter_get_out( filter ) );
mlt_producer_seek( producer, position );
mlt_frame_set_position( this, position );
- mlt_properties_pass( mlt_producer_properties( producer ), properties, "producer." );
- mlt_properties_pass( mlt_transition_properties( transition ), properties, "transition." );
- mlt_service_get_frame( mlt_producer_service( producer ), &a_frame, 0 );
- mlt_properties_set( mlt_frame_properties( a_frame ), "rescale_interp", "nearest" );
- mlt_properties_set( mlt_frame_properties( a_frame ), "distort", "true" );
- mlt_properties_set_double( mlt_frame_properties( a_frame ), "consumer_aspect_ratio",
- mlt_properties_get_double( frame_properties, "consumer_aspect_ratio" ) );
+ mlt_properties_pass( MLT_PRODUCER_PROPERTIES( producer ), properties, "producer." );
+ mlt_properties_pass( MLT_TRANSITION_PROPERTIES( transition ), properties, "transition." );
+ mlt_service_get_frame( MLT_PRODUCER_SERVICE( producer ), &a_frame, 0 );
+ mlt_properties_set( MLT_FRAME_PROPERTIES( a_frame ), "rescale.interp", "nearest" );
+ mlt_properties_set_int( MLT_FRAME_PROPERTIES( a_frame ), "distort", 1 );
+
+ // Special case - aspect_ratio = 0
+ if ( mlt_properties_get_double( frame_properties, "aspect_ratio" ) == 0 )
+ mlt_properties_set_double( frame_properties, "aspect_ratio", consumer_ar );
+ if ( mlt_properties_get_double( MLT_FRAME_PROPERTIES( a_frame ), "aspect_ratio" ) == 0 )
+ mlt_properties_set_double( MLT_FRAME_PROPERTIES( a_frame ), "aspect_ratio", consumer_ar );
+ mlt_properties_set_double( MLT_FRAME_PROPERTIES( a_frame ), "consumer_aspect_ratio", consumer_ar );
+
mlt_transition_process( transition, a_frame, this );
mlt_frame_get_image( a_frame, image, format, width, height, writable );
mlt_properties_set_data( frame_properties, "affine_frame", a_frame, 0, (mlt_destructor)mlt_frame_close, NULL );
mlt_properties_set_data( frame_properties, "image", *image, *width * *height * 2, NULL, NULL );
+ mlt_properties_set_data( frame_properties, "alpha", mlt_frame_get_alpha_mask( a_frame ), *width * *height, NULL, NULL );
}
}
static mlt_frame filter_process( mlt_filter this, mlt_frame frame )
{
// Get the properties of the frame
- mlt_properties properties = mlt_frame_properties( frame );
+ mlt_properties properties = MLT_FRAME_PROPERTIES( frame );
// Get a unique name to store the frame position
- char *name = mlt_properties_get( mlt_filter_properties( this ), "_unique_id" );
+ 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 frame filter
mlt_frame_push_service( frame, this );
mlt_frame_push_get_image( frame, filter_get_image );
+
return frame;
}
if ( this != NULL )
{
this->process = filter_process;
- mlt_properties_set( mlt_filter_properties( this ), "background", "colour:black" );
- mlt_properties_set( mlt_filter_properties( this ), "transition.rotate_x", "10" );
+ mlt_properties_set( MLT_FILTER_PROPERTIES( this ), "background", "colour:black" );
+ mlt_properties_set( MLT_FILTER_PROPERTIES( this ), "transition.rotate_x", "10" );
}
return this;
}