X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_tractor.c;h=cfbbc0e6bf16a78a8edf7efdb8f0e9fb7a27d021;hb=9936fc1daf6f3e7eae88c6131474e2bee0c385f4;hp=979e39c9d59c574d1cc64e68edecb7a6c8eed1e0;hpb=5998e04fc78baf161cb12bd0e62254ed570b6b2b;p=melted diff --git a/src/framework/mlt_tractor.c b/src/framework/mlt_tractor.c index 979e39c..cfbbc0e 100644 --- a/src/framework/mlt_tractor.c +++ b/src/framework/mlt_tractor.c @@ -28,6 +28,7 @@ #include #include #include +#include /** Forward references to static methods. */ @@ -206,10 +207,10 @@ static int producer_get_image( mlt_frame this, uint8_t **buffer, mlt_image_forma 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_int( properties, "distort" ) ) - mlt_properties_set_int( frame_properties, "distort", mlt_properties_get_int( properties, "distort" ) ); + mlt_properties_set_int( frame_properties, "distort", mlt_properties_get_int( 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( frame_properties, "deinterlace_method", mlt_properties_get( properties, "deinterlace_method" ) ); 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 ); @@ -218,8 +219,7 @@ static int producer_get_image( mlt_frame this, uint8_t **buffer, mlt_image_forma 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_int( frame_properties, "distort" ) ) - mlt_properties_set_int( properties, "distort", mlt_properties_get_int( frame_properties, "distort" ) ); + mlt_properties_set_int( properties, "distort", mlt_properties_get_int( frame_properties, "distort" ) ); data = mlt_frame_get_alpha_mask( frame ); mlt_properties_set_data( properties, "alpha", data, 0, NULL, NULL ); return 0; @@ -236,7 +236,25 @@ static int producer_get_audio( mlt_frame this, int16_t **buffer, mlt_audio_forma return 0; } +static void destroy_data_queue( void *arg ) +{ + if ( arg != NULL ) + { + // Assign the correct type + mlt_deque queue = arg; + + // Iterate through each item and destroy them + while ( mlt_deque_peek_front( queue ) != NULL ) + mlt_properties_close( mlt_deque_pop_back( queue ) ); + + // Close the deque + mlt_deque_close( queue ); + } +} + /** Get the next frame. + + TODO: This function needs to be redesigned... */ static int producer_get_frame( mlt_producer parent, mlt_frame_ptr frame, int track ) @@ -260,6 +278,12 @@ static int producer_get_frame( mlt_producer parent, mlt_frame_ptr frame, int tra // Or a specific producer mlt_producer producer = mlt_properties_get_data( properties, "producer", NULL ); + // The output frame will hold the 'global' data feeds (ie: those which are targetted for the final frame) + mlt_deque data_queue = mlt_deque_init( ); + + // Determine whether this tractor feeds to the consumer or stops here + int global_feed = mlt_properties_get_int( properties, "global_feed" ); + // If we don't have one, we're in trouble... if ( multitrack != NULL ) { @@ -276,9 +300,6 @@ 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; @@ -305,42 +326,114 @@ static int producer_get_frame( mlt_producer parent, mlt_frame_ptr frame, int tra // Check for last track done = mlt_properties_get_int( temp_properties, "last_track" ); + // Handle fx only tracks + if ( mlt_properties_get_int( temp_properties, "meta.fx_cut" ) ) + { + mlt_properties copy = video == NULL ? frame_properties : MLT_FRAME_PROPERTIES( video ); + int i = 0; + + for ( i = 0; i < mlt_properties_count( temp_properties ); i ++ ) + { + char *name = mlt_properties_get_name( temp_properties, i ); + char *value = mlt_properties_get_value( temp_properties, i ); + // For animated filters + if ( isdigit( name[ 0 ] ) && value != NULL ) + mlt_properties_set( copy, name, value ); + } + + if ( video ) + { + // Take all but the first placeholding producer and dump on to the image stack + void *p = mlt_deque_pop_front( MLT_FRAME_IMAGE_STACK( temp ) ); + while ( ( p = mlt_deque_pop_front( MLT_FRAME_IMAGE_STACK( temp ) ) ) != NULL ) + mlt_deque_push_back( MLT_FRAME_IMAGE_STACK( video ), p ); + } + else + { + mlt_frame_push_service( *frame, temp ); + mlt_frame_push_service( *frame, producer_get_image ); + mlt_properties_set_int( frame_properties, "meta.fx_cut", 1 ); + } + + if ( audio ) + { + // Take all but the first placeholding producer and dump on to the audio stack + void *p = mlt_deque_pop_front( MLT_FRAME_AUDIO_STACK( temp ) ); + while ( ( p = mlt_deque_pop_front( MLT_FRAME_AUDIO_STACK( temp ) ) ) != NULL ) + mlt_deque_push_back( MLT_FRAME_AUDIO_STACK( audio ), p ); + } + else + { + mlt_frame_push_audio( *frame, temp ); + mlt_frame_push_audio( *frame, producer_get_audio ); + mlt_properties_set_int( frame_properties, "meta.fx_cut", 1 ); + } + + // Ensure everything is hidden + mlt_properties_set_int( temp_properties, "hide", 3 ); + } + // 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 first data_queue, but after that, all queues are appended - if ( !done && mlt_properties_get_data( temp_properties, "data_queue", NULL ) != NULL && - mlt_deque_count( mlt_properties_get_data( temp_properties, "data_queue", NULL ) ) != 0 ) + // We want to append all 'final' feeds to the global queue + if ( !done && mlt_properties_get_data( temp_properties, "data_queue", NULL ) != NULL ) { - if ( data_queue == NULL ) + // Move the contents of this queue on to the output frames data queue + mlt_deque sub_queue = mlt_properties_get_data( MLT_FRAME_PROPERTIES( temp ), "data_queue", NULL ); + mlt_deque temp = mlt_deque_init( ); + while ( global_feed && mlt_deque_count( sub_queue ) ) { - data_queue = mlt_properties_get_data( MLT_FRAME_PROPERTIES( temp ), "data_queue", NULL ); + mlt_properties p = mlt_deque_pop_back( sub_queue ); + if ( mlt_properties_get_int( p, "final" ) ) + mlt_deque_push_back( data_queue, p ); + else + mlt_deque_push_back( temp, p ); } - else + while( mlt_deque_count( temp ) ) + mlt_deque_push_front( sub_queue, mlt_deque_pop_back( temp ) ); + mlt_deque_close( temp ); + } + + // Now do the same with the global queue but without the conditional behaviour + if ( mlt_properties_get_data( temp_properties, "global_queue", NULL ) != NULL ) + { + mlt_deque sub_queue = mlt_properties_get_data( MLT_FRAME_PROPERTIES( temp ), "global_queue", NULL ); + while ( mlt_deque_count( sub_queue ) ) { - // Move the contents of this queue on to the output frames data queue - mlt_deque sub_queue = mlt_properties_get_data( MLT_FRAME_PROPERTIES( temp ), "data_queue", NULL ); - while ( mlt_deque_count( sub_queue ) ) - { - void *p = mlt_deque_pop_back( sub_queue ); - mlt_deque_push_back( data_queue, p ); - } + mlt_properties p = mlt_deque_pop_back( sub_queue ); + mlt_deque_push_back( data_queue, p ); } } // Pick up first video and audio frames if ( !done && !mlt_frame_is_test_audio( temp ) && !( mlt_properties_get_int( temp_properties, "hide" ) & 2 ) ) + { + // Order of frame creation is starting to get problematic + if ( audio != NULL ) + { + mlt_deque_push_front( MLT_FRAME_AUDIO_STACK( temp ), producer_get_audio ); + mlt_deque_push_front( MLT_FRAME_AUDIO_STACK( temp ), audio ); + } audio = temp; + } if ( !done && !mlt_frame_is_test_card( temp ) && !( mlt_properties_get_int( temp_properties, "hide" ) & 1 ) ) + { + if ( video != NULL ) + { + mlt_deque_push_front( MLT_FRAME_IMAGE_STACK( temp ), producer_get_image ); + mlt_deque_push_front( MLT_FRAME_IMAGE_STACK( temp ), video ); + } video = temp; + } } // Now stack callbacks if ( audio != NULL ) { mlt_frame_push_audio( *frame, audio ); - ( *frame )->get_audio = producer_get_audio; + mlt_frame_push_audio( *frame, producer_get_audio ); } if ( video != NULL ) @@ -348,7 +441,9 @@ static int producer_get_frame( mlt_producer parent, mlt_frame_ptr frame, int tra mlt_properties video_properties = MLT_FRAME_PROPERTIES( video ); mlt_frame_push_service( *frame, video ); mlt_frame_push_service( *frame, producer_get_image ); - mlt_properties_set_data( frame_properties, "data_queue", data_queue, 0, NULL, NULL ); + if ( global_feed ) + mlt_properties_set_data( frame_properties, "data_queue", data_queue, 0, NULL, NULL ); + mlt_properties_set_data( video_properties, "global_queue", data_queue, 0, destroy_data_queue, 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" ) ); @@ -356,10 +451,15 @@ static int producer_get_frame( mlt_producer parent, mlt_frame_ptr frame, int tra 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" ) ); } + else + { + destroy_data_queue( data_queue ); + } 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 ); + mlt_properties_set_data( MLT_FRAME_PROPERTIES( *frame ), "consumer_lock_service", this, 0, NULL, NULL ); } else if ( producer != NULL ) {