X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fframework%2Fmlt_tractor.c;h=3a3907b373732e5ff757c591a3cb15fcf197e5fa;hb=e5fd66367b6f976e3bcb0ada98408afcb40cb2ce;hp=11539cc3f745bdf35581ae5a7f908a81f5ba03cd;hpb=1da06dddd4f117c21c07b3682fab5abab014d995;p=mlt diff --git a/src/framework/mlt_tractor.c b/src/framework/mlt_tractor.c index 11539cc3..3a3907b3 100644 --- a/src/framework/mlt_tractor.c +++ b/src/framework/mlt_tractor.c @@ -1,25 +1,25 @@ -/* - * mlt_tractor.c -- tractor service class - * Copyright (C) 2003-2004 Ushodaya Enterprises Limited - * Author: Charles Yates +/** + * \file mlt_tractor.c + * \brief tractor service class * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * Copyright (C) 2003-2008 Ushodaya Enterprises Limited + * \author Charles Yates * - * This program is distributed in the hope that it will be useful, + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "config.h" - #include "mlt_tractor.h" #include "mlt_frame.h" #include "mlt_multitrack.h" @@ -28,15 +28,7 @@ #include #include #include - -/** Private structure. -*/ - -struct mlt_tractor_s -{ - struct mlt_producer_s parent; - mlt_service producer; -}; +#include /** Forward references to static methods. */ @@ -55,9 +47,14 @@ 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" ); + mlt_properties properties = MLT_PRODUCER_PROPERTIES( producer ); + + mlt_properties_set( properties, "resource", "" ); + mlt_properties_set( properties, "mlt_type", "mlt_producer" ); + mlt_properties_set( properties, "mlt_service", "tractor" ); + mlt_properties_set_int( properties, "in", 0 ); + mlt_properties_set_int( properties, "out", -1 ); + mlt_properties_set_int( properties, "length", 0 ); producer->get_frame = producer_get_frame; producer->close = ( mlt_destructor )mlt_tractor_close; @@ -82,7 +79,7 @@ mlt_tractor mlt_tractor_new( ) { mlt_multitrack multitrack = mlt_multitrack_init( ); mlt_field field = mlt_field_new( multitrack, this ); - mlt_properties props = mlt_producer_properties( producer ); + mlt_properties props = MLT_PRODUCER_PROPERTIES( producer ); mlt_properties_set( props, "resource", "" ); mlt_properties_set( props, "mlt_type", "mlt_producer" ); @@ -93,7 +90,7 @@ mlt_tractor mlt_tractor_new( ) 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 ); + 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; @@ -113,7 +110,7 @@ mlt_tractor mlt_tractor_new( ) mlt_service mlt_tractor_service( mlt_tractor this ) { - return mlt_producer_service( &this->parent ); + return MLT_PRODUCER_SERVICE( &this->parent ); } /** Get the producer object associated to the tractor. @@ -129,7 +126,7 @@ mlt_producer mlt_tractor_producer( mlt_tractor this ) mlt_properties mlt_tractor_properties( mlt_tractor this ) { - return mlt_producer_properties( &this->parent ); + return MLT_PRODUCER_PROPERTIES( &this->parent ); } /** Get the field this tractor is harvesting. @@ -137,7 +134,7 @@ mlt_properties mlt_tractor_properties( mlt_tractor this ) mlt_field mlt_tractor_field( mlt_tractor this ) { - return mlt_properties_get_data( mlt_tractor_properties( this ), "field", NULL ); + return mlt_properties_get_data( MLT_TRACTOR_PROPERTIES( this ), "field", NULL ); } /** Get the multitrack this tractor is pulling. @@ -145,7 +142,7 @@ mlt_field mlt_tractor_field( mlt_tractor this ) mlt_multitrack mlt_tractor_multitrack( mlt_tractor this ) { - return mlt_properties_get_data( mlt_tractor_properties( this ), "multitrack", NULL ); + return mlt_properties_get_data( MLT_TRACTOR_PROPERTIES( this ), "multitrack", NULL ); } /** Ensure the tractors in/out points match the multitrack. @@ -154,8 +151,8 @@ mlt_multitrack mlt_tractor_multitrack( mlt_tractor this ) 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_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 ); @@ -176,7 +173,7 @@ static void mlt_tractor_listener( mlt_multitrack tracks, mlt_tractor this ) int mlt_tractor_connect( mlt_tractor this, mlt_service producer ) { - int ret = mlt_service_connect_producer( mlt_tractor_service( this ), producer, 0 ); + int ret = mlt_service_connect_producer( MLT_TRACTOR_SERVICE( this ), producer, 0 ); // This is the producer we're going to connect to if ( ret == 0 ) @@ -201,38 +198,36 @@ 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_properties properties = MLT_FRAME_PROPERTIES( this ); mlt_frame frame = mlt_frame_pop_service( this ); - mlt_properties frame_properties = mlt_frame_properties( frame ); - 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 frame_properties = MLT_FRAME_PROPERTIES( frame ); mlt_properties_set( frame_properties, "rescale.interp", mlt_properties_get( properties, "rescale.interp" ) ); - mlt_properties_set_double( frame_properties, "aspect_ratio", mlt_properties_get_double( properties, "aspect_ratio" ) ); + mlt_properties_set_int( frame_properties, "resize_alpha", mlt_properties_get_int( properties, "resize_alpha" ) ); + 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_progressive", mlt_properties_get_double( properties, "consumer_progressive" ) ); - mlt_properties_set_int( frame_properties, "consumer_deinterlace", mlt_properties_get_double( properties, "consumer_deinterlace" ) ); + mlt_properties_set_int( frame_properties, "consumer_deinterlace", mlt_properties_get_int( 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_int( properties, "normalised_width" ) ); + mlt_properties_set_int( frame_properties, "normalised_height", mlt_properties_get_int( properties, "normalised_height" ) ); 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_set_int( properties, "format", *format ); 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" ) ); + 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 ); - this->get_alpha_mask = mlt_tractor_alpha_mask; 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_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 ); @@ -241,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 ) @@ -255,9 +268,10 @@ static int producer_get_frame( mlt_producer parent, mlt_frame_ptr frame, int tra int done = 0; mlt_frame temp = NULL; int count = 0; + int image_count = 0; // Get the properties of the parent producer - mlt_properties properties = mlt_producer_properties( parent ); + mlt_properties properties = MLT_PRODUCER_PROPERTIES( parent ); // Try to obtain the multitrack associated to the tractor mlt_multitrack multitrack = mlt_properties_get_data( properties, "multitrack", NULL ); @@ -265,7 +279,13 @@ 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 ); - // If we don't have one, we're in trouble... + // 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 ) { // Used to garbage collect all frames @@ -280,20 +300,21 @@ static int producer_get_frame( mlt_producer parent, mlt_frame_ptr frame, int tra // We'll store audio and video frames to use here mlt_frame audio = NULL; mlt_frame video = NULL; + mlt_frame first_video = NULL; - // Determine which data_queue to pass on... - void *data_queue = NULL; + // Temporary properties + mlt_properties temp_properties = NULL; // Get the multitrack's producer - mlt_producer target = mlt_multitrack_producer( multitrack ); + 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 ) ); // We will create one frame and attach everything to it - *frame = mlt_frame_init( ); + *frame = mlt_frame_init( MLT_PRODUCER_SERVICE( parent ) ); // Get the properties of the frame - frame_properties = mlt_frame_properties( *frame ); + frame_properties = MLT_FRAME_PROPERTIES( *frame ); // Loop through each of the tracks we're harvesting for ( i = 0; !done; i ++ ) @@ -301,47 +322,116 @@ static int producer_get_frame( mlt_producer parent, mlt_frame_ptr frame, int tra // Get a frame from the producer mlt_service_get_frame( this->producer, &temp, i ); + // Get the temporary properties + temp_properties = MLT_FRAME_PROPERTIES( temp ); + // Check for last track - done = mlt_properties_get_int( mlt_frame_properties( temp ), "last_track" ); + done = mlt_properties_get_int( temp_properties, "last_track" ); + + // Handle fx only tracks + if ( mlt_properties_get_int( temp_properties, "fx_cut" ) ) + { + int hide = ( video == NULL ? 1 : 0 ) | ( audio == NULL ? 2 : 0 ); + mlt_properties_set_int( temp_properties, "hide", hide ); + } // 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 last data_queue - if ( mlt_properties_get_data( mlt_frame_properties( temp ), "data_queue", NULL ) != NULL ) - data_queue = mlt_properties_get_data( mlt_frame_properties( temp ), "data_queue", NULL ); + // We want to append all 'final' feeds to the global queue + if ( !done && mlt_properties_get_data( temp_properties, "data_queue", NULL ) != 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 ) ) + { + 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 ); + } + 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 ) ) + { + 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 ) ) + 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 ) ) + } + 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; + if ( first_video == NULL ) + first_video = temp; + + // Ensure that all frames know the aspect ratio of the background + mlt_properties_set_double( temp_properties, "output_ratio", + mlt_properties_get_double( MLT_FRAME_PROPERTIES( first_video ), "aspect_ratio" ) ); + + mlt_properties_set_int( MLT_FRAME_PROPERTIES( temp ), "image_count", ++ image_count ); + image_count = 1; + } } - + // Now stack callbacks if ( audio != NULL ) { - mlt_properties audio_properties = mlt_frame_properties( audio ); mlt_frame_push_audio( *frame, audio ); - ( *frame )->get_audio = producer_get_audio; - mlt_properties_set_position( frame_properties, "_position", mlt_properties_get_position( audio_properties, "_position" ) ); + mlt_frame_push_audio( *frame, producer_get_audio ); } if ( video != NULL ) { - mlt_properties video_properties = mlt_frame_properties( video ); + mlt_properties video_properties = MLT_FRAME_PROPERTIES( first_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" ) ); + mlt_properties_set_int( frame_properties, "real_height", mlt_properties_get_int( video_properties, "real_height" ) ); + 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" ) ); - mlt_properties_set_position( frame_properties, "_position", mlt_properties_get_position( video_properties, "_position" ) ); + mlt_properties_set_int( frame_properties, "image_count", image_count ); + } + else + { + destroy_data_queue( data_queue ); } - 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_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 ) { @@ -364,7 +454,7 @@ static int producer_get_frame( mlt_producer parent, mlt_frame_ptr frame, int tra else { // Generate a test card - *frame = mlt_frame_init( ); + *frame = mlt_frame_init( MLT_PRODUCER_SERVICE( parent ) ); return 0; } } @@ -374,7 +464,7 @@ static int producer_get_frame( mlt_producer parent, mlt_frame_ptr frame, int tra void mlt_tractor_close( mlt_tractor this ) { - if ( this != NULL && mlt_properties_dec_ref( mlt_tractor_properties( this ) ) <= 0 ) + if ( this != NULL && mlt_properties_dec_ref( MLT_TRACTOR_PROPERTIES( this ) ) <= 0 ) { this->parent.close = NULL; mlt_producer_close( &this->parent );