X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_producer.c;h=63a443fffa99a0fcb4f0a7f3828ad9e29ad299a3;hb=2a800ec4c840132c7a629b764b673dce09771637;hp=c3ba4e6ba1c87410676cb8996ce987466541e6ec;hpb=2ec3359e476bc73d56e09fb597e1a424f2d1708d;p=melted

diff --git a/src/framework/mlt_producer.c b/src/framework/mlt_producer.c
index c3ba4e6..63a443f 100644
--- a/src/framework/mlt_producer.c
+++ b/src/framework/mlt_producer.c
@@ -20,6 +20,7 @@
 
 #include "config.h"
 #include "mlt_producer.h"
+#include "mlt_factory.h"
 #include "mlt_frame.h"
 #include <stdio.h>
 #include <string.h>
@@ -36,39 +37,57 @@ 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_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;
+		// 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 )
+		{
+			// Get the normalisation preference
+			char *normalisation = mlt_environment( "MLT_NORMALISATION" );
+
+			// 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 );
+			if ( normalisation == NULL || strcmp( normalisation, "NTSC" ) )
+			{
+				mlt_properties_set_double( properties, "fps", 25.0 );
+				mlt_properties_set_double( properties, "aspect_ratio", 72.0 / 79.0 );
+			}
+			else
+			{
+				mlt_properties_set_double( properties, "fps", 30000.0 / 1001.0 );
+				mlt_properties_set_double( properties, "aspect_ratio", 128.0 / 117.0 );
+			}
+			mlt_properties_set_double( properties, "_speed", 1.0 );
+			mlt_properties_set_position( properties, "in", 0 );
+			mlt_properties_set_position( properties, "out", 14999 );
+			mlt_properties_set_position( properties, "length", 15000 );
+			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.
@@ -97,15 +116,24 @@ int mlt_producer_seek( mlt_producer this, mlt_position position )
 
 	// Check bounds
 	if ( position < 0 )
+	{
 		position = 0;
+	}
 	else if ( !strcmp( eof, "pause" ) && position >= mlt_producer_get_playtime( this ) )
+	{
+		mlt_producer_set_speed( this, 0 );
 		position = mlt_producer_get_playtime( this ) - 1;
+	}
+	else if ( !strcmp( eof, "loop" ) && position >= mlt_producer_get_playtime( this ) )
+	{
+		position = position % mlt_producer_get_playtime( this );
+	}
 
 	// Set the position
-	mlt_properties_set_position( mlt_producer_properties( this ), "position", position );
+	mlt_properties_set_position( mlt_producer_properties( this ), "_position", position );
 
 	// Calculate the absolute frame
-	mlt_properties_set_position( mlt_producer_properties( this ), "frame", mlt_producer_get_in( this ) + position );
+	mlt_properties_set_position( mlt_producer_properties( this ), "_frame", mlt_producer_get_in( this ) + position );
 
 	return 0;
 }
@@ -115,11 +143,7 @@ int mlt_producer_seek( mlt_producer this, mlt_position position )
 
 mlt_position mlt_producer_position( mlt_producer this )
 {
-	//char *resource = mlt_properties_get( mlt_producer_properties( this ), "resource" );
-	//mlt_position frame = mlt_properties_get_position( mlt_producer_properties( this ), "frame" );
-	//mlt_position position = mlt_properties_get_position( mlt_producer_properties( this ), "position" );
-	//fprintf( stderr, "%s: %lld %lld\n", resource, frame, position );
-	return mlt_properties_get_position( mlt_producer_properties( this ), "position" );
+	return mlt_properties_get_position( mlt_producer_properties( this ), "_position" );
 }
 
 /** Get the current position (relative to start of producer).
@@ -127,7 +151,7 @@ mlt_position mlt_producer_position( mlt_producer this )
 
 mlt_position mlt_producer_frame( mlt_producer this )
 {
-	return mlt_properties_get_position( mlt_producer_properties( this ), "frame" );
+	return mlt_properties_get_position( mlt_producer_properties( this ), "_frame" );
 }
 
 /** Set the playing speed.
@@ -135,7 +159,7 @@ mlt_position mlt_producer_frame( mlt_producer this )
 
 int mlt_producer_set_speed( mlt_producer this, double speed )
 {
-	return mlt_properties_set_double( mlt_producer_properties( this ), "speed", speed );
+	return mlt_properties_set_double( mlt_producer_properties( this ), "_speed", speed );
 }
 
 /** Get the playing speed.
@@ -143,7 +167,7 @@ int mlt_producer_set_speed( mlt_producer this, double speed )
 
 double mlt_producer_get_speed( mlt_producer this )
 {
-	return mlt_properties_get_double( mlt_producer_properties( this ), "speed" );
+	return mlt_properties_get_double( mlt_producer_properties( this ), "_speed" );
 }
 
 /** Get the frames per second.
@@ -245,6 +269,10 @@ static int producer_get_frame( mlt_service service, mlt_frame_ptr frame, int ind
 		// Set the position
 		result = mlt_frame_set_position( *frame, mlt_producer_position( this ) );
 
+		// Mark as a test card
+		mlt_properties_set_int( mlt_frame_properties( *frame ), "test_image", 1 );
+		mlt_properties_set_int( mlt_frame_properties( *frame ), "test_audio", 1 );
+
 		// Calculate the next position
 		mlt_producer_prepare_next( this );
 	}
@@ -258,7 +286,7 @@ static int producer_get_frame( mlt_service service, mlt_frame_ptr frame, int ind
 	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 );
+	mlt_properties_set_double( properties, "_speed", speed );
 
 	return 0;
 }