]> git.sesse.net Git - mlt/blobdiff - src/framework/mlt_tractor.c
Attempt at an aspect ratio clean up
[mlt] / src / framework / mlt_tractor.c
index 91438680064e1d3147851decbb625ca7516bdd66..6ad86fcd7145ad6729237978cf0c7de4f1ecf518 100644 (file)
@@ -23,6 +23,7 @@
 #include "mlt_tractor.h"
 #include "mlt_frame.h"
 #include "mlt_multitrack.h"
+#include "mlt_field.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -41,7 +42,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 );
+static void mlt_tractor_listener( mlt_multitrack tracks, mlt_tractor this );
 
 /** Constructor for the tractor.
 */
@@ -59,7 +60,44 @@ mlt_tractor mlt_tractor_init( )
                        mlt_properties_set( mlt_producer_properties( producer ), "mlt_service", "tractor" );
 
                        producer->get_frame = producer_get_frame;
-                       producer->close = producer_close;
+                       producer->close = ( mlt_destructor )mlt_tractor_close;
+                       producer->close_object = this;
+               }
+               else
+               {
+                       free( this );
+                       this = NULL;
+               }
+       }
+       return this;
+}
+
+mlt_tractor mlt_tractor_new( )
+{
+       mlt_tractor this = calloc( sizeof( struct mlt_tractor_s ), 1 );
+       if ( this != NULL )
+       {
+               mlt_producer producer = &this->parent;
+               if ( mlt_producer_init( producer, this ) == 0 )
+               {
+                       mlt_multitrack multitrack = mlt_multitrack_init( );
+                       mlt_field field = mlt_field_new( multitrack, this );
+                       mlt_properties props = mlt_producer_properties( producer );
+
+                       mlt_properties_set( props, "resource", "<tractor>" );
+                       mlt_properties_set( props, "mlt_type", "mlt_producer" );
+                       mlt_properties_set( props, "mlt_service", "tractor" );
+                       mlt_properties_set_position( props, "in", 0 );
+                       mlt_properties_set_position( props, "out", 0 );
+                       mlt_properties_set_position( props, "length", 0 );
+                       mlt_properties_set_data( props, "multitrack", multitrack, 0, ( mlt_destructor )mlt_multitrack_close, NULL );
+                       mlt_properties_set_data( props, "field", field, 0, ( mlt_destructor )mlt_field_close, NULL );
+
+                       mlt_events_listen( mlt_multitrack_properties( multitrack ), this, "producer-changed", ( mlt_listener )mlt_tractor_listener );
+
+                       producer->get_frame = producer_get_frame;
+                       producer->close = ( mlt_destructor )mlt_tractor_close;
+                       producer->close_object = this;
                }
                else
                {
@@ -94,6 +132,45 @@ mlt_properties mlt_tractor_properties( mlt_tractor this )
        return mlt_producer_properties( &this->parent );
 }
 
+/** Get the field this tractor is harvesting.
+*/
+
+mlt_field mlt_tractor_field( mlt_tractor this )
+{
+       return mlt_properties_get_data( mlt_tractor_properties( this ), "field", NULL );
+}
+
+/** Get the multitrack this tractor is pulling.
+*/
+
+mlt_multitrack mlt_tractor_multitrack( mlt_tractor this )
+{
+       return mlt_properties_get_data( mlt_tractor_properties( this ), "multitrack", NULL );
+}
+
+/** Ensure the tractors in/out points match the multitrack.
+*/
+
+void mlt_tractor_refresh( mlt_tractor this )
+{
+       mlt_multitrack multitrack = mlt_tractor_multitrack( this );
+       mlt_properties properties = mlt_multitrack_properties( multitrack );
+       mlt_properties self = mlt_tractor_properties( this );
+       mlt_events_block( properties, self );
+       mlt_events_block( self, self );
+       mlt_multitrack_refresh( multitrack );
+       mlt_properties_set_position( self, "in", 0 );
+       mlt_properties_set_position( self, "out", mlt_properties_get_position( properties, "out" ) );
+       mlt_events_unblock( self, self );
+       mlt_events_unblock( properties, self );
+       mlt_properties_set_position( self, "length", mlt_properties_get_position( properties, "length" ) );
+}
+
+static void mlt_tractor_listener( mlt_multitrack tracks, mlt_tractor this )
+{
+       mlt_tractor_refresh( this );
+}
+
 /** Connect the tractor.
 */
 
@@ -108,15 +185,47 @@ int mlt_tractor_connect( mlt_tractor this, mlt_service producer )
        return ret;
 }
 
+/** Set the producer for a specific track.
+*/
+
+int mlt_tractor_set_track( mlt_tractor this, mlt_producer producer, int index )
+{
+       return mlt_multitrack_connect( mlt_tractor_multitrack( this ), producer, index );
+}
+
+/** Get the producer for a specific track.
+*/
+
+mlt_producer mlt_tractor_get_track( mlt_tractor this, int index )
+{
+       return mlt_multitrack_track( mlt_tractor_multitrack( this ), index );
+}
+
 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" ) );
+       if ( mlt_properties_get( properties, "distort" ) )
+               mlt_properties_set( frame_properties, "distort", mlt_properties_get( 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" ) );
+       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 );
        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 ) );
