Consumer valerie, pushes, and assorted modifications

[melted] / src / framework / mlt_service.c

diff --git a/src/framework/mlt_service.c b/src/framework/mlt_service.c
index bc0cf33..9ea9b66 100644 (file)
--- a/src/framework/mlt_service.c
+++ b/src/framework/mlt_service.c
@@ -263,21 +263,31 @@ 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 filter_properties = mlt_service_properties( this );
+       mlt_service_base *base = this->local;
+       mlt_position position = mlt_properties_get_position( frame_properties, "_position" );
 
-       if ( mlt_properties_get_int( properties, "_filter_private" ) == 0 )
+       if ( index == 0 || mlt_properties_get_int( filter_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_properties properties = mlt_filter_properties( base->filters[ i ] );
+                               mlt_position in = mlt_properties_get_position( properties, "in" );
+                               mlt_position out = mlt_properties_get_position( properties, "out" );
+                               if ( ( in == 0 && out == 0 ) || ( position >= in && position <= out ) )
+                               {
+                                       mlt_properties_set_position( frame_properties, "_position", position - in );
+                                       mlt_filter_process( base->filters[ i ], frame );
+                                       mlt_service_apply_filters( mlt_filter_service( base->filters[ i ] ), frame, index + 1 );
+                                       mlt_properties_set_position( frame_properties, "_position", position + in );
+                               }
                        }
                }
        }
@@ -292,7 +302,7 @@ int mlt_service_get_frame( mlt_service this, mlt_frame_ptr frame, int index )
        {
                int result = this->get_frame( this, frame, index );
                if ( result == 0 )
-                       apply_filters( this, *frame, index );
+                       mlt_service_apply_filters( this, *frame, 1 );
                return result;
        }
        *frame = mlt_frame_init( );