X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_tractor.c;h=83f82f9771507dc6a1a688f9b8f34fbab47315f0;hb=95f429b56026f5897ebad9060608b6631dcf7515;hp=769a26cc4144d958e1264d02e53900f46997c819;hpb=c8bbb9577660f70c8d72d48983b20168d1cb178d;p=melted

diff --git a/src/framework/mlt_tractor.c b/src/framework/mlt_tractor.c
index 769a26c..83f82f9 100644
--- a/src/framework/mlt_tractor.c
+++ b/src/framework/mlt_tractor.c
@@ -201,8 +201,14 @@ mlt_producer mlt_tractor_get_track( mlt_tractor this, int index )
 	return mlt_multitrack_track( mlt_tractor_multitrack( this ), index );
 }
 
+static uint8_t *mlt_tractor_alpha_mask( mlt_frame frame )
+{
+	return mlt_properties_get_data( mlt_frame_properties( frame ), "alpha", NULL );
+}
+
 static int producer_get_image( mlt_frame this, uint8_t **buffer, mlt_image_format *format, int *width, int *height, int writable )
 {
+	uint8_t *data = NULL;
 	mlt_properties properties = mlt_frame_properties( this );
 	mlt_frame frame = mlt_frame_pop_service( this );
 	mlt_properties_inherit( mlt_frame_properties( frame ), properties );
@@ -210,6 +216,10 @@ static int producer_get_image( mlt_frame this, uint8_t **buffer, mlt_image_forma
 	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_double( properties, "aspect_ratio", mlt_frame_get_aspect_ratio( frame ) );
+	data = mlt_frame_get_alpha_mask( frame );
+	mlt_properties_set_data( properties, "alpha", data, 0, NULL, NULL );
+	this->get_alpha_mask = mlt_tractor_alpha_mask;
 	return 0;
 }
 
@@ -265,6 +275,9 @@ static int producer_get_frame( mlt_producer parent, mlt_frame_ptr frame, int tra
 			mlt_frame audio = NULL;
 			mlt_frame video = NULL;
 
+			// Determine which data_queue to pass on...
+			void *data_queue = NULL;
+
 			// Get the multitrack's producer
 			mlt_producer target = mlt_multitrack_producer( multitrack );
 			mlt_producer_seek( target, mlt_producer_frame( parent ) );
@@ -289,6 +302,10 @@ 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 
+				if ( mlt_properties_get_data( mlt_frame_properties( temp ), "data_queue", NULL ) != NULL )
+					data_queue = mlt_properties_get_data( mlt_frame_properties( temp ), "data_queue", NULL );
+
 				// Pick up first video and audio frames
 				if ( !done && !mlt_frame_is_test_audio( temp ) && !( mlt_properties_get_int( mlt_frame_properties( temp ), "hide" ) & 2 ) )
 					audio = temp;
@@ -306,6 +323,7 @@ static int producer_get_frame( mlt_producer parent, mlt_frame_ptr frame, int tra
 
 			if ( video != NULL )
 			{
+				mlt_properties_set_data( mlt_frame_properties( *frame ), "data_queue", data_queue, 0, NULL, NULL );
 				mlt_frame_push_service( *frame, video );
 				mlt_frame_push_service( *frame, producer_get_image );
 				mlt_properties_inherit( mlt_frame_properties( *frame ), mlt_frame_properties( video ) );