X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_tractor.c;h=16c7c50ffbffb599d8a67d92c7c62444177c60c5;hb=f9c7e4e64fe57451a17ef25a727c8d3387ee1737;hp=8d6247d40d1ca2c76ee1f33586bb0c104d3444a2;hpb=6336039a203c6496691784682f9ad56eb13abcc3;p=melted diff --git a/src/framework/mlt_tractor.c b/src/framework/mlt_tractor.c index 8d6247d..16c7c50 100644 --- a/src/framework/mlt_tractor.c +++ b/src/framework/mlt_tractor.c @@ -26,6 +26,7 @@ #include #include +#include /** 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", "" ); + 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 { @@ -103,9 +110,31 @@ int mlt_tractor_connect( mlt_tractor this, mlt_service producer ) return ret; } -/** Get the next frame. +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 ); + mlt_frame frame = mlt_frame_pop_service( this ); + mlt_properties_inherit( mlt_frame_properties( frame ), properties ); + 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_inherit( properties, mlt_frame_properties( frame ) ); + return 0; +} + +static int producer_get_audio( mlt_frame this, int16_t **buffer, mlt_audio_format *format, int *frequency, int *channels, int *samples ) +{ + mlt_properties properties = mlt_frame_properties( this ); + mlt_frame frame = mlt_frame_pop_audio( this ); + 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 ); + mlt_properties_set_int( properties, "channels", *channels ); + return 0; +} - TODO: This should be reading a pump being populated by the thread... +/** Get the next frame. */ static int producer_get_frame( mlt_producer parent, mlt_frame_ptr frame, int track ) @@ -116,9 +145,9 @@ static int producer_get_frame( mlt_producer parent, mlt_frame_ptr frame, int tra if ( track == 0 && this->producer != NULL ) { int i = 0; - int looking = 1; int done = 0; mlt_frame temp = NULL; + int count = 0; // Get the properties of the parent producer mlt_properties properties = mlt_producer_properties( parent ); @@ -126,51 +155,82 @@ 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 ) { + // Used to garbage collect all frames + char label[ 30 ]; + + // Get the id of the tractor + char *id = mlt_properties_get( properties, "_unique_id" ); + + // Will be used to store the frame properties object + mlt_properties frame_properties = NULL; + + // We'll store audio and video frames to use here + mlt_frame audio = NULL; + mlt_frame video = NULL; + + // Get the multitrack's producer 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 ); + // We will create one frame and attach everything to it + *frame = mlt_frame_init( ); - // Check for last track - done = mlt_properties_get_int( mlt_frame_properties( temp ), "last_track" ); + // Get the properties of the frame + frame_properties = mlt_frame_properties( *frame ); - // 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; - } - 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" ) ) - { - *frame = temp; - looking = 0; + // 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" ); + + // 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 ); + + // Pick up first video and audio frames + if ( audio == NULL && !mlt_frame_is_test_audio( temp ) ) + audio = temp; + if ( video == NULL && !mlt_frame_is_test_card( temp ) ) + video = temp; } - else if ( ( !mlt_frame_is_test_card( temp ) || !mlt_frame_is_test_audio( temp ) ) && looking ) + + // Now stack callbacks + if ( audio != NULL ) { - // This is the one we want and we can stop looking - *frame = temp; - looking = 0; + mlt_frame_push_audio( *frame, audio ); + ( *frame )->get_audio = producer_get_audio; + mlt_properties_inherit( mlt_frame_properties( *frame ), mlt_frame_properties( audio ) ); } - else + + if ( video != NULL ) { - // We discard all other frames - mlt_frame_close( temp ); + 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 ) ); } + + } + 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 @@ -192,7 +252,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 ); +} +