X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_tractor.c;h=094352e32678ccb70ef7959dbabaec3f91dcc304;hb=c974f8e87e0bd3de851fb638660f502092b1425e;hp=b319a048bce89593214407d8e6ce834f72c9ae19;hpb=e6c03148e1dc3b0e363c9f304b3ed93fbc1a91a9;p=melted

diff --git a/src/framework/mlt_tractor.c b/src/framework/mlt_tractor.c
index b319a04..094352e 100644
--- a/src/framework/mlt_tractor.c
+++ b/src/framework/mlt_tractor.c
@@ -204,19 +204,18 @@ static int producer_get_image( mlt_frame this, uint8_t **buffer, mlt_image_forma
 	mlt_properties properties = MLT_FRAME_PROPERTIES( this );
 	mlt_frame frame = mlt_frame_pop_service( this );
 	mlt_properties frame_properties = MLT_FRAME_PROPERTIES( frame );
-	mlt_properties_set_int( frame_properties, "width", mlt_properties_get_int( properties, "width" ) );
-	mlt_properties_set_int( frame_properties, "height", mlt_properties_get_int( properties, "height" ) );
 	mlt_properties_set( frame_properties, "rescale.interp", mlt_properties_get( properties, "rescale.interp" ) );
 	mlt_properties_set_int( frame_properties, "distort", mlt_properties_get_int( properties, "distort" ) );
 	mlt_properties_set_double( frame_properties, "consumer_aspect_ratio", mlt_properties_get_double( properties, "consumer_aspect_ratio" ) );
-	mlt_properties_set_int( frame_properties, "consumer_deinterlace", mlt_properties_get_double( properties, "consumer_deinterlace" ) );
+	mlt_properties_set_int( frame_properties, "consumer_deinterlace", mlt_properties_get_int( properties, "consumer_deinterlace" ) );
 	mlt_properties_set( frame_properties, "deinterlace_method", mlt_properties_get( properties, "deinterlace_method" ) );
-	mlt_properties_set_int( frame_properties, "normalised_width", mlt_properties_get_double( properties, "normalised_width" ) );
-	mlt_properties_set_int( frame_properties, "normalised_height", mlt_properties_get_double( properties, "normalised_height" ) );
+	mlt_properties_set_int( frame_properties, "normalised_width", mlt_properties_get_int( properties, "normalised_width" ) );
+	mlt_properties_set_int( frame_properties, "normalised_height", mlt_properties_get_int( properties, "normalised_height" ) );
 	mlt_frame_get_image( frame, buffer, format, width, height, writable );
 	mlt_properties_set_data( properties, "image", *buffer, *width * *height * 2, NULL, NULL );
 	mlt_properties_set_int( properties, "width", *width );
 	mlt_properties_set_int( properties, "height", *height );
+	mlt_properties_set_int( properties, "format", *format );
 	mlt_properties_set_double( properties, "aspect_ratio", mlt_frame_get_aspect_ratio( frame ) );
 	mlt_properties_set_int( properties, "progressive", mlt_properties_get_int( frame_properties, "progressive" ) );
 	mlt_properties_set_int( properties, "distort", mlt_properties_get_int( frame_properties, "distort" ) );
@@ -268,6 +267,7 @@ static int producer_get_frame( mlt_producer parent, mlt_frame_ptr frame, int tra
 		int done = 0;
 		mlt_frame temp = NULL;
 		int count = 0;
+		int image_count = 0;
 
 		// Get the properties of the parent producer
 		mlt_properties properties = MLT_PRODUCER_PROPERTIES( parent );
@@ -299,6 +299,7 @@ static int producer_get_frame( mlt_producer parent, mlt_frame_ptr frame, int tra
 			// We'll store audio and video frames to use here
 			mlt_frame audio = NULL;
 			mlt_frame video = NULL;
+			mlt_frame first_video = NULL;
 
 			// Temporary properties
 			mlt_properties temp_properties = NULL;
@@ -327,52 +328,10 @@ static int producer_get_frame( mlt_producer parent, mlt_frame_ptr frame, int tra
 				done = mlt_properties_get_int( temp_properties, "last_track" );
 
 				// Handle fx only tracks
-				if ( mlt_properties_get_int( temp_properties, "meta.fx_cut" ) )
+				if ( mlt_properties_get_int( temp_properties, "fx_cut" ) )
 				{
-					mlt_properties copy = video == NULL ? frame_properties : MLT_FRAME_PROPERTIES( video );
-					int i = 0;
-
-					for ( i = 0; i < mlt_properties_count( temp_properties ); i ++ )
-					{
-						char *name = mlt_properties_get_name( temp_properties, i );
-						char *value = mlt_properties_get_value( temp_properties, i );
-						// For animated filters
-						if ( isdigit( name[ 0 ] ) && value != NULL )
-							mlt_properties_set( copy, name, value );
-					}
-
-					if ( video )
-					{
-						// Take all but the first placeholding producer and dump on to the image stack
-						void *p = mlt_deque_pop_front( MLT_FRAME_IMAGE_STACK( temp ) );
-						while ( ( p = mlt_deque_pop_front( MLT_FRAME_IMAGE_STACK( temp ) ) ) != NULL )
-							mlt_deque_push_back( MLT_FRAME_IMAGE_STACK( video ), p );
-					}
-					else
-					{
-						void *p = NULL;
-						while ( ( p = mlt_deque_pop_front( MLT_FRAME_IMAGE_STACK( temp ) ) ) != NULL )
-							mlt_deque_push_back( MLT_FRAME_IMAGE_STACK( *frame ), p );
-						mlt_properties_set_int( frame_properties, "meta.fx_cut", 1 );
-					}
-
-					if ( audio )
-					{
-						// Take all but the first placeholding producer and dump on to the audio stack
-						void *p = mlt_deque_pop_front( MLT_FRAME_AUDIO_STACK( temp ) );
-						while ( ( p = mlt_deque_pop_front( MLT_FRAME_AUDIO_STACK( temp ) ) ) != NULL )
-							mlt_deque_push_back( MLT_FRAME_AUDIO_STACK( audio ), p );
-					}
-					else
-					{
-						void *p = NULL;
-						while ( ( p = mlt_deque_pop_front( MLT_FRAME_AUDIO_STACK( temp ) ) ) != NULL )
-							mlt_deque_push_back( MLT_FRAME_AUDIO_STACK( *frame ), p );
-						mlt_properties_set_int( frame_properties, "meta.fx_cut", 1 );
-					}
-
-					// Ensure everything is hidden
-					mlt_properties_set_int( temp_properties, "hide", 3 );
+					int hide = ( video == NULL ? 1 : 0 ) | ( audio == NULL ? 2 : 0 );
+					mlt_properties_set_int( temp_properties, "hide", hide );
 				}
 
 				// We store all frames with a destructor on the output frame
@@ -428,6 +387,15 @@ static int producer_get_frame( mlt_producer parent, mlt_frame_ptr frame, int tra
 						mlt_deque_push_front( MLT_FRAME_IMAGE_STACK( temp ), video );
 					}
 					video = temp;
+					if ( first_video == NULL )
+						first_video = temp;
+
+					// Ensure that all frames know the aspect ratio of the background
+					mlt_properties_set_double( temp_properties, "output_ratio", 
+											   mlt_properties_get_double( MLT_FRAME_PROPERTIES( first_video ), "aspect_ratio" ) );
+
+					mlt_properties_set_int( MLT_FRAME_PROPERTIES( temp ), "image_count", ++ image_count );
+					image_count = 1;
 				}
 			}
 	
@@ -440,7 +408,7 @@ static int producer_get_frame( mlt_producer parent, mlt_frame_ptr frame, int tra
 
 			if ( video != NULL )
 			{
-				mlt_properties video_properties = MLT_FRAME_PROPERTIES( video );
+				mlt_properties video_properties = MLT_FRAME_PROPERTIES( first_video );
 				mlt_frame_push_service( *frame, video );
 				mlt_frame_push_service( *frame, producer_get_image );
 				if ( global_feed )
@@ -452,6 +420,7 @@ static int producer_get_frame( mlt_producer parent, mlt_frame_ptr frame, int tra
 				mlt_properties_set_int( frame_properties, "real_height", mlt_properties_get_int( video_properties, "real_height" ) );
 				mlt_properties_set_int( frame_properties, "progressive", mlt_properties_get_int( video_properties, "progressive" ) );
 				mlt_properties_set_double( frame_properties, "aspect_ratio", mlt_properties_get_double( video_properties, "aspect_ratio" ) );
+				mlt_properties_set_int( frame_properties, "image_count", image_count );
 			}
 			else
 			{