X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_tractor.c;h=18cae0cc6c22db1753d71ed8678f03b7fdac706b;hb=091e9065c24ede24d42c2a473a9c6f1e6d837f47;hp=16c7c50ffbffb599d8a67d92c7c62444177c60c5;hpb=f9c7e4e64fe57451a17ef25a727c8d3387ee1737;p=melted diff --git a/src/framework/mlt_tractor.c b/src/framework/mlt_tractor.c index 16c7c50..18cae0c 100644 --- 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 #include @@ -41,11 +42,9 @@ 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. - - TODO: thread this service... */ mlt_tractor mlt_tractor_init( ) @@ -61,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", "" ); + 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 { @@ -85,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. @@ -96,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. */ @@ -110,6 +185,22 @@ 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 ) { mlt_properties properties = mlt_frame_properties( this ); @@ -119,7 +210,7 @@ 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_inherit( properties, mlt_frame_properties( frame ) ); + mlt_properties_set_double( properties, "aspect_ratio", mlt_frame_get_aspect_ratio( frame ) ); return 0; } @@ -127,6 +218,7 @@ 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 ); @@ -199,9 +291,9 @@ static int producer_get_frame( mlt_producer parent, mlt_frame_ptr frame, int tra mlt_properties_set_data( frame_properties, label, temp, 0, ( mlt_destructor )mlt_frame_close, NULL ); // Pick up first video and audio frames - if ( audio == NULL && !mlt_frame_is_test_audio( temp ) ) + if ( !done && !mlt_frame_is_test_audio( temp ) && !( mlt_properties_get_int( mlt_frame_properties( temp ), "hide" ) & 2 ) ) audio = temp; - if ( video == NULL && !mlt_frame_is_test_card( temp ) ) + if ( !done && !mlt_frame_is_test_card( temp ) && !( mlt_properties_get_int( mlt_frame_properties( temp ), "hide" ) & 1 ) ) video = temp; } @@ -220,6 +312,8 @@ static int producer_get_frame( mlt_producer parent, mlt_frame_ptr frame, int tra mlt_properties_inherit( mlt_frame_properties( *frame ), mlt_frame_properties( video ) ); } + mlt_properties_set_int( mlt_frame_properties( *frame ), "test_audio", audio == NULL ); + mlt_properties_set_int( mlt_frame_properties( *frame ), "test_image", video == NULL ); } else if ( producer != NULL ) { @@ -252,16 +346,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 ); + } }