composite aspect ratio fix (again ;-)), added fill compositing test case, filter...

[melted] / src / framework / mlt_tractor.c

diff --git a/src/framework/mlt_tractor.c b/src/framework/mlt_tractor.c
index 8d6247d..2363448 100644 (file)
--- a/src/framework/mlt_tractor.c
+++ b/src/framework/mlt_tractor.c
@@ -26,6 +26,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 
 /** Private structure.
 */
@@ -40,6 +41,7 @@ struct mlt_tractor_s
 */
 
 static int producer_get_frame( mlt_producer this, mlt_frame_ptr frame, int track );
+static void producer_close( mlt_producer this );
 
 /** Constructor for the tractor.
 
@@ -54,7 +56,12 @@ mlt_tractor mlt_tractor_init( )
                mlt_producer producer = &this->parent;
                if ( mlt_producer_init( producer, this ) == 0 )
                {
+                       mlt_properties_set( mlt_producer_properties( producer ), "resource", "<tractor>" );
+                       mlt_properties_set( mlt_producer_properties( producer ), "mlt_type", "mlt_producer" );
+                       mlt_properties_set( mlt_producer_properties( producer ), "mlt_service", "tractor" );
+
                        producer->get_frame = producer_get_frame;
+                       producer->close = producer_close;
                }
                else
                {
@@ -119,6 +126,8 @@ static int producer_get_frame( mlt_producer parent, mlt_frame_ptr frame, int tra
                int looking = 1;
                int done = 0;
                mlt_frame temp = NULL;
+               mlt_frame store[ 10 ];
+               int count = 0;
 
                // Get the properties of the parent producer
                mlt_properties properties = mlt_producer_properties( parent );
@@ -126,52 +135,66 @@ static int producer_get_frame( mlt_producer parent, mlt_frame_ptr frame, int tra
                // Try to obtain the multitrack associated to the tractor
                mlt_multitrack multitrack = mlt_properties_get_data( properties, "multitrack", NULL );
 
+               // Or a specific producer
+               mlt_producer producer = mlt_properties_get_data( properties, "producer", NULL );
+
                // If we don't have one, we're in trouble... 
                if ( multitrack != NULL )
                {
                        mlt_producer target = mlt_multitrack_producer( multitrack );
                        mlt_producer_seek( target, mlt_producer_frame( parent ) );
                        mlt_producer_set_speed( target, mlt_producer_get_speed( parent ) );
-                       mlt_producer_set_in_and_out( parent, mlt_producer_get_in( target ), mlt_producer_get_out( target ) );
-               }
-               else
-               {
-                       fprintf( stderr, "tractor without a multitrack!!\n" );
-               }
 
-               // Loop through each of the tracks we're harvesting
-               for ( i = 0; !done; i ++ )
-               {
-                       // Get a frame from the producer
-                       mlt_service_get_frame( this->producer, &temp, i );
-
-                       // Check for last track
-                       done = mlt_properties_get_int( mlt_frame_properties( temp ), "last_track" );
-
-                       // Handle the frame
-                       if ( done && looking )
+                       // Loop through each of the tracks we're harvesting
+                       for ( i = 0; !done; i ++ )
                        {
-                               // Use this as output if we don't have one already
-                               *frame = temp;
+                               // Get a frame from the producer
+                               mlt_service_get_frame( this->producer, &temp, i );
+
+                               // Check for last track
+                               done = mlt_properties_get_int( mlt_frame_properties( temp ), "last_track" );
+
+                               // Handle the frame
+                               if ( done && looking )
+                               {
+                                       // Use this as output if we don't have one already
+                                       *frame = temp;
+                               }
+                               else if ( ( !mlt_frame_is_test_card( temp ) || !mlt_frame_is_test_audio( temp ) ) && looking &&
+                                               mlt_producer_frame( parent ) == mlt_frame_get_position( temp ) )
+                               {
+                                       *frame = temp;
+                                       looking = 0;
+                               }
+                               else
+                               {
+                                       // We store all other frames for now
+                                       store[ count ++ ] = temp;
+                               }
                        }
-                       else if ( ( !mlt_frame_is_test_card( temp ) || !mlt_frame_is_test_audio( temp ) ) && 
-                                           mlt_producer_frame( parent ) == mlt_properties_get_position( mlt_frame_properties( temp ), "position" ) )
+       
+                       // Now place all the unused frames on to the properties (will be destroyed automatically)
+                       while ( count -- )
                        {
-                               *frame = temp;
-                               looking = 0;
-                       }
-                       else if ( ( !mlt_frame_is_test_card( temp ) || !mlt_frame_is_test_audio( temp ) ) && looking )
-                       {
-                               // This is the one we want and we can stop looking
-                               *frame = temp;
-                               looking = 0;
-                       }
-                       else
-                       {
-                               // We discard all other frames
-                               mlt_frame_close( temp );
+                               mlt_properties frame_properties = mlt_frame_properties( *frame );
+                               char label[ 30 ];
+                               sprintf( label, "tractor_%d", count );
+                               while ( mlt_properties_get_data( frame_properties, label, NULL ) != NULL )
+                                       strcat( label, "+" );
+                               mlt_properties_set_data( frame_properties, label, store[ count ], 0, ( mlt_destructor )mlt_frame_close, NULL );
                        }
                }
+               else if ( producer != NULL )
+               {
+                       mlt_producer_seek( producer, mlt_producer_frame( parent ) );
+                       mlt_producer_set_speed( producer, mlt_producer_get_speed( parent ) );
+                       mlt_service_get_frame( this->producer, frame, track );
+               }
+               else
+               {
+                       fprintf( stderr, "tractor without a multitrack!!\n" );
+                       mlt_service_get_frame( this->producer, frame, track );
+               }
 
                // Prepare the next frame
                mlt_producer_prepare_next( parent );
@@ -192,7 +215,16 @@ static int producer_get_frame( mlt_producer parent, mlt_frame_ptr frame, int tra
 
 void mlt_tractor_close( mlt_tractor this )
 {
+       this->parent.close = NULL;
        mlt_producer_close( &this->parent );
        free( this );
 }
 
+/** Close the producer.
+*/
+
+static void producer_close( mlt_producer this )
+{
+       mlt_tractor_close( this->child );
+}
+