X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_service.c;h=92018657fc1baa5528d748001305321cce3101e5;hb=9c7b399431ffc490bf0dac9833a301f76f433623;hp=df416f0db9d25d86bc046c3be3f0b9ed511996dc;hpb=87ddb143a7f56e31c860d37631fb26f9821d3e48;p=melted diff --git a/src/framework/mlt_service.c b/src/framework/mlt_service.c index df416f0..9201865 100644 --- a/src/framework/mlt_service.c +++ b/src/framework/mlt_service.c @@ -3,28 +3,28 @@ * Copyright (C) 2003-2004 Ushodaya Enterprises Limited * Author: Charles Yates * - * 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 "mlt_service.h" #include "mlt_filter.h" #include "mlt_frame.h" #include #include #include +#include /** IMPORTANT NOTES @@ -48,6 +48,7 @@ typedef struct int filter_count; int filter_size; mlt_filter *filters; + pthread_mutex_t mutex; } mlt_service_base; @@ -88,6 +89,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,29 +101,36 @@ 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 ); + 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 = playlist_type; + else if (resource != NULL && !strcmp( resource, "" ) ) + type = tractor_type; + else if (resource != NULL && !strcmp( resource, "" ) ) + type = multitrack_type; else if ( !strcmp( mlt_type, "producer" ) ) type = producer_type; - else if ( !strcmp( mlt_type, "mlt_producer" ) ) - { - 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, "filter" ) ) type = filter_type; else if ( !strcmp( mlt_type, "transition" ) ) @@ -148,6 +157,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 ) @@ -174,7 +188,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 ); @@ -283,7 +301,7 @@ static int service_get_frame( mlt_service this, mlt_frame_ptr frame, int index ) if ( producer != NULL ) return mlt_service_get_frame( producer, frame, index ); } - *frame = mlt_frame_init( ); + *frame = mlt_frame_init( this ); return 0; } @@ -301,8 +319,8 @@ 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 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" ); @@ -317,12 +335,13 @@ void mlt_service_apply_filters( mlt_service this, mlt_frame frame, int index ) { 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_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_service_apply_filters( MLT_FILTER_SERVICE( base->filters[ i ] ), frame, index + 1 ); } } } @@ -334,32 +353,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 ) { + 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( this ); + + // 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. @@ -371,7 +408,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 ++ ) @@ -388,8 +425,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 ); @@ -414,7 +451,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 ) @@ -426,7 +463,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 ); } @@ -449,13 +486,23 @@ mlt_filter mlt_service_filter( mlt_service this, int index ) return filter; } +/** Retrieve the profile. +*/ + +mlt_profile mlt_service_profile( mlt_service this ) +{ + return mlt_properties_get_data( MLT_SERVICE_PROPERTIES( this ), "_profile", NULL ); +} + /** Close the service. */ 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 ); @@ -465,7 +512,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 ); @@ -474,9 +521,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 ); + } }