X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fplus%2Ffilter_affine.c;h=465e412909fed53109d81b6e77f3ed922984d605;hb=ff8e939e1781bf747b7a9f2d6a26a6f7ca1b9bee;hp=a3053e1df798791b1dd15dd9c31a7a258b1a0546;hpb=14a6dfabee044ad58d4ee2579b25d071d02588ec;p=melted

diff --git a/src/modules/plus/filter_affine.c b/src/modules/plus/filter_affine.c
index a3053e1..465e412 100644
--- a/src/modules/plus/filter_affine.c
+++ b/src/modules/plus/filter_affine.c
@@ -35,7 +35,7 @@ static int filter_get_image( mlt_frame this, uint8_t **image, mlt_image_format *
 	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 );
@@ -63,16 +63,18 @@ 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_position position = mlt_properties_get_position( MLT_FRAME_PROPERTIES( this ), name );
+			mlt_properties frame_properties = MLT_FRAME_PROPERTIES( this );
+			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_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 );
+			mlt_properties_set_double( MLT_FRAME_PROPERTIES( a_frame ), "consumer_aspect_ratio", 
 									   mlt_properties_get_double( frame_properties, "consumer_aspect_ratio" ) );
 			mlt_transition_process( transition, a_frame, this );
 			mlt_frame_get_image( a_frame, image, format, width, height, writable );
@@ -90,13 +92,13 @@ 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 );
+	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 );
@@ -114,8 +116,8 @@ mlt_filter filter_affine_init( char *arg )
 	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;
 }