Optimisations (part 0), pixel v percentage, reworked aspect ratio calcs, ante/post...

[melted] / src / framework / mlt_filter.c

diff --git a/src/framework/mlt_filter.c b/src/framework/mlt_filter.c
index af4a3c6..90dea22 100644 (file)
--- a/src/framework/mlt_filter.c
+++ b/src/framework/mlt_filter.c
@@ -45,9 +45,10 @@ int mlt_filter_init( mlt_filter this, void *child )
                service->get_frame = filter_get_frame;
 
                // Default in, out, track properties
-               mlt_properties_set_timecode( properties, "in", 0 );
-               mlt_properties_set_timecode( properties, "out", 0 );
+               mlt_properties_set_position( properties, "in", 0 );
+               mlt_properties_set_position( properties, "out", 0 );
                mlt_properties_set_int( properties, "track", 0 );
+               mlt_properties_set( properties, "resource", "<filter>" );
 
                return 0;
        }
@@ -62,6 +63,14 @@ mlt_service mlt_filter_service( mlt_filter this )
        return &this->parent;
 }
 
+/** Get the properties associated to this filter.
+*/
+
+mlt_properties mlt_filter_properties( mlt_filter this )
+{
+       return mlt_service_properties( mlt_filter_service( this ) );
+}
+
 /** Connect this filter to a producers track. Note that a filter only operates
        on a single track, and by default it operates on the entirety of that track.
 */
@@ -75,8 +84,8 @@ int mlt_filter_connect( mlt_filter this, mlt_service producer, int index )
        {
                mlt_properties properties = mlt_service_properties( &this->parent );
                this->producer = producer;
-               mlt_properties_set_timecode( properties, "in", 0 );
-               mlt_properties_set_timecode( properties, "out", 0 );
+               mlt_properties_set_position( properties, "in", 0 );
+               mlt_properties_set_position( properties, "out", 0 );
                mlt_properties_set_int( properties, "track", index );
        }
        
@@ -86,11 +95,11 @@ int mlt_filter_connect( mlt_filter this, mlt_service producer, int index )
 /** Tune the in/out points.
 */
 
-void mlt_filter_set_in_and_out( mlt_filter this, mlt_timecode in, mlt_timecode out )
+void mlt_filter_set_in_and_out( mlt_filter this, mlt_position in, mlt_position out )
 {
        mlt_properties properties = mlt_service_properties( &this->parent );
-       mlt_properties_set_timecode( properties, "in", in );
-       mlt_properties_set_timecode( properties, "out", out );
+       mlt_properties_set_position( properties, "in", in );
+       mlt_properties_set_position( properties, "out", out );
 }
 
 /** Return the track that this filter is operating on.
@@ -105,25 +114,25 @@ int mlt_filter_get_track( mlt_filter this )
 /** Get the in point.
 */
 
-mlt_timecode mlt_filter_get_in( mlt_filter this )
+mlt_position mlt_filter_get_in( mlt_filter this )
 {
        mlt_properties properties = mlt_service_properties( &this->parent );
-       return mlt_properties_get_timecode( properties, "in" );
+       return mlt_properties_get_position( properties, "in" );
 }
 
 /** Get the out point.
 */
 
-mlt_timecode mlt_filter_get_out( mlt_filter this )
+mlt_position mlt_filter_get_out( mlt_filter this )
 {
        mlt_properties properties = mlt_service_properties( &this->parent );
-       return mlt_properties_get_timecode( properties, "out" );
+       return mlt_properties_get_position( properties, "out" );
 }
 
 /** Process the frame.
 */
 
-static mlt_frame filter_process( mlt_filter this, mlt_frame frame )
+mlt_frame mlt_filter_process( mlt_filter this, mlt_frame frame )
 {
        if ( this->process == NULL )
                return frame;
@@ -149,12 +158,9 @@ static int filter_get_frame( mlt_service service, mlt_frame_ptr frame, int index
                int ret = mlt_service_get_frame( this->producer, frame, index );
                if ( ret == 0 )
                {
-                       if ( !mlt_frame_is_test_card( *frame ) )
-                       {
-                               mlt_timecode timecode = mlt_frame_get_timecode( *frame );
-                               if ( timecode >= in && ( out == 0 || timecode < out ) )
-                                       *frame = filter_process( this, *frame );
-                       }
+                       mlt_position position = mlt_frame_get_position( *frame );
+                       if ( position >= in && ( out == 0 || position < out ) )
+                               *frame = mlt_filter_process( this, *frame );
                        return 0;
                }
                else