X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_multitrack.c;h=c9ea81ce6c820ac1a2fe5b3be1bd1f3297d22300;hb=42bd0aedb6d3d65bedb98479adcdbaeb326dfee9;hp=b35754643eb19a45d4069d1a5da8e00c015cbc0e;hpb=1b5b040dcc51d66252efd82968889b1d2b929930;p=melted diff --git a/src/framework/mlt_multitrack.c b/src/framework/mlt_multitrack.c index b357546..c9ea81c 100644 --- a/src/framework/mlt_multitrack.c +++ b/src/framework/mlt_multitrack.c @@ -61,6 +61,7 @@ mlt_multitrack mlt_multitrack_init( ) 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", "" ); } else { @@ -96,7 +97,7 @@ mlt_properties mlt_multitrack_properties( mlt_multitrack this ) return mlt_service_properties( mlt_multitrack_service( this ) ); } -/** Initialise timecode related information. +/** Initialise position related information. */ void mlt_multitrack_refresh( mlt_multitrack this ) @@ -107,7 +108,7 @@ void mlt_multitrack_refresh( mlt_multitrack this ) mlt_properties properties = mlt_multitrack_properties( this ); // We need to ensure that the multitrack reports the longest track as its length - mlt_timecode length = 0; + mlt_position length = 0; // We need to ensure that fps are the same on all services double fps = 0; @@ -121,6 +122,10 @@ void mlt_multitrack_refresh( mlt_multitrack this ) // 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" ); + // Determine the longest length length = mlt_producer_get_playtime( producer ) > length ? mlt_producer_get_playtime( producer ) : length; @@ -142,8 +147,8 @@ void mlt_multitrack_refresh( mlt_multitrack this ) } // Update multitrack properties now - we'll not destroy the in point here - mlt_properties_set_timecode( properties, "length", length ); - mlt_properties_set_timecode( properties, "out", length ); + mlt_properties_set_position( properties, "length", length ); + mlt_properties_set_position( properties, "out", length - 1 ); mlt_properties_set_double( properties, "fps", fps ); } @@ -160,10 +165,6 @@ int mlt_multitrack_connect( mlt_multitrack this, mlt_producer producer, int trac if ( result == 0 ) { - // If it's a playlist, we need to make sure it doesn't pause at end - mlt_properties properties = mlt_producer_properties( producer ); - mlt_properties_set( properties, "eof", "continue" ); - // Resize the producer list if need be if ( track >= this->size ) { @@ -188,6 +189,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 ]; + + return producer; +} + +static int position_compare( const void *p1, const void *p2 ) +{ + return *( int64_t * )p1 - *( int64_t * )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 @@ -208,13 +246,14 @@ int mlt_multitrack_connect( mlt_multitrack this, mlt_producer producer, int trac 0.0, 1.0, b0.0, 0.1, b1.1, 1.1, 0.1, 0.2, [out of playlist2], [out of playlist1] */ -mlt_timecode mlt_multitrack_clip( mlt_multitrack this, mlt_whence whence, int index ) +mlt_position mlt_multitrack_clip( mlt_multitrack this, mlt_whence whence, int index ) { - int first = 1; - mlt_timecode position = 0; + mlt_position position = 0; int i = 0; + int j = 0; + int64_t *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 @@ -229,31 +268,59 @@ mlt_timecode mlt_multitrack_clip( mlt_multitrack this, mlt_whence whence, int in // 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 timecode - 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_timecode 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 + { + 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( int64_t ), 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; } @@ -293,28 +360,28 @@ static int producer_get_frame( mlt_producer parent, mlt_frame_ptr frame, int ind // Get the producer for this track mlt_producer producer = this->list[ index ]; - // Obtain the current timecode - uint64_t position = mlt_producer_frame( parent ); + // Obtain the current position + mlt_position position = mlt_producer_frame( parent ); // Make sure we're at the same point - mlt_producer_seek_frame( producer, position ); + mlt_producer_seek( producer, position ); // Get the frame from the producer 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" ); + 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_set_double( properties, "_speed", speed ); } else { // Generate a test frame *frame = mlt_frame_init( ); - // Update timecode on the frame we're creating - mlt_frame_set_timecode( *frame, mlt_producer_position( parent ) ); + // Update position on the frame we're creating + mlt_frame_set_position( *frame, mlt_producer_position( parent ) ); // Move on to the next frame if ( index >= this->count )