X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_producer.c;h=2a5b60e7ad7aa9066160fca2933225d39d8435be;hb=16c5c516008b9debec7765e34f4756f8063dee7e;hp=278d9026957b9455183024663a65c405bbfc11b3;hpb=426c659c0b9d0667e2399e60cf81341a51ac040f;p=melted

diff --git a/src/framework/mlt_producer.c b/src/framework/mlt_producer.c
index 278d902..2a5b60e 100644
--- a/src/framework/mlt_producer.c
+++ b/src/framework/mlt_producer.c
@@ -36,39 +36,46 @@ static int producer_get_frame( mlt_service this, mlt_frame_ptr frame, int index
 
 int mlt_producer_init( mlt_producer this, void *child )
 {
-	// Initialise the producer
-	memset( this, 0, sizeof( struct mlt_producer_s ) );
-	
-	// Associate with the child
-	this->child = child;
+	// Check that we haven't received NULL
+	int error = this == NULL;
 
-	// Initialise the service
-	if ( mlt_service_init( &this->parent, this ) == 0 )
+	// Continue if no error
+	if ( error == 0 )
 	{
-		// The parent is the service
-		mlt_service parent = &this->parent;
-
-		// Get the properties of the parent
-		mlt_properties properties = mlt_service_properties( parent );
-
-		// Set the default properties
-		mlt_properties_set( properties, "mlt_type", "mlt_producer" );
-		mlt_properties_set_timecode( properties, "position", 0.0 );
-		mlt_properties_set_double( properties, "frame", 0 );
-		mlt_properties_set_double( properties, "fps", 25.0 );
-		mlt_properties_set_double( properties, "speed", 1.0 );
-		mlt_properties_set_timecode( properties, "in", 0.0 );
-		mlt_properties_set_timecode( properties, "out", 36000.0 );
-		mlt_properties_set_timecode( properties, "length", 36000.0 );
-		mlt_properties_set_int( properties, "known_length", 1 );
-		mlt_properties_set_double( properties, "aspect_ratio", 4.0 / 3.0 );
-		mlt_properties_set( properties, "log_id", "multitrack" );
-
-		// Override service get_frame
-		parent->get_frame = producer_get_frame;
+		// Initialise the producer
+		memset( this, 0, sizeof( struct mlt_producer_s ) );
+	
+		// Associate with the child
+		this->child = child;
+
+		// Initialise the service
+		if ( mlt_service_init( &this->parent, this ) == 0 )
+		{
+			// The parent is the service
+			mlt_service parent = &this->parent;
+	
+			// Get the properties of the parent
+			mlt_properties properties = mlt_service_properties( parent );
+	
+			// Set the default properties
+			mlt_properties_set( properties, "mlt_type", "mlt_producer" );
+			mlt_properties_set_position( properties, "position", 0.0 );
+			mlt_properties_set_double( properties, "frame", 0 );
+			mlt_properties_set_double( properties, "fps", 25.0 );
+			mlt_properties_set_double( properties, "speed", 1.0 );
+			mlt_properties_set_position( properties, "in", 0 );
+			mlt_properties_set_position( properties, "out", 1799999 );
+			mlt_properties_set_position( properties, "length", 1800000 );
+			mlt_properties_set_double( properties, "aspect_ratio", 4.0 / 3.0 );
+			mlt_properties_set( properties, "eof", "pause" );
+			mlt_properties_set( properties, "resource", "<producer>" );
+
+			// Override service get_frame
+			parent->get_frame = producer_get_frame;
+		}
 	}
 
-	return 0;
+	return error;
 }
 
 /** Get the parent service object.
@@ -87,94 +94,43 @@ mlt_properties mlt_producer_properties( mlt_producer this )
 	return mlt_service_properties( &this->parent );
 }
 
-/** Convert frame position to timecode.
+/** Seek to a specified position.
 */
 
-mlt_timecode mlt_producer_time( mlt_producer this, int64_t frame )
+int mlt_producer_seek( mlt_producer this, mlt_position position )
 {
-	if ( frame < 0 )
-		return -1;
-	else
-		return ( mlt_timecode )frame / mlt_producer_get_fps( this );
-}
+	// Determine eof handling
+	char *eof = mlt_properties_get( mlt_producer_properties( this ), "eof" );
 
-/** Convert timecode to frame position.
-*/
-
-int64_t mlt_producer_frame_position( mlt_producer this, mlt_timecode position )
-{
-	if ( position < 0 )
-		return -1;
-	else
-		return ( int64_t )( floor( position * mlt_producer_get_fps( this ) + 0.5 ) );
-}
-
-/** Seek to a specified time code.
-*/
-
-int mlt_producer_seek( mlt_producer this, mlt_timecode timecode )
-{
 	// Check bounds
-	if ( timecode < 0 )
-		timecode = 0;
-	if ( timecode > mlt_producer_get_playtime( this ) )
-		timecode = mlt_producer_get_playtime( this );
+	if ( position < 0 )
+		position = 0;
+	else if ( !strcmp( eof, "pause" ) && position >= mlt_producer_get_playtime( this ) )
+		position = mlt_producer_get_playtime( this ) - 1;
 
 	// Set the position
-	mlt_properties_set_timecode( mlt_producer_properties( this ), "position", timecode );
+	mlt_properties_set_position( mlt_producer_properties( this ), "position", position );
 
 	// Calculate the absolute frame
-	double frame = ( mlt_producer_get_in( this ) + timecode ) * mlt_producer_get_fps( this );
-	mlt_properties_set_double( mlt_producer_properties( this ), "frame", floor( frame + 0.5 ) );
-
-	return 0;
-}
-
-/** Seek to a specified absolute frame.
-*/
-
-int mlt_producer_seek_frame( mlt_producer this, int64_t frame )
-{
-	// Calculate the time code
-	double timecode = ( frame / mlt_producer_get_fps( this ) ) - mlt_producer_get_in( this );
-
-	// If timecode is invalid, then seek on time
-	if ( frame < 0 || timecode < 0 )
-	{
-		// Seek to the in point
-		mlt_producer_seek( this, 0 );
-	}
-	else if ( timecode > mlt_producer_get_playtime( this ) )
-	{
-		// Seek to the out point
-		mlt_producer_seek( this, mlt_producer_get_playtime( this ) );
-	}
-	else
-	{
-		// Set the position
-		mlt_properties_set_timecode( mlt_producer_properties( this ), "position", timecode );
-
-		// Set the absolute frame
-		mlt_properties_set_double( mlt_producer_properties( this ), "frame", frame );
-	}
+	mlt_properties_set_position( mlt_producer_properties( this ), "frame", mlt_producer_get_in( this ) + position );
 
 	return 0;
 }
 
-/** Get the current time code.
+/** Get the current position (relative to in point).
 */
 
-mlt_timecode mlt_producer_position( mlt_producer this )
+mlt_position mlt_producer_position( mlt_producer this )
 {
-	return mlt_properties_get_timecode( mlt_producer_properties( this ), "position" );
+	return mlt_properties_get_position( mlt_producer_properties( this ), "position" );
 }
 
-/** Get the current frame.
+/** Get the current position (relative to start of producer).
 */
 
-uint64_t mlt_producer_frame( mlt_producer this )
+mlt_position mlt_producer_frame( mlt_producer this )
 {
-	return mlt_properties_get_double( mlt_producer_properties( this ), "frame" );
+	return mlt_properties_get_position( mlt_producer_properties( this ), "frame" );
 }
 
 /** Set the playing speed.
@@ -204,32 +160,30 @@ double mlt_producer_get_fps( mlt_producer this )
 /** Set the in and out points.
 */
 
-int mlt_producer_set_in_and_out( mlt_producer this, mlt_timecode in, mlt_timecode out )
+int mlt_producer_set_in_and_out( mlt_producer this, mlt_position in, mlt_position out )
 {
 	// Correct ins and outs if necessary
 	if ( in < 0 )
 		in = 0;
-	if ( in > mlt_producer_get_length( this ) )
+	else if ( in > mlt_producer_get_length( this ) )
 		in = mlt_producer_get_length( this );
+
 	if ( out < 0 )
 		out = 0;
-	if ( out > mlt_producer_get_length( this ) )
+	else if ( out > mlt_producer_get_length( this ) )
 		out = mlt_producer_get_length( this );
 
 	// Swap ins and outs if wrong
 	if ( out < in )
 	{
-		mlt_timecode t = in;
+		mlt_position t = in;
 		in = out;
 		out = t;
 	}
 
 	// Set the values
-	mlt_properties_set_timecode( mlt_producer_properties( this ), "in", in );
-	mlt_properties_set_timecode( mlt_producer_properties( this ), "out", out );
-
-	// Seek to the in point
-	mlt_producer_seek( this, 0 );
+	mlt_properties_set_position( mlt_producer_properties( this ), "in", in );
+	mlt_properties_set_position( mlt_producer_properties( this ), "out", out );
 
 	return 0;
 }
@@ -237,33 +191,33 @@ int mlt_producer_set_in_and_out( mlt_producer this, mlt_timecode in, mlt_timecod
 /** Get the in point.
 */
 
-mlt_timecode mlt_producer_get_in( mlt_producer this )
+mlt_position mlt_producer_get_in( mlt_producer this )
 {
-	return mlt_properties_get_timecode( mlt_producer_properties( this ), "in" );
+	return mlt_properties_get_position( mlt_producer_properties( this ), "in" );
 }
 
 /** Get the out point.
 */
 
-mlt_timecode mlt_producer_get_out( mlt_producer this )
+mlt_position mlt_producer_get_out( mlt_producer this )
 {
-	return mlt_properties_get_timecode( mlt_producer_properties( this ), "out" );
+	return mlt_properties_get_position( mlt_producer_properties( this ), "out" );
 }
 
 /** Get the total play time.
 */
 
-mlt_timecode mlt_producer_get_playtime( mlt_producer this )
+mlt_position mlt_producer_get_playtime( mlt_producer this )
 {
-	return mlt_producer_get_out( this ) - mlt_producer_get_in( this );
+	return mlt_producer_get_out( this ) - mlt_producer_get_in( this ) + 1;
 }
 
 /** Get the total length of the producer.
 */
 
-mlt_timecode mlt_producer_get_length( mlt_producer this )
+mlt_position mlt_producer_get_length( mlt_producer this )
 {
-	return mlt_properties_get_timecode( mlt_producer_properties( this ), "length" );
+	return mlt_properties_get_position( mlt_producer_properties( this ), "length" );
 }
 
 /** Prepare for next frame.
@@ -271,7 +225,7 @@ mlt_timecode mlt_producer_get_length( mlt_producer this )
 
 void mlt_producer_prepare_next( mlt_producer this )
 {
-	mlt_producer_seek_frame( this, mlt_producer_frame( this ) + mlt_producer_get_speed( this ) );
+	mlt_producer_seek( this, mlt_producer_position( this ) + mlt_producer_get_speed( this ) );
 }
 
 /** Get a frame.
@@ -282,31 +236,32 @@ static int producer_get_frame( mlt_service service, mlt_frame_ptr frame, int ind
 	int result = 1;
 	mlt_producer this = service->child;
 
-	// A properly instatiated producer will have a get_frame method...
-	if ( this->get_frame != NULL )
-	{
-		// Get the frame from the implementation
-		result = this->get_frame( this, frame, index );
+	// Determine eof handling
+	char *eof = mlt_properties_get( mlt_producer_properties( this ), "eof" );
 
-		mlt_properties frame_properties = mlt_frame_properties( *frame );
-		double speed = mlt_producer_get_speed( this );
-		mlt_properties_set_double( frame_properties, "speed", speed );
-	}
-	else
+	// A properly instatiated producer will have a get_frame method...
+	if ( this->get_frame == NULL || ( !strcmp( eof, "continue" ) && mlt_producer_position( this ) > mlt_producer_get_out( this ) ) )
 	{
 		// Generate a test frame
 		*frame = mlt_frame_init( );
 
-		// Set the timecode
-		result = mlt_frame_set_timecode( *frame, mlt_producer_position( this ) );
+		// Set the position
+		result = mlt_frame_set_position( *frame, mlt_producer_position( this ) );
 
-		// Calculate the next timecode
+		// Calculate the next position
 		mlt_producer_prepare_next( this );
 	}
+	else
+	{
+		// Get the frame from the implementation
+		result = this->get_frame( this, frame, index );
+	}
 
-	// Copy the fps of the producer onto the frame
+	// Copy the fps and speed of the producer onto the frame
 	mlt_properties properties = mlt_frame_properties( *frame );
 	mlt_properties_set_double( properties, "fps", mlt_producer_get_fps( this ) );
+	double speed = mlt_producer_get_speed( this );
+	mlt_properties_set_double( properties, "speed", speed );
 
 	return 0;
 }