X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_tractor.c;h=5f9c5f7d75fb1da042d83aa0ff8f3fc8f7bbd12f;hb=8de8411c3af4b5746e9040a67e928364be9ac058;hp=5e0caca72ebf9dcbe575ac6a288199b85a79ad9d;hpb=ec7f7d58e000242e918c2ae2cebd172bffe6e9d4;p=melted diff --git a/src/framework/mlt_tractor.c b/src/framework/mlt_tractor.c index 5e0caca..5f9c5f7 100644 --- a/src/framework/mlt_tractor.c +++ b/src/framework/mlt_tractor.c @@ -44,8 +44,6 @@ 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. - - TODO: thread this service... */ mlt_tractor mlt_tractor_init( ) @@ -110,9 +108,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 ); + return 0; +} - TODO: This should be reading a pump being populated by the thread... +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_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 ); + mlt_properties_set_int( properties, "channels", *channels ); + return 0; +} + +/** Get the next frame. */ static int producer_get_frame( mlt_producer parent, mlt_frame_ptr frame, int track ) @@ -123,10 +143,8 @@ 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; - mlt_frame store[ 10 ]; int count = 0; // Get the properties of the parent producer @@ -135,55 +153,84 @@ 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 ) ); - } - 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; + // 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 ( !done && !mlt_frame_is_test_audio( temp ) && !( mlt_properties_get_int( mlt_frame_properties( temp ), "hide" ) & 2 ) ) + audio = temp; + if ( !done && !mlt_frame_is_test_card( temp ) && !( mlt_properties_get_int( mlt_frame_properties( temp ), "hide" ) & 1 ) ) + video = 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 ) ) + + // Now stack callbacks + if ( audio != NULL ) { - *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 store all other frames for now - store[ count ++ ] = 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 ) ); } - } - // Now place all the unused frames on to the properties (will be destroyed automatically) - while ( count -- ) + 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 ) { - 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 ); + 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 @@ -213,7 +260,7 @@ void mlt_tractor_close( mlt_tractor this ) /** Close the producer. */ -void producer_close( mlt_producer this ) +static void producer_close( mlt_producer this ) { mlt_tractor_close( this->child ); }