char *resource = mlt_properties_get( properties, "resource" );
if ( mlt_type == NULL )
type = unknown_type;
+ else 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, "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" ) )
// Get the service base
mlt_service_base *base = this->local;
+ // Special case 'track' index - only works for last filter(s) in a particular chain
+ // but allows a filter to apply to the output frame regardless of which track it comes from
+ if ( index == -1 )
+ index = 0;
+
// Check if the producer is already registered with this service
for ( i = 0; i < base->count; i ++ )
if ( base->in[ i ] == producer )
{
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 ) ) )
+ int disable = mlt_properties_get_int( MLT_FILTER_PROPERTIES( base->filters[ i ] ), "disable" );
+ if ( !disable && ( ( 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 );
int mlt_service_get_frame( mlt_service this, mlt_frame_ptr frame, int index )
{
+ int result = 0;
+
+ // Lock the service
mlt_service_lock( this );
+
+ // Ensure that the frame is NULL
+ *frame = NULL;
+
+ // Only process if we have a valid service
if ( this != NULL && this->get_frame != NULL )
{
- 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" );
- mlt_properties_inc_ref( properties );
- mlt_service_unlock( this );
+
result = this->get_frame( this, frame, index );
+
if ( result == 0 )
{
+ mlt_properties_inc_ref( properties );
properties = MLT_FRAME_PROPERTIES( *frame );
if ( in >=0 && out > 0 )
{
mlt_service_apply_filters( this, *frame, 1 );
mlt_deque_push_back( MLT_FRAME_SERVICE_STACK( *frame ), this );
}
- else
- {
- mlt_service_close( this );
- }
- return result;
}
+
+ // Make sure we return a frame
+ if ( *frame == NULL )
+ *frame = mlt_frame_init( );
+
+ // Unlock the service
mlt_service_unlock( this );
- *frame = mlt_frame_init( );
- return 0;
+
+ return result;
}
static void mlt_service_filter_changed( mlt_service owner, mlt_service this )