* Copyright (C) 2003-2004 Ushodaya Enterprises Limited
* Author: Charles Yates <charles.yates@pandora.be>
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful,
+ * This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "config.h"
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <pthread.h>
/** IMPORTANT NOTES
int filter_count;
int filter_size;
mlt_filter *filters;
+ pthread_mutex_t mutex;
}
mlt_service_base;
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 );
+ pthread_mutex_init( &( ( mlt_service_base * )this->local )->mutex, NULL );
}
return error;
listener( owner, this, ( char * )args[ 0 ] );
}
+void mlt_service_lock( mlt_service this )
+{
+ if ( this != NULL )
+ pthread_mutex_lock( &( ( mlt_service_base * )this->local )->mutex );
+}
+
+void mlt_service_unlock( mlt_service this )
+{
+ if ( this != NULL )
+ pthread_mutex_unlock( &( ( mlt_service_base * )this->local )->mutex );
+}
+
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 );
+ 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 ( 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 )
// Increment the reference count on this producer
if ( producer != NULL )
- mlt_properties_inc_ref( mlt_service_properties( producer ) );
+ {
+ mlt_service_lock( producer );
+ mlt_properties_inc_ref( MLT_SERVICE_PROPERTIES( producer ) );
+ mlt_service_unlock( producer );
+ }
// Now we disconnect the producer service from its consumer
mlt_service_disconnect( producer );
void mlt_service_apply_filters( mlt_service this, mlt_frame frame, int index )
{
int i;
- mlt_properties frame_properties = mlt_frame_properties( frame );
- mlt_properties service_properties = mlt_service_properties( this );
+ 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" );
- // Hmm - special case for cuts - apply filters from the parent first
- if ( mlt_properties_get_int( service_properties, "_cut" ) )
- {
- mlt_service_apply_filters( ( mlt_service )mlt_properties_get_data( service_properties, "_cut_parent", NULL ), frame, 0 );
- position -= this_in;
- mlt_frame_set_position( frame, position );
- }
-
if ( index == 0 || mlt_properties_get_int( service_properties, "_filter_private" ) == 0 )
{
// Process the frame with the attached filters
{
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", 0 );
- mlt_properties_set_position( frame_properties, "out", out == 0 ? this_out - this_in : out - in );
- mlt_frame_set_position( frame, position - in );
+ 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 );
- mlt_frame_set_position( frame, position + in );
+ mlt_service_apply_filters( MLT_FILTER_SERVICE( base->filters[ i ] ), frame, index + 1 );
}
}
}
}
-
- if ( mlt_properties_get_int( service_properties, "_cut" ) )
- {
- mlt_properties_set_position( frame_properties, "in", this_in );
- mlt_properties_set_position( frame_properties, "out", this_out );
- mlt_frame_set_position( frame, position + this_in );
- }
}
/** Obtain a frame.
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_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 )
{
+ mlt_properties_inc_ref( properties );
+ properties = MLT_FRAME_PROPERTIES( *frame );
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 );
+ mlt_deque_push_back( MLT_FRAME_SERVICE_STACK( *frame ), this );
}
- return result;
}
- *frame = mlt_frame_init( );
- return 0;
+
+ // Make sure we return a frame
+ if ( *frame == NULL )
+ *frame = mlt_frame_init( );
+
+ // Unlock the service
+ mlt_service_unlock( this );
+
+ return result;
}
static void mlt_service_filter_changed( mlt_service owner, mlt_service this )
{
- mlt_events_fire( mlt_service_properties( this ), "service-changed", NULL );
+ mlt_events_fire( MLT_SERVICE_PROPERTIES( this ), "service-changed", NULL );
}
/** Attach a filter.
if ( error == 0 )
{
int i = 0;
- mlt_properties properties = mlt_service_properties( this );
+ mlt_properties properties = MLT_SERVICE_PROPERTIES( this );
mlt_service_base *base = this->local;
for ( i = 0; error == 0 && i < base->filter_count; i ++ )
if ( base->filters != NULL )
{
- mlt_properties props = mlt_filter_properties( filter );
- mlt_properties_inc_ref( mlt_filter_properties( filter ) );
+ 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 );
{
int i = 0;
mlt_service_base *base = this->local;
- mlt_properties properties = mlt_service_properties( this );
+ mlt_properties properties = MLT_SERVICE_PROPERTIES( this );
for ( i = 0; i < base->filter_count; i ++ )
if ( base->filters[ i ] == 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_events_disconnect( MLT_FILTER_PROPERTIES( filter ), this );
mlt_filter_close( filter );
mlt_events_fire( properties, "service-changed", NULL );
}
void mlt_service_close( mlt_service this )
{
- if ( this != NULL && mlt_properties_dec_ref( mlt_service_properties( this ) ) <= 0 )
+ mlt_service_lock( this );
+ if ( this != NULL && mlt_properties_dec_ref( MLT_SERVICE_PROPERTIES( this ) ) <= 0 )
{
+ mlt_service_unlock( this );
if ( this->close != NULL )
{
this->close( this->close_object );
mlt_service_base *base = this->local;
int i = 0;
int count = base->filter_count;
- mlt_events_block( mlt_service_properties( this ), this );
+ mlt_events_block( MLT_SERVICE_PROPERTIES( this ), this );
while( count -- )
mlt_service_detach( this, base->filters[ 0 ] );
free( base->filters );
mlt_service_close( base->in[ i ] );
this->parent.close = NULL;
free( base->in );
+ pthread_mutex_destroy( &base->mutex );
free( base );
mlt_properties_close( &this->parent );
}
}
+ else
+ {
+ mlt_service_unlock( this );
+ }
}
projects / melted / blobdiff