X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_tractor.c;h=cfbbc0e6bf16a78a8edf7efdb8f0e9fb7a27d021;hb=9936fc1daf6f3e7eae88c6131474e2bee0c385f4;hp=ffc47797c1c9404cc88316dfbd3caaad88987a41;hpb=cab7cd53c3a4d9c4355751088fec61860dcabbce;p=melted

diff --git a/src/framework/mlt_tractor.c b/src/framework/mlt_tractor.c
index ffc4779..cfbbc0e 100644
--- a/src/framework/mlt_tractor.c
+++ b/src/framework/mlt_tractor.c
@@ -28,6 +28,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <ctype.h>
 
 /** Forward references to static methods.
 */
@@ -209,6 +210,7 @@ static int producer_get_image( mlt_frame this, uint8_t **buffer, mlt_image_forma
 	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( 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_frame_get_image( frame, buffer, format, width, height, writable );
@@ -251,6 +253,8 @@ static void destroy_data_queue( void *arg )
 }
 
 /** Get the next frame.
+
+	TODO: This function needs to be redesigned...
 */
 
 static int producer_get_frame( mlt_producer parent, mlt_frame_ptr frame, int track )
@@ -322,6 +326,53 @@ static int producer_get_frame( mlt_producer parent, mlt_frame_ptr frame, int tra
 				// Check for last track
 				done = mlt_properties_get_int( temp_properties, "last_track" );
 
+				// Handle fx only tracks
+				if ( mlt_properties_get_int( temp_properties, "meta.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
+					{
+						mlt_frame_push_service( *frame, temp );
+						mlt_frame_push_service( *frame, producer_get_image );
+						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
+					{
+						mlt_frame_push_audio( *frame, temp );
+						mlt_frame_push_audio( *frame, producer_get_audio );
+						mlt_properties_set_int( frame_properties, "meta.fx_cut", 1 );
+					}
+
+					// Ensure everything is hidden
+					mlt_properties_set_int( temp_properties, "hide", 3 );
+				}
+
 				// We store all frames with a destructor on the output frame
 				sprintf( label, "_%s_%d", id, count ++ );
 				mlt_properties_set_data( frame_properties, label, temp, 0, ( mlt_destructor )mlt_frame_close, NULL );
@@ -332,7 +383,7 @@ static int producer_get_frame( mlt_producer parent, mlt_frame_ptr frame, int tra
 					// Move the contents of this queue on to the output frames data queue
 					mlt_deque sub_queue = mlt_properties_get_data( MLT_FRAME_PROPERTIES( temp ), "data_queue", NULL );
 					mlt_deque temp = mlt_deque_init( );
-					while ( mlt_deque_count( sub_queue ) )
+					while ( global_feed && mlt_deque_count( sub_queue ) )
 					{
 						mlt_properties p = mlt_deque_pop_back( sub_queue );
 						if ( mlt_properties_get_int( p, "final" ) )
@@ -358,9 +409,24 @@ static int producer_get_frame( mlt_producer parent, mlt_frame_ptr frame, int tra
 
 				// Pick up first video and audio frames
 				if ( !done && !mlt_frame_is_test_audio( temp ) && !( mlt_properties_get_int( temp_properties, "hide" ) & 2 ) )
+				{
+					// Order of frame creation is starting to get problematic
+					if ( audio != NULL )
+					{
+						mlt_deque_push_front( MLT_FRAME_AUDIO_STACK( temp ), producer_get_audio );
+						mlt_deque_push_front( MLT_FRAME_AUDIO_STACK( temp ), audio );
+					}
 					audio = temp;
+				}
 				if ( !done && !mlt_frame_is_test_card( temp ) && !( mlt_properties_get_int( temp_properties, "hide" ) & 1 ) )
+				{
+					if ( video != NULL )
+					{
+						mlt_deque_push_front( MLT_FRAME_IMAGE_STACK( temp ), producer_get_image );
+						mlt_deque_push_front( MLT_FRAME_IMAGE_STACK( temp ), video );
+					}
 					video = temp;
+				}
 			}
 	
 			// Now stack callbacks