X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_service.c;h=b1f5c25dd1c4342d3e848c489cd2f9e2e5a1e221;hb=de477d594bdd9c5d9ee2d3441cd0ccf49ab52feb;hp=bc0cf33bc6e0d9f2a56232a39906cff625858b91;hpb=55f4b82288ba162eeeedf63bbb99455cccd04b8d;p=melted

diff --git a/src/framework/mlt_service.c b/src/framework/mlt_service.c
index bc0cf33..b1f5c25 100644
--- a/src/framework/mlt_service.c
+++ b/src/framework/mlt_service.c
@@ -99,6 +99,41 @@ static void mlt_service_property_changed( mlt_listener listener, mlt_properties
 		listener( owner, this, ( char * )args[ 0 ] );
 }
 
+mlt_service_type mlt_service_identify( mlt_service this )
+{
+	mlt_service_type type = invalid_type;
+	if ( this != NULL )
+	{
+		mlt_properties properties = mlt_service_properties( this );
+		char *mlt_type = mlt_properties_get( properties, "mlt_type" );
+		char *resource = mlt_properties_get( properties, "resource" );
+		if ( mlt_type == NULL )
+			type = unknown_type;
+		else if ( !strcmp( mlt_type, "producer" ) )
+			type = producer_type;
+		else if ( !strcmp( mlt_type, "mlt_producer" ) )
+		{
+			if ( resource == NULL || !strcmp( resource, "<producer>" ) )
+				type = producer_type;
+			else if ( !strcmp( resource, "<playlist>" ) )
+				type = playlist_type;
+			else if ( !strcmp( resource, "<tractor>" ) )
+				type = tractor_type;
+			else if ( !strcmp( resource, "<multitrack>" ) )
+				type = multitrack_type;
+		}
+		else if ( !strcmp( mlt_type, "filter" ) )
+			type = filter_type;
+		else if ( !strcmp( mlt_type, "transition" ) )
+			type = transition_type;
+		else if ( !strcmp( mlt_type, "consumer" ) )
+			type = consumer_type;
+		else
+			type = unknown_type;
+	}
+	return type;
+}
+
 /** Connect a producer service.
 	Returns: > 0 warning, == 0 success, < 0 serious error
 			 1 = this service does not accept input
@@ -263,21 +298,32 @@ mlt_properties mlt_service_properties( mlt_service self )
 /** Recursively apply attached filters
 */
 
-static void apply_filters( mlt_service this, mlt_frame frame, int index )
+void mlt_service_apply_filters( mlt_service this, mlt_frame frame, int index )
 {
-	mlt_properties properties = mlt_service_properties( this );
-	mlt_service_base *base = this->local;
 	int i;
+	mlt_properties frame_properties = mlt_frame_properties( frame );
+	mlt_properties service_properties = mlt_service_properties( this );
+	mlt_service_base *base = this->local;
+	mlt_position position = mlt_frame_get_position( frame );
+	mlt_position this_in = mlt_properties_get_position( service_properties, "in" );
+	mlt_position this_out = mlt_properties_get_position( service_properties, "out" );
 
-	if ( mlt_properties_get_int( properties, "_filter_private" ) == 0 )
+	if ( index == 0 || mlt_properties_get_int( service_properties, "_filter_private" ) == 0 )
 	{
 		// Process the frame with the attached filters
 		for ( i = 0; i < base->filter_count; i ++ )
 		{
 			if ( base->filters[ i ] != NULL )
 			{
-				mlt_filter_process( base->filters[ i ], frame );
-				apply_filters( mlt_filter_service( base->filters[ i ] ), frame, index );
+				mlt_position in = mlt_filter_get_in( base->filters[ i ] );
+				mlt_position out = mlt_filter_get_out( base->filters[ i ] );
+				if ( ( in == 0 && out == 0 ) || ( position >= in && ( position <= out || out == 0 ) ) )
+				{
+					mlt_properties_set_position( frame_properties, "in", in == 0 ? this_in : in );
+					mlt_properties_set_position( frame_properties, "out", out == 0 ? this_out : out );
+					mlt_filter_process( base->filters[ i ], frame );
+					mlt_service_apply_filters( mlt_filter_service( base->filters[ i ] ), frame, index + 1 );
+				}
 			}
 		}
 	}
@@ -288,11 +334,23 @@ static void apply_filters( mlt_service this, mlt_frame frame, int index )
 
 int mlt_service_get_frame( mlt_service this, mlt_frame_ptr frame, int index )
 {
-	if ( this != NULL )
+	if ( this != NULL && this->get_frame != NULL )
 	{
-		int result = this->get_frame( this, frame, index );
+		int result = 0;
+		mlt_properties properties = mlt_service_properties( this );
+		mlt_position in = mlt_properties_get_position( properties, "in" );
+		mlt_position out = mlt_properties_get_position( properties, "out" );
+		result = this->get_frame( this, frame, index );
 		if ( result == 0 )
-			apply_filters( this, *frame, index );
+		{
+			if ( in >=0 && out > 0 )
+			{
+				properties = mlt_frame_properties( *frame );
+				mlt_properties_set_position( properties, "in", in );
+				mlt_properties_set_position( properties, "out", out );
+			}
+			mlt_service_apply_filters( this, *frame, 1 );
+		}
 		return result;
 	}
 	*frame = mlt_frame_init( );