X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_service.c;h=1301fd27eaacc9cf61903edb9049585d48efac3e;hb=b6232c93db568b3becc00019ca18e31bd92e54b5;hp=362f3cc8d927e12f01a808af90d29fec14d3d0d9;hpb=14a6dfabee044ad58d4ee2579b25d071d02588ec;p=melted diff --git a/src/framework/mlt_service.c b/src/framework/mlt_service.c index 362f3cc..1301fd2 100644 --- a/src/framework/mlt_service.c +++ b/src/framework/mlt_service.c @@ -25,6 +25,7 @@ #include #include #include +#include /** IMPORTANT NOTES @@ -48,6 +49,7 @@ typedef struct int filter_count; int filter_size; mlt_filter *filters; + pthread_mutex_t mutex; } mlt_service_base; @@ -88,6 +90,7 @@ int mlt_service_init( mlt_service this, void *child ) 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; @@ -99,6 +102,50 @@ static void mlt_service_property_changed( mlt_listener listener, mlt_properties 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 ); + 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, "" ) ) + type = producer_type; + else if ( !strcmp( resource, "" ) ) + type = playlist_type; + else if ( !strcmp( resource, "" ) ) + type = tractor_type; + else if ( !strcmp( resource, "" ) ) + type = multitrack_type; + else if ( !strcmp( mlt_type, "producer" ) ) + type = producer_type; + else if ( !strcmp( mlt_type, "filter" ) ) + type = filter_type; + else if ( !strcmp( mlt_type, "transition" ) ) + type = transition_type; + else if ( !strcmp( mlt_type, "consumer" ) ) + type = consumer_type; + else + type = unknown_type; + } + return type; +} + /** Connect a producer service. Returns: > 0 warning, == 0 success, < 0 serious error 1 = this service does not accept input @@ -113,6 +160,11 @@ int mlt_service_connect_producer( mlt_service this, mlt_service producer, int in // 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 ) @@ -139,7 +191,11 @@ int mlt_service_connect_producer( mlt_service this, mlt_service producer, int in // 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 ); @@ -266,43 +322,32 @@ mlt_properties mlt_service_properties( mlt_service self ) 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 filter_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( filter_properties, "in" ); - - // Hmm - special case for cuts - apply filters from the parent first - if ( mlt_properties_get_int( filter_properties, "_cut" ) ) - { - position -= this_in; - mlt_frame_set_position( frame, position ); - mlt_service_apply_filters( ( mlt_service )mlt_properties_get_data( filter_properties, "_cut_parent", NULL ), frame, 0 ); - } + mlt_position this_in = mlt_properties_get_position( service_properties, "in" ); + mlt_position this_out = mlt_properties_get_position( service_properties, "out" ); - if ( index == 0 || mlt_properties_get_int( filter_properties, "_filter_private" ) == 0 ) + if ( index == 0 || mlt_properties_get_int( service_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_properties properties = mlt_filter_properties( base->filters[ i ] ); 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 ) ) ) { - 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( filter_properties, "_cut" ) ) - mlt_frame_set_position( frame, position + this_in ); } /** Obtain a frame. @@ -310,20 +355,50 @@ void mlt_service_apply_filters( mlt_service this, mlt_frame frame, int index ) int mlt_service_get_frame( mlt_service this, mlt_frame_ptr frame, int index ) { - if ( this != NULL ) + 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 = this->get_frame( this, frame, index ); + 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 ) + { + mlt_properties_set_position( properties, "in", in ); + mlt_properties_set_position( properties, "out", out ); + } mlt_service_apply_filters( this, *frame, 1 ); - return result; + mlt_deque_push_back( MLT_FRAME_SERVICE_STACK( *frame ), this ); + } } - *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. @@ -335,7 +410,7 @@ int mlt_service_attach( mlt_service this, mlt_filter 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 ++ ) @@ -352,8 +427,8 @@ 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 ) ); + 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 ); @@ -378,7 +453,7 @@ int mlt_service_detach( mlt_service this, mlt_filter filter ) { 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 ) @@ -390,7 +465,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_events_disconnect( MLT_FILTER_PROPERTIES( filter ), this ); mlt_filter_close( filter ); mlt_events_fire( properties, "service-changed", NULL ); } @@ -418,8 +493,10 @@ mlt_filter mlt_service_filter( mlt_service this, int index ) 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 ); @@ -429,7 +506,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 ); + mlt_events_block( MLT_SERVICE_PROPERTIES( this ), this ); while( count -- ) mlt_service_detach( this, base->filters[ 0 ] ); free( base->filters ); @@ -438,9 +515,14 @@ void mlt_service_close( mlt_service this ) 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 ); + } }