X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_multitrack.c;h=9db2aad43704636a3572288a71a792001ff19d9c;hb=9390e8b584f3f717f0a326893c0e37cf187a0a51;hp=77158c767c4d3ac7f7228b418426a24e3bb2462f;hpb=661165812e3410fe2f6f49d7af882b36a0efcf82;p=melted

diff --git a/src/framework/mlt_multitrack.c b/src/framework/mlt_multitrack.c
index 77158c7..9db2aad 100644
--- a/src/framework/mlt_multitrack.c
+++ b/src/framework/mlt_multitrack.c
@@ -21,6 +21,7 @@
 #include "config.h"
 
 #include "mlt_multitrack.h"
+#include "mlt_playlist.h"
 #include "mlt_frame.h"
 
 #include <stdio.h>
@@ -56,7 +57,10 @@ mlt_multitrack mlt_multitrack_init( )
 		mlt_producer producer = &this->parent;
 		if ( mlt_producer_init( producer, this ) == 0 )
 		{
+			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" );
 		}
 		else
 		{
@@ -95,7 +99,7 @@ mlt_properties mlt_multitrack_properties( mlt_multitrack this )
 /** Initialise timecode related information.
 */
 
-static void mlt_multitrack_refresh( mlt_multitrack this )
+void mlt_multitrack_refresh( mlt_multitrack this )
 {
 	int i = 0;
 
@@ -118,7 +122,7 @@ static void mlt_multitrack_refresh( mlt_multitrack this )
 		if ( producer != NULL )
 		{
 			// Determine the longest length
-			length = mlt_producer_get_length( producer ) > length ? mlt_producer_get_length( producer ) : length;
+			length = mlt_producer_get_playtime( producer ) > length ? mlt_producer_get_playtime( producer ) : length;
 			
 			// Handle fps
 			if ( fps == 0 )
@@ -140,10 +144,13 @@ static 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_timecode( properties, "playtime", length - mlt_properties_get_timecode( properties, "in" ) );
+	mlt_properties_set_double( properties, "fps", fps );
 }
 
 /** Connect a producer to a given track.
+
+  	Note that any producer can be connected here, but see special case treatment
+	of playlist in clip point determination below.
 */
 
 int mlt_multitrack_connect( mlt_multitrack this, mlt_producer producer, int track )
@@ -177,6 +184,75 @@ int mlt_multitrack_connect( mlt_multitrack this, mlt_producer producer, int trac
 	return result;
 }
 
+/** Determine the clip point.
+
+  	Special case here: a 'producer' has no concept of multiple clips - only the 
+	playlist and multitrack producers have clip functionality. Further to that a 
+	multitrack determines clip information from any connected tracks that happen 
+	to be playlists.
+
+	Additionally, it must locate clips in the correct order, for example, consider
+	the following track arrangement:
+
+	playlist1 |0.0     |b0.0      |0.1          |0.1         |0.2           |
+	playlist2 |b1.0  |1.0           |b1.1     |1.1             |
+
+	Note - b clips represent blanks. They are also reported as clip positions.
+
+	When extracting clip positions from these playlists, we should get a sequence of:
+
+	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 )
+{
+	int first = 1;
+	mlt_timecode position = 0;
+	int i = 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 ];
+
+		// If it's assigned...
+		if ( producer != NULL )
+		{
+			// Get the properties of this 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
+			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;
+				}
+			}
+		}
+	}
+
+	return position;
+}
+
 /** Get frame method.
 
   	Special case here: The multitrack must be used in a conjunction with a downstream
@@ -221,24 +297,34 @@ static int producer_get_frame( mlt_producer parent, mlt_frame_ptr frame, int ind
 
 		// 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" );
+		mlt_properties properties = mlt_frame_properties( *frame );
+		mlt_properties_set_double( properties, "speed", speed );
 	}
 	else
 	{
 		// Generate a test frame
 		*frame = mlt_frame_init( );
 
-		// Let tractor know if we've reached the end
-		mlt_properties_set_int( mlt_frame_properties( *frame ), "last_track", index >= this->count );
-
 		// Update timecode on the frame we're creating
 		mlt_frame_set_timecode( *frame, mlt_producer_position( parent ) );
 
 		// Move on to the next frame
 		if ( index >= this->count )
+		{
+			// Let tractor know if we've reached the end
+			mlt_properties_set_int( mlt_frame_properties( *frame ), "last_track", 1 );
+
+			// Move to the next frame
 			mlt_producer_prepare_next( parent );
-	}
+		}
 
-	fprintf( stderr, "timestamp for %d = %f\n", index, ( float )mlt_frame_get_timecode( *frame ) );
+		// Refresh our stats
+		mlt_multitrack_refresh( this );
+	}
 
 	return 0;
 }