+       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" ) );
+       data = mlt_frame_get_alpha_mask( frame );
+       mlt_properties_set_data( properties, "alpha", data, 0, NULL, NULL );
        return 0;
 }
 
@@ -124,7 +233,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 );
@@ -172,6 +280,12 @@ 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;
+
+                       // Temporary properties
+                       mlt_properties temp_properties = NULL;
+
                        // Get the multitrack's producer
                        mlt_producer target = mlt_multitrack_producer( multitrack );
                        mlt_producer_seek( target, mlt_producer_frame( parent ) );
@@ -189,17 +303,24 @@ static int producer_get_frame( mlt_producer parent, mlt_frame_ptr frame, int tra
                                // Get a frame from the producer
                                mlt_service_get_frame( this->producer, &temp, i );
 
+                               // Get the temporary properties
+                               temp_properties = mlt_frame_properties( temp );
+
                                // Check for last track
-                               done = mlt_properties_get_int( mlt_frame_properties( temp ), "last_track" );
+                               done = mlt_properties_get_int( temp_properties, "last_track" );
 
                                // 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 );
 
+                               // We want the last data_queue 
+                               if ( !done && mlt_properties_get_data( temp_properties, "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 ) )
+                               if ( !done && !mlt_frame_is_test_audio( temp ) && !( mlt_properties_get_int( temp_properties, "hide" ) & 2 ) )
                                        audio = temp;
-                               if ( !done && !mlt_frame_is_test_card( temp ) && !( mlt_properties_get_int( mlt_frame_properties( temp ), "hide" ) & 1 ) )
+                               if ( !done && !mlt_frame_is_test_card( temp ) && !( mlt_properties_get_int( temp_properties, "hide" ) & 1 ) )
                                        video = temp;
                        }
        
@@ -208,16 +329,23 @@ 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_int( frame_properties, "real_width", mlt_properties_get_int( video_properties, "real_width" ) );
+                               mlt_properties_set_int( frame_properties, "real_height", mlt_properties_get_int( video_properties, "real_height" ) );
+                               mlt_properties_set_int( frame_properties, "progressive", mlt_properties_get_int( video_properties, "progressive" ) );
+                               mlt_properties_set_double( frame_properties, "aspect_ratio", mlt_properties_get_double( video_properties, "aspect_ratio" ) );
                        }
 
+                       mlt_frame_set_position( *frame, mlt_producer_frame( parent ) );
                        mlt_properties_set_int( mlt_frame_properties( *frame ), "test_audio", audio == NULL );
                        mlt_properties_set_int( mlt_frame_properties( *frame ), "test_image", video == NULL );
                }
@@ -252,16 +380,11 @@ 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 );
+       if ( this != NULL && mlt_properties_dec_ref( mlt_tractor_properties( this ) ) <= 0 )
+       {
+               this->parent.close = NULL;
+               mlt_producer_close( &this->parent );
+               free( this );
+       }
 }