X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_producer.c;h=a35d134ea453f762d0b93b4556c53eb3d7d608e8;hb=ad829dbc7677a2acc063635db14ce717eb40be50;hp=9ae6d798b568951dc9e4ae5c07ce76d4a3528878;hpb=0942454258a07166839a999c71b6fa35785ac70a;p=melted

diff --git a/src/framework/mlt_producer.c b/src/framework/mlt_producer.c
index 9ae6d79..a35d134 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>
@@ -51,6 +52,9 @@ int mlt_producer_init( mlt_producer this, void *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;
 	
@@ -61,12 +65,20 @@ int mlt_producer_init( mlt_producer this, void *child )
 			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 );
+			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", 1799999 );
-			mlt_properties_set_position( properties, "length", 1800000 );
-			mlt_properties_set_double( properties, "aspect_ratio", 4.0 / 3.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>" );
 
@@ -78,6 +90,16 @@ int mlt_producer_init( mlt_producer this, void *child )
 	return error;
 }
 
+/** Create a new producer.
+*/
+
+mlt_producer mlt_producer_new( )
+{
+	mlt_producer this = malloc( sizeof( struct mlt_producer_s ) );
+	mlt_producer_init( this, NULL );
+	return this;
+}
+
 /** Get the parent service object.
 */
 
@@ -101,18 +123,28 @@ int mlt_producer_seek( mlt_producer this, mlt_position position )
 {
 	// Determine eof handling
 	char *eof = mlt_properties_get( mlt_producer_properties( this ), "eof" );
+	int use_points = 1 - mlt_properties_get_int( mlt_producer_properties( this ), "ignore_points" );
 
 	// Check bounds
 	if ( position < 0 )
+	{
 		position = 0;
-	else if ( !strcmp( eof, "pause" ) && position >= mlt_producer_get_playtime( this ) )
+	}
+	else if ( use_points && !strcmp( eof, "pause" ) && position >= mlt_producer_get_playtime( this ) )
+	{
+		mlt_producer_set_speed( this, 0 );
 		position = mlt_producer_get_playtime( this ) - 1;
+	}
+	else if ( use_points && !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 );
 
 	// 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", use_points * mlt_producer_get_in( this ) + position );
 
 	return 0;
 }
@@ -240,8 +272,6 @@ static int producer_get_frame( mlt_service service, mlt_frame_ptr frame, int ind
 	char *eof = mlt_properties_get( mlt_producer_properties( this ), "eof" );
 
 	// A properly instatiated producer will have a get_frame method...
-//fprintf( stderr, "PRODUCER get_frame %p eof %s pos %lld out %lld\n",
-//this->get_frame, eof, mlt_producer_position( this ), mlt_producer_get_out( this ) );
 	if ( this->get_frame == NULL || ( !strcmp( eof, "continue" ) && mlt_producer_position( this ) > mlt_producer_get_out( this ) ) )
 	{
 		// Generate a test frame
@@ -250,6 +280,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 );
 	}
@@ -264,6 +298,8 @@ static int producer_get_frame( mlt_service service, mlt_frame_ptr frame, int ind
 	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_int( properties, "test_audio", mlt_frame_is_test_audio( *frame ) );
+	mlt_properties_set_int( properties, "test_image", mlt_frame_is_test_card( *frame ) );
 
 	return 0;
 }