X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_multitrack.c;h=6b21a2b76798dbb80b7efe2b4d5d03356e755040;hb=bf3264b9e340ba5c11cbf59835a8af3db94e0cc2;hp=59b2383227cf3fa2061eb3cc8124368c3dd695e2;hpb=1d46befd8150131541aa98e93573d5d6e54e9c3a;p=melted diff --git a/src/framework/mlt_multitrack.c b/src/framework/mlt_multitrack.c index 59b2383..6b21a2b 100644 --- a/src/framework/mlt_multitrack.c +++ b/src/framework/mlt_multitrack.c @@ -3,19 +3,19 @@ * Copyright (C) 2003-2004 Ushodaya Enterprises Limited * Author: Charles Yates * - * 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. + * 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 program is distributed in the hope that it will be useful, + * 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" @@ -27,18 +27,6 @@ #include #include -/** Private definition. -*/ - -struct mlt_multitrack_s -{ - // We're extending producer here - struct mlt_producer_s parent; - mlt_producer *list; - int size; - int count; -}; - /** Forward reference. */ @@ -57,10 +45,15 @@ mlt_multitrack mlt_multitrack_init( ) mlt_producer producer = &this->parent; if ( mlt_producer_init( producer, this ) == 0 ) { - mlt_properties properties = mlt_multitrack_properties( this ); + mlt_properties properties = MLT_MULTITRACK_PROPERTIES( this ); producer->get_frame = producer_get_frame; mlt_properties_set_data( properties, "multitrack", this, 0, NULL, NULL ); mlt_properties_set( properties, "log_id", "multitrack" ); + mlt_properties_set( properties, "resource", "" ); + mlt_properties_set_int( properties, "in", 0 ); + mlt_properties_set_int( properties, "out", -1 ); + mlt_properties_set_int( properties, "length", 0 ); + producer->close = ( mlt_destructor )mlt_multitrack_close; } else { @@ -77,7 +70,7 @@ mlt_multitrack mlt_multitrack_init( ) mlt_producer mlt_multitrack_producer( mlt_multitrack this ) { - return &this->parent; + return this != NULL ? &this->parent : NULL; } /** Get the service associated this multitrack. @@ -85,7 +78,7 @@ mlt_producer mlt_multitrack_producer( mlt_multitrack this ) mlt_service mlt_multitrack_service( mlt_multitrack this ) { - return mlt_producer_service( mlt_multitrack_producer( this ) ); + return MLT_MULTITRACK_SERVICE( this ); } /** Get the properties associated this multitrack. @@ -93,7 +86,7 @@ mlt_service mlt_multitrack_service( mlt_multitrack this ) mlt_properties mlt_multitrack_properties( mlt_multitrack this ) { - return mlt_service_properties( mlt_multitrack_service( this ) ); + return MLT_MULTITRACK_PROPERTIES( this ); } /** Initialise position related information. @@ -104,7 +97,7 @@ void mlt_multitrack_refresh( mlt_multitrack this ) int i = 0; // Obtain the properties of this multitrack - mlt_properties properties = mlt_multitrack_properties( this ); + mlt_properties properties = MLT_MULTITRACK_PROPERTIES( this ); // We need to ensure that the multitrack reports the longest track as its length mlt_position length = 0; @@ -116,17 +109,19 @@ void mlt_multitrack_refresh( mlt_multitrack this ) for ( i = 0; i < this->count; i ++ ) { // Get the producer from this index - mlt_producer producer = this->list[ i ]; + mlt_track track = this->list[ i ]; + mlt_producer producer = track->producer; // If it's allocated then, update our stats if ( producer != NULL ) { // If we have more than 1 track, we must be in continue mode if ( this->count > 1 ) - mlt_properties_set( mlt_producer_properties( producer ), "eof", "continue" ); + mlt_properties_set( MLT_PRODUCER_PROPERTIES( producer ), "eof", "continue" ); // Determine the longest length - length = mlt_producer_get_playtime( producer ) > length ? mlt_producer_get_playtime( producer ) : length; + //if ( !mlt_properties_get_int( MLT_PRODUCER_PROPERTIES( producer ), "hide" ) ) + length = mlt_producer_get_playtime( producer ) > length ? mlt_producer_get_playtime( producer ) : length; // Handle fps if ( fps == 0 ) @@ -140,17 +135,27 @@ void mlt_multitrack_refresh( mlt_multitrack this ) fprintf( stderr, "Warning: fps mismatch on track %d\n", i ); // It should be safe to impose fps on an image producer, but not necessarily safe for video - mlt_properties_set_double( mlt_producer_properties( producer ), "fps", fps ); + mlt_properties_set_double( MLT_PRODUCER_PROPERTIES( producer ), "fps", fps ); } } } // Update multitrack properties now - we'll not destroy the in point here + mlt_events_block( properties, properties ); mlt_properties_set_position( properties, "length", length ); + mlt_events_unblock( properties, properties ); mlt_properties_set_position( properties, "out", length - 1 ); mlt_properties_set_double( properties, "fps", fps ); } +/** Listener for producers on the playlist. +*/ + +static void mlt_multitrack_listener( mlt_producer producer, mlt_multitrack this ) +{ + mlt_multitrack_refresh( this ); +} + /** Connect a producer to a given track. Note that any producer can be connected here, but see special case treatment @@ -160,7 +165,7 @@ void mlt_multitrack_refresh( mlt_multitrack this ) int mlt_multitrack_connect( mlt_multitrack this, mlt_producer producer, int track ) { // Connect to the producer to ourselves at the specified track - int result = mlt_service_connect_producer( mlt_multitrack_service( this ), mlt_producer_service( producer ), track ); + int result = mlt_service_connect_producer( MLT_MULTITRACK_SERVICE( this ), MLT_PRODUCER_SERVICE( producer ), track ); if ( result == 0 ) { @@ -168,14 +173,28 @@ int mlt_multitrack_connect( mlt_multitrack this, mlt_producer producer, int trac if ( track >= this->size ) { int i; - this->list = realloc( this->list, ( track + 10 ) * sizeof( mlt_producer ) ); + this->list = realloc( this->list, ( track + 10 ) * sizeof( mlt_track ) ); for ( i = this->size; i < track + 10; i ++ ) this->list[ i ] = NULL; this->size = track + 10; } - + + if ( this->list[ track ] != NULL ) + { + mlt_event_close( this->list[ track ]->event ); + mlt_producer_close( this->list[ track ]->producer ); + } + else + { + this->list[ track ] = malloc( sizeof( struct mlt_track_s ) ); + } + // Assign the track in our list here - this->list[ track ] = producer; + this->list[ track ]->producer = producer; + this->list[ track ]->event = mlt_events_listen( MLT_PRODUCER_PROPERTIES( producer ), this, + "producer-changed", ( mlt_listener )mlt_multitrack_listener ); + mlt_properties_inc_ref( MLT_PRODUCER_PROPERTIES( producer ) ); + mlt_event_inc_ref( this->list[ track ]->event ); // Increment the track count if need be if ( track >= this->count ) @@ -188,6 +207,43 @@ int mlt_multitrack_connect( mlt_multitrack this, mlt_producer producer, int trac return result; } +/** Get the number of tracks. +*/ + +int mlt_multitrack_count( mlt_multitrack this ) +{ + return this->count; +} + +/** Get an individual track as a producer. +*/ + +mlt_producer mlt_multitrack_track( mlt_multitrack this, int track ) +{ + mlt_producer producer = NULL; + + if ( this->list != NULL && track < this->count ) + producer = this->list[ track ]->producer; + + return producer; +} + +static int position_compare( const void *p1, const void *p2 ) +{ + return *( mlt_position * )p1 - *( mlt_position * )p2; +} + +static int add_unique( mlt_position *array, int size, mlt_position position ) +{ + int i = 0; + for ( i = 0; i < size; i ++ ) + if ( array[ i ] == position ) + break; + if ( i == size ) + array[ size ++ ] = position; + return size; +} + /** Determine the clip point. Special case here: a 'producer' has no concept of multiple clips - only the @@ -210,54 +266,79 @@ int mlt_multitrack_connect( mlt_multitrack this, mlt_producer producer, int trac mlt_position mlt_multitrack_clip( mlt_multitrack this, mlt_whence whence, int index ) { - int first = 1; mlt_position position = 0; int i = 0; + int j = 0; + mlt_position *map = malloc( 1000 * sizeof( mlt_position ) ); + int count = 0; - // Loop through each of the tracks for ( i = 0; i < this->count; i ++ ) { // Get the producer for this track - mlt_producer producer = this->list[ i ]; + mlt_producer producer = this->list[ i ]->producer; - // If it's assigned... + // If it's assigned and not a hidden track if ( producer != NULL ) { // Get the properties of this producer - mlt_properties properties = mlt_producer_properties( producer ); + mlt_properties properties = MLT_PRODUCER_PROPERTIES( producer ); // Determine if it's a playlist mlt_playlist playlist = mlt_properties_get_data( properties, "playlist", NULL ); - // We only consider playlists + // Special case consideration of playlists if ( playlist != NULL ) { - // Locate the smallest position - if ( first ) - { - // First position found - position = mlt_playlist_clip( playlist, whence, index ); - - // We're no longer first - first = 0; - } - else - { - // Obtain the clip position in this playlist - //mlt_position position2 = mlt_playlist_clip( playlist, whence, index ); - - // If this position is prior to the first, then use it - //if ( position2 < position ) - //position = position2; - } + for ( j = 0; j < mlt_playlist_count( playlist ); j ++ ) + count = add_unique( map, count, mlt_playlist_clip( playlist, mlt_whence_relative_start, j ) ); + count = add_unique( map, count, mlt_producer_get_out( producer ) + 1 ); } else { - fprintf( stderr, "track %d isn't a playlist\n", index ); + count = add_unique( map, count, 0 ); + count = add_unique( map, count, mlt_producer_get_out( producer ) + 1 ); } } } + // Now sort the map + qsort( map, count, sizeof( mlt_position ), position_compare ); + + // Now locate the requested index + switch( whence ) + { + case mlt_whence_relative_start: + if ( index < count ) + position = map[ index ]; + else + position = map[ count - 1 ]; + break; + + case mlt_whence_relative_current: + position = mlt_producer_position( MLT_MULTITRACK_PRODUCER( this ) ); + for ( i = 0; i < count - 2; i ++ ) + if ( position >= map[ i ] && position < map[ i + 1 ] ) + break; + index += i; + if ( index >= 0 && index < count ) + position = map[ index ]; + else if ( index < 0 ) + position = map[ 0 ]; + else + position = map[ count - 1 ]; + break; + + case mlt_whence_relative_end: + if ( index < count ) + position = map[ count - index - 1 ]; + else + position = map[ 0 ]; + break; + } + + // Free the map + free( map ); + return position; } @@ -295,22 +376,31 @@ static int producer_get_frame( mlt_producer parent, mlt_frame_ptr frame, int ind if ( index < this->count && this->list[ index ] != NULL ) { // Get the producer for this track - mlt_producer producer = this->list[ index ]; + mlt_producer producer = this->list[ index ]->producer; + + // Get the track hide property + int hide = mlt_properties_get_int( MLT_PRODUCER_PROPERTIES( mlt_producer_cut_parent( producer ) ), "hide" ); // Obtain the current position mlt_position position = mlt_producer_frame( parent ); + // Get the parent properties + mlt_properties producer_properties = MLT_PRODUCER_PROPERTIES( parent ); + + // Get the speed + double speed = mlt_properties_get_double( producer_properties, "_speed" ); + // Make sure we're at the same point mlt_producer_seek( producer, position ); // Get the frame from the producer - mlt_service_get_frame( mlt_producer_service( producer ), frame, 0 ); + mlt_service_get_frame( MLT_PRODUCER_SERVICE( producer ), frame, 0 ); // Indicate speed of this producer - mlt_properties producer_properties = mlt_producer_properties( parent ); - double speed = mlt_properties_get_double( producer_properties, "speed" ); - mlt_properties properties = mlt_frame_properties( *frame ); - mlt_properties_set_double( properties, "speed", speed ); + mlt_properties properties = MLT_FRAME_PROPERTIES( *frame ); + mlt_properties_set_double( properties, "_speed", speed ); + mlt_properties_set_position( properties, "_position", position ); + mlt_properties_set_int( properties, "hide", hide ); } else { @@ -324,14 +414,11 @@ static int producer_get_frame( mlt_producer parent, mlt_frame_ptr frame, int ind if ( index >= this->count ) { // Let tractor know if we've reached the end - mlt_properties_set_int( mlt_frame_properties( *frame ), "last_track", 1 ); + mlt_properties_set_int( MLT_FRAME_PROPERTIES( *frame ), "last_track", 1 ); // Move to the next frame mlt_producer_prepare_next( parent ); } - - // Refresh our stats - mlt_multitrack_refresh( this ); } return 0; @@ -342,12 +429,27 @@ static int producer_get_frame( mlt_producer parent, mlt_frame_ptr frame, int ind void mlt_multitrack_close( mlt_multitrack this ) { - // Close the producer - mlt_producer_close( &this->parent ); + if ( this != NULL && mlt_properties_dec_ref( MLT_MULTITRACK_PROPERTIES( this ) ) <= 0 ) + { + int i = 0; + for ( i = 0; i < this->count; i ++ ) + { + if ( this->list[ i ] != NULL ) + { + mlt_event_close( this->list[ i ]->event ); + mlt_producer_close( this->list[ i ]->producer ); + free( this->list[ i ] ); + } + } + + // Close the producer + this->parent.close = NULL; + mlt_producer_close( &this->parent ); - // Free the list - free( this->list ); + // Free the list + free( this->list ); - // Free the object - free( this ); + // Free the object + free( this ); + } }