X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_producer.c;h=aece92b9a91582983b8fc680571e8d24e1746f87;hb=30bf05a2dc3d17d9cf87300e07e66828fd729c17;hp=3382d1190f8c97c15a0a46f6c134b6c070ee7851;hpb=8ad18633ab01f630da1f09a3efd3acc1307b46e7;p=melted

diff --git a/src/framework/mlt_producer.c b/src/framework/mlt_producer.c
index 3382d11..aece92b 100644
--- a/src/framework/mlt_producer.c
+++ b/src/framework/mlt_producer.c
@@ -89,11 +89,15 @@ 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_int( properties, "frame_rate_num", 25 );
+				mlt_properties_set_int( properties, "frame_rate_den", 1 );
 				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_int( properties, "frame_rate_num", 30000 );
+				mlt_properties_set_int( properties, "frame_rate_den", 1001 );
 				mlt_properties_set_double( properties, "aspect_ratio", 10.0 / 11.0 );
 			}
 			mlt_properties_set_double( properties, "_speed", 1.0 );
@@ -194,13 +198,14 @@ 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 < 0 || out >= mlt_producer_get_playtime( parent ) ) && !mlt_producer_is_blank( this ) )
-		out = mlt_producer_get_playtime( parent ) - 1;
+	if ( ( out < 0 || out >= mlt_producer_get_length( parent ) ) && !mlt_producer_is_blank( this ) )
+		out = mlt_producer_get_length( parent ) - 1;
 
 	mlt_properties_inc_ref( parent_props );
 	mlt_properties_set_int( properties, "_cut", 1 );
 	mlt_properties_set_data( properties, "_cut_parent", parent, 0, ( mlt_destructor )mlt_producer_close, NULL );
 	mlt_properties_set_position( properties, "length", mlt_properties_get_position( parent_props, "length" ) );
+	mlt_properties_set_double( properties, "aspect_ratio", mlt_properties_get_double( parent_props, "aspect_ratio" ) );
 	mlt_producer_set_in_and_out( result, in, out );
 
 	// Mini fezzik :-/
@@ -208,11 +213,6 @@ mlt_producer mlt_producer_cut( mlt_producer this, int in, int out )
 	mlt_properties_set_int( MLT_FILTER_PROPERTIES( filter ), "_fezzik", 1 );
 	mlt_producer_attach( result, filter );
 	mlt_filter_close( filter );
-	filter = mlt_factory_filter( "data_show", "%obscure.properties" );
-	mlt_properties_set_int( MLT_FILTER_PROPERTIES( filter ), "_fezzik", 1 );
-	mlt_producer_attach( result, filter );
-	mlt_filter_close( filter );
-	mlt_events_unblock( MLT_PRODUCER_PROPERTIES( result ), MLT_PRODUCER_PROPERTIES( result ) );
 
 	return result;
 }
@@ -249,18 +249,18 @@ int mlt_producer_seek( mlt_producer this, mlt_position position )
 		mlt_producer_seek( mlt_producer_cut_parent( this ), position + mlt_producer_get_in( this ) );
 
 	// Check bounds
-	if ( position < 0 )
+	if ( position < 0 || mlt_producer_get_playtime( this ) == 0 )
 	{
 		position = 0;
 	}
-	else if ( use_points && !strcmp( eof, "pause" ) && position >= mlt_producer_get_playtime( this ) )
+	else if ( use_points && ( eof == NULL || !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 );
+		position = (int)position % (int)mlt_producer_get_playtime( this );
 	}
 
 	// Set the position
@@ -508,6 +508,10 @@ 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 );
 
+		// This is useful and required by always_active transitions to determine in/out points of the cut
+		if ( mlt_properties_get_data( MLT_FRAME_PROPERTIES( *frame ), "_producer", NULL ) == MLT_PRODUCER_SERVICE( parent ) )
+			mlt_properties_set_data( MLT_FRAME_PROPERTIES( *frame ), "_producer", this, 0, NULL, NULL );
+
 		mlt_properties_set_double( MLT_FRAME_PROPERTIES( *frame ), "_speed", speed );
 		mlt_producer_prepare_next( this );
 	}
@@ -529,6 +533,8 @@ static int producer_get_frame( mlt_service service, mlt_frame_ptr frame, int ind
 			char *name = mlt_properties_get_name( p_props, i );
 			if ( !strncmp( name, "meta.", 5 ) )
 				mlt_properties_set( f_props, name, mlt_properties_get( p_props, name ) );
+			else if ( !strncmp( name, "set.", 4 ) )
+				mlt_properties_set( f_props, name + 4, mlt_properties_get( p_props, name ) );
 		}
 	}