X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fmotion_est%2Ffilter_autotrack_rectangle.c;h=0d526e4547bb3a266a2502edfaa40ba1fac80fa4;hb=7ecd47eeebf87332a4892d167baff959f0f6a11a;hp=60d86605e42ca9d10c47a4c6403f0d1abc1c2d5c;hpb=bd2707bb370eda9cae39e22b5e89b9096474cd7d;p=melted

diff --git a/src/modules/motion_est/filter_autotrack_rectangle.c b/src/modules/motion_est/filter_autotrack_rectangle.c
index 60d8660..0d526e4 100644
--- a/src/modules/motion_est/filter_autotrack_rectangle.c
+++ b/src/modules/motion_est/filter_autotrack_rectangle.c
@@ -129,7 +129,7 @@ static int filter_get_image( mlt_frame frame, uint8_t **image, mlt_image_format
 		mlt_properties_debug( frame_properties, "error after mlt_frame_get_image() in autotrack_rectangle", stderr );
 
 	// Get the geometry object
-	mlt_geometry geometry = mlt_properties_get_data(filter_properties, "geometry", NULL);
+	mlt_geometry geometry = mlt_properties_get_data(filter_properties, "filter_geometry", NULL);
 
 	// Get the current geometry item
 	struct mlt_geometry_item_s boundry;
@@ -204,9 +204,25 @@ static int attach_boundry_to_frame( mlt_frame frame, uint8_t **image, mlt_image_
 
 	// Get the frame position
 	mlt_position position = mlt_frame_get_position( frame );
-
+	
 	// Get the geometry object
-	mlt_geometry geometry = mlt_properties_get_data(filter_properties, "geometry", NULL);
+	mlt_geometry geometry = mlt_properties_get_data(filter_properties, "filter_geometry", NULL);
+	if (geometry == NULL) {
+		mlt_geometry geom = mlt_geometry_init();
+		char *arg = mlt_properties_get(filter_properties, "geometry");
+
+		// Initialize with the supplied geometry
+		struct mlt_geometry_item_s item;
+		mlt_geometry_parse_item( geom, &item, arg  );
+
+		item.frame = 0;
+		item.key = 1;
+		item.mix = 100;
+
+		mlt_geometry_insert( geom, &item );
+		mlt_properties_set_data( filter_properties, "filter_geometry", geom, 0, (mlt_destructor)mlt_geometry_close, (mlt_serialiser)mlt_geometry_serialise );
+		geometry = mlt_properties_get_data(filter_properties, "filter_geometry", NULL);
+	}
 
 	// Get the current geometry item
 	mlt_geometry_item geometry_item = mlt_pool_alloc( sizeof( struct mlt_geometry_item_s ) );
@@ -252,7 +268,8 @@ static mlt_frame filter_process( mlt_filter this, mlt_frame frame )
 		mlt_filter vismv = mlt_properties_get_data( MLT_FILTER_PROPERTIES(this), "_vismv", NULL );
 		if( vismv == NULL )
 		{
-			vismv = mlt_factory_filter( "vismv", NULL );
+			mlt_profile profile = mlt_service_profile( MLT_FILTER_SERVICE( this ) );
+			vismv = mlt_factory_filter( profile, "vismv", NULL );
 			mlt_properties_set_data( MLT_FILTER_PROPERTIES(this), "_vismv", vismv, 0, (mlt_destructor)mlt_filter_close, NULL );
 		}
 
@@ -264,7 +281,8 @@ static mlt_frame filter_process( mlt_filter this, mlt_frame frame )
 		mlt_filter obscure = mlt_properties_get_data( MLT_FILTER_PROPERTIES(this), "_obscure", NULL );
 		if( obscure == NULL )
 		{
-			obscure = mlt_factory_filter( "obscure", NULL );
+			mlt_profile profile = mlt_service_profile( MLT_FILTER_SERVICE( this ) );
+			obscure = mlt_factory_filter( profile, "obscure", NULL );
 			mlt_properties_set_data( MLT_FILTER_PROPERTIES(this), "_obscure", obscure, 0, (mlt_destructor)mlt_filter_close, NULL );
 		}
 
@@ -278,36 +296,21 @@ static mlt_frame filter_process( mlt_filter this, mlt_frame frame )
 */
 
 
-mlt_filter filter_autotrack_rectangle_init( char *arg )
+mlt_filter filter_autotrack_rectangle_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg )
 {
 	mlt_filter this = mlt_filter_new( );
 	if ( this != NULL )
 	{
 		this->process = filter_process;
 
-
-		mlt_geometry geometry = mlt_geometry_init();
-
-		// Initialize with the supplied geometry
-		if( arg != NULL ) {
-
-			struct mlt_geometry_item_s item;
-
-			mlt_geometry_parse_item( geometry, &item, arg  );
-
-			item.frame = 0;
-			item.key = 1;
-			item.mix = 100;
-
-			mlt_geometry_insert( geometry, &item );
-
-		}
-
-		// ... and attach it to the filter
-		mlt_properties_set_data( MLT_FILTER_PROPERTIES(this), "geometry", geometry, 0, (mlt_destructor)mlt_geometry_close, (mlt_serialiser)mlt_geometry_serialise );
+		// Initialize with the supplied geometry if ther is one
+		if( arg != NULL ) 
+			mlt_properties_set( MLT_FILTER_PROPERTIES( this ), "geometry", arg );
+		else
+			mlt_properties_set( MLT_FILTER_PROPERTIES( this ), "geometry", "100,100:100x100" );
 
 		// create an instance of the motion_est and obscure filter
-		mlt_filter motion_est = mlt_factory_filter( "motion_est", NULL );
+		mlt_filter motion_est = mlt_factory_filter( profile, "motion_est", NULL );
 		if( motion_est != NULL )
 			mlt_properties_set_data( MLT_FILTER_PROPERTIES(this), "_motion_est", motion_est, 0, (mlt_destructor)mlt_filter_close, NULL );
 		else {