Multitrack rearrangement and tractor cleanup

[melted] / src / framework / mlt_tractor.c

diff --git a/src/framework/mlt_tractor.c b/src/framework/mlt_tractor.c
index 769a26c..b5ee3a9 100644 (file)
--- a/src/framework/mlt_tractor.c
+++ b/src/framework/mlt_tractor.c
@@ -201,15 +201,32 @@ 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 );
+       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_double( frame_properties, "aspect_ratio", mlt_properties_get_double( properties, "aspect_ratio" ) );
+       mlt_properties_set_double( frame_properties, "consumer_aspect_ratio", mlt_properties_get_double( properties, "consumer_aspect_ratio" ) );
+       mlt_properties_set_int( frame_properties, "consumer_progressive", mlt_properties_get_double( properties, "consumer_progressive" ) );
+       mlt_properties_set_int( frame_properties, "consumer_deinterlace", mlt_properties_get_double( properties, "consumer_deinterlace" ) );
        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_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;
 }
 
@@ -217,7 +234,6 @@ static int producer_get_audio( mlt_frame this, int16_t **buffer, mlt_audio_forma
 {
        mlt_properties properties = mlt_frame_properties( this );
        mlt_frame frame = mlt_frame_pop_audio( this );
-       mlt_properties_inherit( mlt_frame_properties( frame ), properties );
        mlt_frame_get_audio( frame, buffer, format, frequency, channels, samples );
        mlt_properties_set_data( properties, "audio", *buffer, 0, NULL, NULL );
        mlt_properties_set_int( properties, "frequency", *frequency );
@@ -265,6 +281,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 +308,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;
@@ -301,14 +324,17 @@ static int producer_get_frame( mlt_producer parent, mlt_frame_ptr frame, int tra
                        {
                                mlt_frame_push_audio( *frame, audio );
                                ( *frame )->get_audio = producer_get_audio;
-                               mlt_properties_inherit( mlt_frame_properties( *frame ), mlt_frame_properties( audio ) );
                        }
 
                        if ( video != NULL )
                        {
+                               mlt_properties video_properties = mlt_frame_properties( video );
                                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 ) );
+                               mlt_properties_set_data( frame_properties, "data_queue", data_queue, 0, NULL, NULL );
+                               mlt_properties_set_int( frame_properties, "width", mlt_properties_get_int( video_properties, "width" ) );
+                               mlt_properties_set_int( frame_properties, "height", mlt_properties_get_int( video_properties, "height" ) );
+                               mlt_properties_set_double( frame_properties, "aspect_ratio", mlt_properties_get_double( video_properties, "aspect_ratio" ) );
                        }
 
                        mlt_properties_set_int( mlt_frame_properties( *frame ), "test_audio", audio == NULL );