X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fplus%2Ffilter_affine.c;h=f3d0b6bb29bd69a692e300adb344586026169009;hb=c12c6c380fa37b6a0d28ce98fdcda487a8aca76d;hp=a37b0661e82a7e13b736cd0929935c415dfe0223;hpb=dc6eb42c57d2f1111d87d8b9544e158b86a441f8;p=melted diff --git a/src/modules/plus/filter_affine.c b/src/modules/plus/filter_affine.c index a37b066..f3d0b6b 100644 --- a/src/modules/plus/filter_affine.c +++ b/src/modules/plus/filter_affine.c @@ -62,11 +62,15 @@ static int filter_get_image( mlt_frame this, uint8_t **image, mlt_image_format * 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_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 ), "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" ) ); @@ -85,9 +89,19 @@ static int filter_get_image( mlt_frame this, uint8_t **image, mlt_image_format * static mlt_frame filter_process( mlt_filter this, mlt_frame frame ) { + // Get the properties of the 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" ); + + // Assign the current position to the name + 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; } @@ -101,7 +115,7 @@ mlt_filter filter_affine_init( char *arg ) { this->process = filter_process; mlt_properties_set( mlt_filter_properties( this ), "background", "colour:black" ); - mlt_properties_set( mlt_filter_properties( this ), "transition.rotate", "10" ); + mlt_properties_set( mlt_filter_properties( this ), "transition.rotate_x", "10" ); } return this; }