X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_producer.c;h=278d9026957b9455183024663a65c405bbfc11b3;hb=3cdcb361562ac24233535f04e88df5c99d7c24b2;hp=991c698767f9328c41dd7dea13226a60dbcb93e3;hpb=0cf7dff156fe3c541eb5d668e317cc73b008c7b0;p=melted

diff --git a/src/framework/mlt_producer.c b/src/framework/mlt_producer.c
index 991c698..278d902 100644
--- a/src/framework/mlt_producer.c
+++ b/src/framework/mlt_producer.c
@@ -54,15 +54,15 @@ int mlt_producer_init( mlt_producer this, void *child )
 		// 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", 1 );
+		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, "playtime", 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;
@@ -87,6 +87,28 @@ mlt_properties mlt_producer_properties( mlt_producer this )
 	return mlt_service_properties( &this->parent );
 }
 
+/** Convert frame position to timecode.
+*/
+
+mlt_timecode mlt_producer_time( mlt_producer this, int64_t frame )
+{
+	if ( frame < 0 )
+		return -1;
+	else
+		return ( mlt_timecode )frame / mlt_producer_get_fps( this );
+}
+
+/** 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.
 */
 
@@ -111,13 +133,13 @@ int mlt_producer_seek( mlt_producer this, mlt_timecode timecode )
 /** Seek to a specified absolute frame.
 */
 
-int mlt_producer_seek_frame( mlt_producer this, uint64_t 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 ( timecode < 0 )
+	if ( frame < 0 || timecode < 0 )
 	{
 		// Seek to the in point
 		mlt_producer_seek( this, 0 );
@@ -205,7 +227,6 @@ int mlt_producer_set_in_and_out( mlt_producer this, mlt_timecode in, mlt_timecod
 	// Set the values
 	mlt_properties_set_timecode( mlt_producer_properties( this ), "in", in );
 	mlt_properties_set_timecode( mlt_producer_properties( this ), "out", out );
-	mlt_properties_set_timecode( mlt_producer_properties( this ), "playtime", out - in );
 
 	// Seek to the in point
 	mlt_producer_seek( this, 0 );
@@ -234,7 +255,7 @@ mlt_timecode mlt_producer_get_out( mlt_producer this )
 
 mlt_timecode mlt_producer_get_playtime( mlt_producer this )
 {
-	return mlt_properties_get_timecode( mlt_producer_properties( this ), "playtime" );
+	return mlt_producer_get_out( this ) - mlt_producer_get_in( this );
 }
 
 /** Get the total length of the producer.
@@ -266,6 +287,10 @@ static int producer_get_frame( mlt_service service, mlt_frame_ptr frame, int ind
 	{
 		// Get the frame from the implementation
 		result = this->get_frame( this, frame, index );
+
+		mlt_properties frame_properties = mlt_frame_properties( *frame );
+		double speed = mlt_producer_get_speed( this );
+		mlt_properties_set_double( frame_properties, "speed", speed );
 	}
 	else
 	{