Alpha from the tractor fix

[melted] / src / framework / mlt_tractor.c

diff --git a/src/framework/mlt_tractor.c b/src/framework/mlt_tractor.c
index 5f9c5f7..45918d5 100644 (file)
--- a/src/framework/mlt_tractor.c
+++ b/src/framework/mlt_tractor.c
@@ -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
                {
@@ -83,7 +121,7 @@ mlt_service mlt_tractor_service( mlt_tractor this )
 
 mlt_producer mlt_tractor_producer( mlt_tractor this )
 {
-       return &this->parent;
+       return this != NULL ? &this->parent : NULL;
 }
 
 /** Get the properties object associated to the tractor.
@@ -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,8 +185,30 @@ 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 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 );
@@ -117,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;
 }
 
@@ -252,16 +355,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 );
+       }
 }