X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_producer.c;h=9ed89af5ad7449a690e82687e2d75c257772ac65;hb=2e467c2eeba2b51aecddda21d4bb97bef4cd1459;hp=f29f4c5802ab10a1fd0325d880fa104e0ea2c28e;hpb=87ddb143a7f56e31c860d37631fb26f9821d3e48;p=melted

diff --git a/src/framework/mlt_producer.c b/src/framework/mlt_producer.c
index f29f4c5..9ed89af 100644
--- a/src/framework/mlt_producer.c
+++ b/src/framework/mlt_producer.c
@@ -78,12 +78,12 @@ int mlt_producer_init( mlt_producer this, void *child )
 			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 );
+				mlt_properties_set_double( properties, "aspect_ratio", 59.0 / 54.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, "aspect_ratio", 10.0 / 11.0 );
 			}
 			mlt_properties_set_double( properties, "_speed", 1.0 );
 			mlt_properties_set_position( properties, "in", 0 );
@@ -162,6 +162,14 @@ int mlt_producer_is_mix( mlt_producer this )
 	return tractor != NULL;
 }
 
+/** Determine if the producer is a blank [from a playlist].
+*/
+
+int mlt_producer_is_blank( mlt_producer this )
+{
+	return this == NULL || !strcmp( mlt_properties_get( mlt_producer_properties( mlt_producer_cut_parent( this ) ), "resource" ), "blank" );
+}
+
 /** Obtain the parent producer.
 */
 
@@ -187,7 +195,7 @@ mlt_producer mlt_producer_cut( mlt_producer this, int in, int out )
 	// Special case - allow for a cut of the entire producer (this will squeeze all other cuts to 0)
 	if ( in <= 0 )
 		in = 0;
-	if ( out >= mlt_producer_get_playtime( parent ) )
+	if ( out >= mlt_producer_get_playtime( parent ) && !mlt_producer_is_blank( this ) )
 		out = mlt_producer_get_playtime( parent ) - 1;
 
 	mlt_properties_inc_ref( parent_props );
@@ -310,7 +318,7 @@ int mlt_producer_set_in_and_out( mlt_producer this, mlt_position in, mlt_positio
 
 	if ( out < 0 )
 		out = 0;
-	else if ( out > mlt_producer_get_length( this ) )
+	else if ( out > mlt_producer_get_length( this ) && !mlt_producer_is_blank( this ) )
 		out = mlt_producer_get_length( this );
 
 	// Swap ins and outs if wrong
@@ -393,9 +401,9 @@ void mlt_producer_prepare_next( mlt_producer this )
 static int producer_get_frame( mlt_service service, mlt_frame_ptr frame, int index )
 {
 	int result = 1;
-	mlt_producer this = service->child;
+	mlt_producer this = service != NULL ? service->child : NULL;
 
-	if ( !mlt_producer_is_cut( this ) )
+	if ( this != NULL && !mlt_producer_is_cut( this ) )
 	{
 		// Get the properties of this producer
 		mlt_properties properties = mlt_producer_properties( this );
@@ -443,8 +451,11 @@ static int producer_get_frame( mlt_service service, mlt_frame_ptr frame, int ind
 		if ( mlt_properties_get_data( properties, "_producer", NULL ) == NULL )
 			mlt_properties_set_data( properties, "_producer", service, 0, NULL, NULL );
 	}
-	else
+	else if ( this != NULL )
 	{
+		// Get the speed of the cut
+		double speed = mlt_producer_get_speed( this );
+
 		// Get the parent of this cut
 		mlt_producer parent = mlt_producer_cut_parent( this );
 
@@ -484,6 +495,14 @@ static int producer_get_frame( mlt_service service, mlt_frame_ptr frame, int ind
 
 		// We're done with the clone now
 		mlt_properties_set_data( parent_properties, "use_clone", NULL, 0, NULL, NULL );
+
+		mlt_properties_set_double( mlt_frame_properties( *frame ), "_speed", speed );
+		mlt_producer_prepare_next( this );
+	}
+	else
+	{
+		*frame = mlt_frame_init( );
+		result = 0;
 	}
 
 	return result;
@@ -524,16 +543,7 @@ static mlt_producer mlt_producer_clone( mlt_producer this )
 	char *service = mlt_properties_get( properties, "mlt_service" );
 
 	if ( service != NULL )
-	{
-		char temp[ 1024 ];
-		strncpy( temp, service, 1024 );
-		if ( resource != NULL )
-		{
-			strcat( temp, ":" );
-			strncat( temp, resource, 1023 - strlen( temp ) );
-		}
-		clone = mlt_factory_producer( "fezzik", temp );
-	}
+		clone = mlt_factory_producer( service, resource );
 
 	if ( clone == NULL && resource != NULL )
 		clone = mlt_factory_producer( "fezzik", resource );