X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_tractor.c;h=861edff8b8fb0ceee2918026a0cc4f580dfe3723;hb=bc6274668d39c754532465f95c5c317718180251;hp=84940891981e688938a73eb87f986891b17e9fc5;hpb=f00476101550ec7d8e863f6516aa83bc1b524570;p=melted

diff --git a/src/framework/mlt_tractor.c b/src/framework/mlt_tractor.c
index 8494089..861edff 100644
--- a/src/framework/mlt_tractor.c
+++ b/src/framework/mlt_tractor.c
@@ -206,8 +206,7 @@ static int producer_get_image( mlt_frame this, uint8_t **buffer, mlt_image_forma
 	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" ) );
-	if ( mlt_properties_get( properties, "distort" ) )
-		mlt_properties_set( frame_properties, "distort", mlt_properties_get( properties, "distort" ) );
+	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, "normalised_width", mlt_properties_get_double( properties, "normalised_width" ) );
@@ -218,8 +217,7 @@ static int producer_get_image( mlt_frame this, uint8_t **buffer, mlt_image_forma
 	mlt_properties_set_int( properties, "height", *height );
 	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" ) );
-	if ( mlt_properties_get( frame_properties, "distort" ) )
-		mlt_properties_set( properties, "distort", mlt_properties_get( frame_properties, "distort" ) );
+	mlt_properties_set_int( properties, "distort", mlt_properties_get_int( frame_properties, "distort" ) );
 	data = mlt_frame_get_alpha_mask( frame );
 	mlt_properties_set_data( properties, "alpha", data, 0, NULL, NULL );
 	return 0;
@@ -309,10 +307,32 @@ static int producer_get_frame( mlt_producer parent, mlt_frame_ptr frame, int tra
 				sprintf( label, "_%s_%d", id, count ++ );
 				mlt_properties_set_data( frame_properties, label, temp, 0, ( mlt_destructor )mlt_frame_close, NULL );
 
-				// We want the last data_queue 
+				// We want the first data_queue, but after that, all queues are appended
 				if ( !done && mlt_properties_get_data( temp_properties, "data_queue", NULL ) != NULL && 
 				     mlt_deque_count( mlt_properties_get_data( temp_properties, "data_queue", NULL ) ) != 0 )
-					data_queue = mlt_properties_get_data( MLT_FRAME_PROPERTIES( temp ), "data_queue", NULL );
+				{
+					if ( data_queue == NULL )
+					{
+						data_queue = mlt_properties_get_data( MLT_FRAME_PROPERTIES( temp ), "data_queue", NULL );
+					}
+					else
+					{
+						// 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 ) )
+						{
+							mlt_properties p = mlt_deque_pop_back( sub_queue );
+							if ( mlt_properties_get_int( p, "frame_lock" ) == 0 )
+								mlt_deque_push_back( data_queue, p );
+							else
+								mlt_deque_push_back( temp, p );
+						}
+						while( mlt_deque_count( temp ) )
+							mlt_deque_push_front( sub_queue, mlt_deque_pop_back( temp ) );
+						mlt_deque_close( temp );
+					}
+				}
 
 				// Pick up first video and audio frames
 				if ( !done && !mlt_frame_is_test_audio( temp ) && !( mlt_properties_get_int( temp_properties, "hide" ) & 2 ) )