In/out point handling on attached filters revisted

[mlt] / src / framework / mlt_service.c

diff --git a/src/framework/mlt_service.c b/src/framework/mlt_service.c
index 0851b9ae52b8496efdb6dd966ec543a6507bb2f4..e91e441523d70d550db1c26779f2ae349967461a 100644 (file)
--- a/src/framework/mlt_service.c
+++ b/src/framework/mlt_service.c
@@ -86,6 +86,7 @@ int mlt_service_init( mlt_service this, void *child )
                this->parent.close_object = this;
 
                mlt_events_init( &this->parent );
+               mlt_events_register( &this->parent, "service-changed", NULL );
                mlt_events_register( &this->parent, "property-changed", ( mlt_transmitter )mlt_service_property_changed );
        }
 
@@ -262,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 || out == 0 ) ) )
+                               {
+                                       mlt_filter_process( base->filters[ i ], frame );
+                                       mlt_properties_set_position( frame_properties, "_position", position - in );
+                                       mlt_service_apply_filters( mlt_filter_service( base->filters[ i ] ), frame, index + 1 );
+                                       mlt_properties_set_position( frame_properties, "_position", position );
+                               }
                        }
                }
        }
@@ -291,13 +302,18 @@ 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( );
        return 0;
 }
 
+static void mlt_service_filter_changed( mlt_service owner, mlt_service this )
+{
+       mlt_events_fire( mlt_service_properties( this ), "service-changed", NULL );
+}
+
 /** Attach a filter.
 */
 
@@ -324,9 +340,12 @@ int mlt_service_attach( mlt_service this, mlt_filter filter )
 
                        if ( base->filters != NULL )
                        {
+                               mlt_properties props = mlt_filter_properties( filter );
                                mlt_properties_inc_ref( mlt_filter_properties( filter ) );
                                base->filters[ base->filter_count ++ ] = filter;
                                mlt_events_fire( properties, "service-changed", NULL );
+                               mlt_events_listen( props, this, "service-changed", ( mlt_listener )mlt_service_filter_changed );
+                               mlt_events_listen( props, this, "property-changed", ( mlt_listener )mlt_service_filter_changed );
                        }
                        else
                        {
@@ -359,6 +378,7 @@ int mlt_service_detach( mlt_service this, mlt_filter filter )
                        for ( i ++ ; i < base->filter_count; i ++ )
                                base->filters[ i - 1 ] = base->filters[ i ];
                        base->filter_count --;
+                       mlt_events_disconnect( mlt_filter_properties( filter ), this );
                        mlt_filter_close( filter );
                        mlt_events_fire( properties, "service-changed", NULL );
                }
@@ -397,6 +417,7 @@ void mlt_service_close( mlt_service this )
                        mlt_service_base *base = this->local;
                        int i = 0;
                        int count = base->filter_count;
+                       mlt_events_block( mlt_service_properties( this ), this );
                        while( count -- )
                                mlt_service_detach( this, base->filters[ 0 ] );
                        free( base->filters );