X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fwestley%2Fproducer_westley.c;h=4921e78bb91cc13adc11ff35079f0ed9add9b278;hb=ae6e351c3e5bd7eef6e43f46d33d40d1977549da;hp=8705035a21245b96c4495afe818e430d0b35def5;hpb=a450db7b8af164bcc71255fd74d406be98c9eb21;p=melted diff --git a/src/modules/westley/producer_westley.c b/src/modules/westley/producer_westley.c index 8705035..4921e78 100644 --- a/src/modules/westley/producer_westley.c +++ b/src/modules/westley/producer_westley.c @@ -27,6 +27,7 @@ #include #include #include +#include #include #include // for xmlCreateFileParserCtxt @@ -53,7 +54,7 @@ enum service_type mlt_transition_type, mlt_consumer_type, mlt_field_type, - mlt_service_type, + mlt_services_type, mlt_dummy_filter_type, mlt_dummy_transition_type, mlt_dummy_producer_type, @@ -108,10 +109,10 @@ static int context_push_service( deserialise_context this, mlt_service that, enu this->stack_types[ this->stack_service_size++ ] = type; // Record the tree branch on which this service lives - if ( that != NULL && mlt_properties_get( mlt_service_properties( that ), "_westley_branch" ) == NULL ) + if ( that != NULL && mlt_properties_get( MLT_SERVICE_PROPERTIES( that ), "_westley_branch" ) == NULL ) { char s[ BRANCH_SIG_LEN ]; - mlt_properties_set( mlt_service_properties( that ), "_westley_branch", serialise_branch( this, s ) ); + mlt_properties_set( MLT_SERVICE_PROPERTIES( that ), "_westley_branch", serialise_branch( this, s ) ); } } return ret; @@ -172,13 +173,14 @@ static inline void qualify_property( deserialise_context context, mlt_properties if ( resource != NULL ) { // Qualify file name properties - char *root = mlt_properties_get( context->producer_map, "_root" ); - if ( root != NULL ) + char *root = mlt_properties_get( context->producer_map, "root" ); + if ( root != NULL && strcmp( root, "" ) ) { - char *full_resource = malloc( strlen( root ) + strlen( resource ) + 1 ); - if ( resource[ 0 ] != '/' ) + char *full_resource = malloc( strlen( root ) + strlen( resource ) + 2 ); + if ( resource[ 0 ] != '/' && strchr( resource, ':' ) == NULL ) { strcpy( full_resource, root ); + strcat( full_resource, "/" ); strcat( full_resource, resource ); } else @@ -208,14 +210,14 @@ static int add_producer( deserialise_context context, mlt_service service, mlt_p if ( service != NULL && container != NULL ) { - char *container_branch = mlt_properties_get( mlt_service_properties( container ), "_westley_branch" ); - char *service_branch = mlt_properties_get( mlt_service_properties( service ), "_westley_branch" ); + char *container_branch = mlt_properties_get( MLT_SERVICE_PROPERTIES( container ), "_westley_branch" ); + char *service_branch = mlt_properties_get( MLT_SERVICE_PROPERTIES( service ), "_westley_branch" ); contained = !strncmp( container_branch, service_branch, strlen( container_branch ) ); } if ( contained ) { - mlt_properties properties = mlt_service_properties( service ); + mlt_properties properties = MLT_SERVICE_PROPERTIES( service ); char *hide_s = mlt_properties_get( properties, "hide" ); // Indicate that this service is no longer top of stack @@ -278,28 +280,23 @@ static void attach_filters( mlt_service this, mlt_service that ) for ( i = 0; ( filter = mlt_service_filter( that, i ) ) != NULL; i ++ ) { mlt_service_attach( this, filter ); - attach_filters( mlt_filter_service( filter ), mlt_filter_service( filter ) ); + attach_filters( MLT_FILTER_SERVICE( filter ), MLT_FILTER_SERVICE( filter ) ); } } } static void on_start_tractor( deserialise_context context, const xmlChar *name, const xmlChar **atts) { - mlt_service service = mlt_tractor_service( mlt_tractor_new( ) ); - mlt_properties properties = mlt_service_properties( service ); + mlt_tractor tractor = mlt_tractor_new( ); + mlt_service service = MLT_TRACTOR_SERVICE( tractor ); + mlt_properties properties = MLT_SERVICE_PROPERTIES( service ); track_service( context->destructors, service, (mlt_destructor) mlt_tractor_close ); - mlt_properties_set_position( properties, "length", 0 ); - for ( ; atts != NULL && *atts != NULL; atts += 2 ) - mlt_properties_set( mlt_service_properties( service ), (char*) atts[0], (char*) atts[1] ); + mlt_properties_set( MLT_SERVICE_PROPERTIES( service ), (char*) atts[0], atts[1] == NULL ? "" : (char*) atts[1] ); - if ( mlt_properties_get_position( properties, "length" ) < mlt_properties_get_position( properties, "out" ) ) - { - mlt_position length = mlt_properties_get_position( properties, "out" ) + 1; - mlt_properties_set_position( properties, "length", length ); - } + mlt_properties_set_int( MLT_TRACTOR_PROPERTIES( tractor ), "global_feed", 1 ); if ( mlt_properties_get( properties, "id" ) != NULL ) mlt_properties_set_data( context->producer_map, mlt_properties_get( properties, "id" ), service, 0, NULL, NULL ); @@ -319,6 +316,10 @@ static void on_end_tractor( deserialise_context context, const xmlChar *name ) if ( add_producer( context, tractor, 0, mlt_producer_get_out( MLT_PRODUCER( tractor ) ) ) == 0 ) context_push_service( context, tractor, type ); } + else + { + fprintf( stderr, "Invalid state for tractor\n" ); + } } static void on_start_multitrack( deserialise_context context, const xmlChar *name, const xmlChar **atts) @@ -329,26 +330,27 @@ static void on_start_multitrack( deserialise_context context, const xmlChar *nam // If we don't have a parent, then create one now, providing we're in a state where we can if ( parent == NULL || ( type == mlt_playlist_type || type == mlt_multitrack_type ) ) { + mlt_tractor tractor = NULL; // Push the parent back if ( parent != NULL ) context_push_service( context, parent, type ); // Create a tractor to contain the multitrack - parent = mlt_tractor_service( mlt_tractor_new( ) ); + tractor = mlt_tractor_new( ); + parent = MLT_TRACTOR_SERVICE( tractor ); track_service( context->destructors, parent, (mlt_destructor) mlt_tractor_close ); type = mlt_tractor_type; // Flag it as a synthesised tractor for clean up later - mlt_properties_set_int( mlt_service_properties( parent ), "fezzik_synth", 1 ); + mlt_properties_set_int( MLT_SERVICE_PROPERTIES( parent ), "fezzik_synth", 1 ); } if ( type == mlt_tractor_type ) { mlt_service service = MLT_SERVICE( mlt_tractor_multitrack( MLT_TRACTOR( parent ) ) ); - mlt_properties properties = mlt_service_properties( service ); - mlt_properties_set_position( properties, "length", 0 ); + mlt_properties properties = MLT_SERVICE_PROPERTIES( service ); for ( ; atts != NULL && *atts != NULL; atts += 2 ) - mlt_properties_set( properties, (char*) atts[0], (char*) atts[1] ); + mlt_properties_set( properties, (char*) atts[0], atts[1] == NULL ? "" : (char*) atts[1] ); if ( mlt_properties_get( properties, "id" ) != NULL ) mlt_properties_set_data( context->producer_map, mlt_properties_get( properties,"id" ), service, 0, NULL, NULL ); @@ -374,16 +376,15 @@ static void on_end_multitrack( deserialise_context context, const xmlChar *name static void on_start_playlist( deserialise_context context, const xmlChar *name, const xmlChar **atts) { - mlt_service service = mlt_playlist_service( mlt_playlist_init() ); - mlt_properties properties = mlt_service_properties( service ); + mlt_playlist playlist = mlt_playlist_init( ); + mlt_service service = MLT_PLAYLIST_SERVICE( playlist ); + mlt_properties properties = MLT_SERVICE_PROPERTIES( service ); track_service( context->destructors, service, (mlt_destructor) mlt_playlist_close ); - mlt_properties_set_position( properties, "length", 0 ); - for ( ; atts != NULL && *atts != NULL; atts += 2 ) { - mlt_properties_set( properties, ( char* )atts[0], ( char* )atts[1] ); + mlt_properties_set( properties, (char*) atts[0], atts[1] == NULL ? "" : (char*) atts[1] ); // Out will be overwritten later as we append, so we need to save it if ( strcmp( atts[ 0 ], "out" ) == 0 ) @@ -404,20 +405,10 @@ static void on_end_playlist( deserialise_context context, const xmlChar *name ) if ( service != NULL && type == mlt_playlist_type ) { - mlt_properties properties = mlt_service_properties( service ); + mlt_properties properties = MLT_SERVICE_PROPERTIES( service ); mlt_position in = mlt_properties_get_position( properties, "in" ); - mlt_position out; - - if ( mlt_properties_get( properties, "_westley.out" ) != NULL ) - out = mlt_properties_get_position( properties, "_westley.out" ); - else - out = mlt_properties_get_position( properties, "length" ) - 1; - - if ( mlt_properties_get_position( properties, "length" ) < out ) - mlt_properties_set_position( properties, "length", out + 1 ); + mlt_position out = mlt_properties_get_position( properties, "out" ); - mlt_producer_set_in_and_out( MLT_PRODUCER( service ), in, out ); - // See if the playlist should be added to a playlist or multitrack if ( add_producer( context, service, in, out ) == 0 ) context_push_service( context, service, type ); @@ -434,19 +425,19 @@ static void on_start_producer( deserialise_context context, const xmlChar *name, mlt_service service = calloc( 1, sizeof( struct mlt_service_s ) ); mlt_service_init( service, NULL ); - mlt_properties properties = mlt_service_properties( service ); + mlt_properties properties = MLT_SERVICE_PROPERTIES( service ); context_push_service( context, service, mlt_dummy_producer_type ); for ( ; atts != NULL && *atts != NULL; atts += 2 ) - mlt_properties_set( properties, (char*) atts[0], (char*) atts[1] ); + mlt_properties_set( properties, (char*) atts[0], atts[1] == NULL ? "" : (char*) atts[1] ); } static void on_end_producer( deserialise_context context, const xmlChar *name ) { enum service_type type; mlt_service service = context_pop_service( context, &type ); - mlt_properties properties = mlt_service_properties( service ); + mlt_properties properties = MLT_SERVICE_PROPERTIES( service ); if ( service != NULL && type == mlt_dummy_producer_type ) { @@ -479,6 +470,9 @@ static void on_end_producer( deserialise_context context, const xmlChar *name ) if ( producer == NULL && resource != NULL ) producer = MLT_SERVICE( mlt_factory_producer( "fezzik", resource ) ); + if ( producer == NULL ) + producer = MLT_SERVICE( mlt_factory_producer( "fezzik", "+INVALID.txt" ) ); + // Track this producer track_service( context->destructors, producer, (mlt_destructor) mlt_producer_close ); @@ -511,7 +505,7 @@ static void on_end_producer( deserialise_context context, const xmlChar *name ) mlt_properties_set( properties, "out", NULL ); // Inherit the properties - mlt_properties_inherit( mlt_service_properties( producer ), properties ); + mlt_properties_inherit( MLT_SERVICE_PROPERTIES( producer ), properties ); // Attach all filters from service onto producer attach_filters( producer, service ); @@ -532,7 +526,7 @@ static void on_end_producer( deserialise_context context, const xmlChar *name ) if ( parent != NULL ) { // Get the parent properties - properties = mlt_service_properties( parent ); + properties = MLT_SERVICE_PROPERTIES( parent ); char *resource = mlt_properties_get( properties, "resource" ); @@ -548,7 +542,7 @@ static void on_end_producer( deserialise_context context, const xmlChar *name ) else { // Otherwise, set in and out on producer directly - mlt_producer_set_in_and_out( MLT_PRODUCER( service ), in, out ); + mlt_producer_set_in_and_out( MLT_PRODUCER( producer ), in, out ); } } else @@ -557,7 +551,7 @@ static void on_end_producer( deserialise_context context, const xmlChar *name ) mlt_producer_set_in_and_out( MLT_PRODUCER( producer ), in, out ); } } - + // Push the producer onto the stack context_push_service( context, producer, mlt_producer_type ); } @@ -597,7 +591,84 @@ static void on_start_blank( deserialise_context context, const xmlChar *name, co } } -static void on_start_entry_track( deserialise_context context, const xmlChar *name, const xmlChar **atts) +static void on_start_entry( deserialise_context context, const xmlChar *name, const xmlChar **atts) +{ + mlt_producer entry = NULL; + mlt_properties temp = mlt_properties_new( ); + + for ( ; atts != NULL && *atts != NULL; atts += 2 ) + { + mlt_properties_set( temp, (char*) atts[0], atts[1] == NULL ? "" : (char*) atts[1] ); + + // Look for the producer attribute + if ( strcmp( atts[ 0 ], "producer" ) == 0 ) + { + mlt_producer producer = mlt_properties_get_data( context->producer_map, (char*) atts[1], NULL ); + if ( producer != NULL ) + mlt_properties_set_data( temp, "producer", producer, 0, NULL, NULL ); + } + } + + // If we have a valid entry + if ( mlt_properties_get_data( temp, "producer", NULL ) != NULL ) + { + mlt_playlist_clip_info info; + enum service_type parent_type; + mlt_service parent = context_pop_service( context, &parent_type ); + mlt_producer producer = mlt_properties_get_data( temp, "producer", NULL ); + + if ( parent_type == mlt_playlist_type ) + { + // Append the producer to the playlist + if ( mlt_properties_get( temp, "in" ) != NULL || mlt_properties_get( temp, "out" ) != NULL ) + { + mlt_playlist_append_io( MLT_PLAYLIST( parent ), producer, + mlt_properties_get_position( temp, "in" ), + mlt_properties_get_position( temp, "out" ) ); + } + else + { + mlt_playlist_append( MLT_PLAYLIST( parent ), producer ); + } + + // Handle the repeat property + if ( mlt_properties_get_int( temp, "repeat" ) > 0 ) + { + mlt_playlist_repeat_clip( MLT_PLAYLIST( parent ), + mlt_playlist_count( MLT_PLAYLIST( parent ) ) - 1, + mlt_properties_get_int( temp, "repeat" ) ); + } + + mlt_playlist_get_clip_info( MLT_PLAYLIST( parent ), &info, mlt_playlist_count( MLT_PLAYLIST( parent ) ) - 1 ); + entry = info.cut; + } + else + { + fprintf( stderr, "Entry not part of a playlist...\n" ); + } + + context_push_service( context, parent, parent_type ); + } + + // Push the cut onto the stack + context_push_service( context, MLT_PRODUCER_SERVICE( entry ), mlt_entry_type ); + + mlt_properties_close( temp ); +} + +static void on_end_entry( deserialise_context context, const xmlChar *name ) +{ + // Get the entry from the stack + enum service_type entry_type; + mlt_service entry = context_pop_service( context, &entry_type ); + + if ( entry == NULL && entry_type != mlt_entry_type ) + { + fprintf( stderr, "Invalid state at end of entry\n" ); + } +} + +static void on_start_track( deserialise_context context, const xmlChar *name, const xmlChar **atts) { // use a dummy service to hold properties to allow arbitrary nesting mlt_service service = calloc( 1, sizeof( struct mlt_service_s ) ); @@ -606,21 +677,18 @@ static void on_start_entry_track( deserialise_context context, const xmlChar *na // Push the dummy service onto the stack context_push_service( context, service, mlt_entry_type ); - if ( strcmp( name, "entry" ) == 0 ) - mlt_properties_set( mlt_service_properties( service ), "resource", "" ); - else - mlt_properties_set( mlt_service_properties( service ), "resource", "" ); + mlt_properties_set( MLT_SERVICE_PROPERTIES( service ), "resource", "" ); for ( ; atts != NULL && *atts != NULL; atts += 2 ) { - mlt_properties_set( mlt_service_properties( service ), (char*) atts[0], (char*) atts[1] ); + mlt_properties_set( MLT_SERVICE_PROPERTIES( service ), (char*) atts[0], atts[1] == NULL ? "" : (char*) atts[1] ); // Look for the producer attribute if ( strcmp( atts[ 0 ], "producer" ) == 0 ) { mlt_producer producer = mlt_properties_get_data( context->producer_map, (char*) atts[1], NULL ); if ( producer != NULL ) - mlt_properties_set_data( mlt_service_properties( service ), "producer", producer, 0, NULL, NULL ); + mlt_properties_set_data( MLT_SERVICE_PROPERTIES( service ), "producer", producer, 0, NULL, NULL ); } } } @@ -633,13 +701,13 @@ static void on_end_track( deserialise_context context, const xmlChar *name ) if ( track != NULL && track_type == mlt_entry_type ) { - mlt_properties track_props = mlt_service_properties( track ); + mlt_properties track_props = MLT_SERVICE_PROPERTIES( track ); enum service_type parent_type; mlt_service parent = context_pop_service( context, &parent_type ); mlt_multitrack multitrack = NULL; mlt_producer producer = mlt_properties_get_data( track_props, "producer", NULL ); - mlt_properties producer_props = mlt_producer_properties( producer ); + mlt_properties producer_props = MLT_PRODUCER_PROPERTIES( producer ); if ( parent_type == mlt_tractor_type ) multitrack = mlt_tractor_multitrack( MLT_TRACTOR( parent ) ); @@ -650,18 +718,23 @@ static void on_end_track( deserialise_context context, const xmlChar *name ) if ( multitrack != NULL ) { - // Set the track on the multitrack - mlt_multitrack_connect( multitrack, producer, mlt_multitrack_count( multitrack ) ); - // Set producer i/o if specified if ( mlt_properties_get( track_props, "in" ) != NULL || - mlt_properties_get( track_props, "out" ) != NULL ) + mlt_properties_get( track_props, "out" ) != NULL ) { - mlt_producer_set_in_and_out( MLT_PRODUCER( producer ), + mlt_producer cut = mlt_producer_cut( MLT_PRODUCER( producer ), mlt_properties_get_position( track_props, "in" ), mlt_properties_get_position( track_props, "out" ) ); + mlt_multitrack_connect( multitrack, cut, mlt_multitrack_count( multitrack ) ); + mlt_properties_inherit( MLT_PRODUCER_PROPERTIES( cut ), track_props ); + track_props = MLT_PRODUCER_PROPERTIES( cut ); + mlt_producer_close( cut ); } - + else + { + mlt_multitrack_connect( multitrack, producer, mlt_multitrack_count( multitrack ) ); + } + // Set the hide state of the track producer char *hide_s = mlt_properties_get( track_props, "hide" ); if ( hide_s != NULL ) @@ -686,57 +759,13 @@ static void on_end_track( deserialise_context context, const xmlChar *name ) } } -static void on_end_entry( deserialise_context context, const xmlChar *name ) -{ - // Get the entry from the stack - enum service_type entry_type; - mlt_service entry = context_pop_service( context, &entry_type ); - - if ( entry != NULL && entry_type == mlt_entry_type ) - { - mlt_properties entry_props = mlt_service_properties( entry ); - enum service_type parent_type; - mlt_service parent = context_pop_service( context, &parent_type ); - mlt_producer producer = mlt_properties_get_data( entry_props, "producer", NULL ); - - if ( parent_type == mlt_playlist_type ) - { - // Append the producer to the playlist - if ( mlt_properties_get( mlt_service_properties( entry ), "in" ) != NULL || - mlt_properties_get( mlt_service_properties( entry ), "out" ) != NULL ) - { - mlt_playlist_append_io( MLT_PLAYLIST( parent ), producer, - mlt_properties_get_position( mlt_service_properties( entry ), "in" ), - mlt_properties_get_position( mlt_service_properties( entry ), "out" ) ); - } - else - { - mlt_playlist_append( MLT_PLAYLIST( parent ), producer ); - } - } - else - { - fprintf( stderr, "Invalid position for an entry...\n" ); - } - - if ( parent != NULL ) - context_push_service( context, parent, parent_type ); - - mlt_service_close( entry ); - } - else - { - fprintf( stderr, "Invalid state at end of entry\n" ); - } -} - static void on_start_filter( deserialise_context context, const xmlChar *name, const xmlChar **atts) { // use a dummy service to hold properties to allow arbitrary nesting mlt_service service = calloc( 1, sizeof( struct mlt_service_s ) ); mlt_service_init( service, NULL ); - mlt_properties properties = mlt_service_properties( service ); + mlt_properties properties = MLT_SERVICE_PROPERTIES( service ); context_push_service( context, service, mlt_dummy_filter_type ); @@ -749,7 +778,7 @@ static void on_end_filter( deserialise_context context, const xmlChar *name ) { enum service_type type; mlt_service service = context_pop_service( context, &type ); - mlt_properties properties = mlt_service_properties( service ); + mlt_properties properties = MLT_SERVICE_PROPERTIES( service ); enum service_type parent_type; mlt_service parent = context_pop_service( context, &parent_type ); @@ -757,7 +786,7 @@ static void on_end_filter( deserialise_context context, const xmlChar *name ) if ( service != NULL && type == mlt_dummy_filter_type ) { mlt_service filter = MLT_SERVICE( mlt_factory_filter( mlt_properties_get( properties, "mlt_service" ), NULL ) ); - mlt_properties filter_props = mlt_service_properties( filter ); + mlt_properties filter_props = MLT_SERVICE_PROPERTIES( filter ); track_service( context->destructors, filter, (mlt_destructor) mlt_filter_close ); @@ -811,7 +840,7 @@ static void on_start_transition( deserialise_context context, const xmlChar *nam mlt_service service = calloc( 1, sizeof( struct mlt_service_s ) ); mlt_service_init( service, NULL ); - mlt_properties properties = mlt_service_properties( service ); + mlt_properties properties = MLT_SERVICE_PROPERTIES( service ); context_push_service( context, service, mlt_dummy_transition_type ); @@ -824,7 +853,7 @@ static void on_end_transition( deserialise_context context, const xmlChar *name { enum service_type type; mlt_service service = context_pop_service( context, &type ); - mlt_properties properties = mlt_service_properties( service ); + mlt_properties properties = MLT_SERVICE_PROPERTIES( service ); enum service_type parent_type; mlt_service parent = context_pop_service( context, &parent_type ); @@ -832,7 +861,7 @@ static void on_end_transition( deserialise_context context, const xmlChar *name if ( service != NULL && type == mlt_dummy_transition_type ) { mlt_service effect = MLT_SERVICE( mlt_factory_transition(mlt_properties_get(properties,"mlt_service"), NULL ) ); - mlt_properties effect_props = mlt_service_properties( effect ); + mlt_properties effect_props = MLT_SERVICE_PROPERTIES( effect ); track_service( context->destructors, effect, (mlt_destructor) mlt_transition_close ); @@ -853,6 +882,8 @@ static void on_end_transition( deserialise_context context, const xmlChar *name if ( parent_type == mlt_tractor_type ) { mlt_field field = mlt_tractor_field( MLT_TRACTOR( parent ) ); + if ( mlt_properties_get_int( properties, "a_track" ) == mlt_properties_get_int( properties, "b_track" ) ) + mlt_properties_set_int( properties, "b_track", mlt_properties_get_int( properties, "a_track" ) + 1 ); mlt_field_plant_transition( field, MLT_TRANSITION( effect ), mlt_properties_get_int( properties, "a_track" ), mlt_properties_get_int( properties, "b_track" ) ); @@ -886,7 +917,7 @@ static void on_start_property( deserialise_context context, const xmlChar *name, { enum service_type type; mlt_service service = context_pop_service( context, &type ); - mlt_properties properties = mlt_service_properties( service ); + mlt_properties properties = MLT_SERVICE_PROPERTIES( service ); char *value = NULL; if ( service != NULL ) @@ -900,9 +931,9 @@ static void on_start_property( deserialise_context context, const xmlChar *name, value = (char*) atts[ 1 ]; } - if ( context->property != NULL && value != NULL ) - mlt_properties_set( properties, context->property, value ); - + if ( context->property != NULL ) + mlt_properties_set( properties, context->property, value == NULL ? "" : value ); + // Tell parser to collect any further nodes for serialisation context->is_value = 1; @@ -918,7 +949,7 @@ static void on_end_property( deserialise_context context, const xmlChar *name ) { enum service_type type; mlt_service service = context_pop_service( context, &type ); - mlt_properties properties = mlt_service_properties( service ); + mlt_properties properties = MLT_SERVICE_PROPERTIES( service ); if ( service != NULL ) { @@ -938,7 +969,7 @@ static void on_end_property( deserialise_context context, const xmlChar *name ) xmlFreeDoc( context->value_doc ); context->value_doc = NULL; } - + // Close this property handling free( context->property ); context->property = NULL; @@ -992,14 +1023,19 @@ static void on_start_element( void *ctx, const xmlChar *name, const xmlChar **at on_start_producer( context, name, atts ); else if ( strcmp( name, "blank" ) == 0 ) on_start_blank( context, name, atts ); - else if ( strcmp( name, "entry" ) == 0 || strcmp( name, "track" ) == 0 ) - on_start_entry_track( context, name, atts ); + else if ( strcmp( name, "entry" ) == 0 ) + on_start_entry( context, name, atts ); + else if ( strcmp( name, "track" ) == 0 ) + on_start_track( context, name, atts ); else if ( strcmp( name, "filter" ) == 0 ) on_start_filter( context, name, atts ); else if ( strcmp( name, "transition" ) == 0 ) on_start_transition( context, name, atts ); else if ( strcmp( name, "property" ) == 0 ) on_start_property( context, name, atts ); + else if ( strcmp( name, "westley" ) == 0 ) + for ( ; atts != NULL && *atts != NULL; atts += 2 ) + mlt_properties_set( context->producer_map, ( char * )atts[ 0 ], ( char * )atts[ 1 ] ); } static void on_end_element( void *ctx, const xmlChar *name ) @@ -1040,7 +1076,7 @@ static void on_characters( void *ctx, const xmlChar *ch, int len ) char *value = calloc( len + 1, 1 ); enum service_type type; mlt_service service = context_pop_service( context, &type ); - mlt_properties properties = mlt_service_properties( service ); + mlt_properties properties = MLT_SERVICE_PROPERTIES( service ); if ( service != NULL ) context_push_service( context, service, type ); @@ -1111,6 +1147,8 @@ static void on_internal_subset( void *ctx, const xmlChar* name, params_to_entities( context ); } +// TODO: Check this with Dan... I think this is for westley parameterisation +// but it's breaking standard escaped entities (like < etc). static void on_entity_declaration( void *ctx, const xmlChar* name, int type, const xmlChar* publicId, const xmlChar* systemId, xmlChar* content) { @@ -1120,7 +1158,8 @@ static void on_entity_declaration( void *ctx, const xmlChar* name, int type, xmlAddDocEntity( context->entity_doc, name, type, publicId, systemId, content ); } -xmlEntityPtr on_get_entity( void *ctx, const xmlChar* name ) +// TODO: Check this functionality (see on_entity_declaration) +static xmlEntityPtr on_get_entity( void *ctx, const xmlChar* name ) { struct _xmlParserCtxt *xmlcontext = ( struct _xmlParserCtxt* )ctx; deserialise_context context = ( deserialise_context )( xmlcontext->_private ); @@ -1137,11 +1176,15 @@ xmlEntityPtr on_get_entity( void *ctx, const xmlChar* name ) // Add our parameters if not already params_to_entities( context ); - e = xmlGetDocEntity( context->entity_doc, name ); + e = xmlGetPredefinedEntity( name ); // Send signal to on_characters that an entity substitutin is pending - if ( e != NULL ) - context->entity_is_replace = 1; + if ( e == NULL ) + { + e = xmlGetDocEntity( context->entity_doc, name ); + if ( e != NULL ) + context->entity_is_replace = 1; + } return e; } @@ -1213,38 +1256,75 @@ static void parse_url( mlt_properties properties, char *url ) mlt_properties_set( properties, name, value ); } -mlt_producer producer_westley_init( char *url ) +// Quick workaround to avoid unecessary libxml2 warnings +static int file_exists( char *file ) +{ + char *name = strdup( file ); + int exists = 0; + if ( name != NULL && strchr( name, '?' ) ) + *( strchr( name, '?' ) ) = '\0'; + if ( name != NULL ) + { + FILE *f = fopen( name, "r" ); + exists = f != NULL; + if ( exists ) fclose( f ); + } + free( name ); + return exists; +} + +mlt_producer producer_westley_init( int info, char *data ) { - if ( url == NULL ) - return NULL; xmlSAXHandler *sax = calloc( 1, sizeof( xmlSAXHandler ) ); struct deserialise_context_s *context = calloc( 1, sizeof( struct deserialise_context_s ) ); mlt_properties properties = NULL; int i = 0; struct _xmlParserCtxt *xmlcontext; int well_formed = 0; - char *filename = strdup( url ); - + char *filename = NULL; + + if ( data == NULL || !strcmp( data, "" ) || ( info == 0 && !file_exists( data ) ) ) + return NULL; + + context = calloc( 1, sizeof( struct deserialise_context_s ) ); + if ( context == NULL ) + return NULL; + context->producer_map = mlt_properties_new(); context->destructors = mlt_properties_new(); context->params = mlt_properties_new(); - // Decode URL and parse parameters - parse_url( context->params, url_decode( filename, url ) ); + // Decode URL and parse parameters + mlt_properties_set( context->producer_map, "root", "" ); + if ( info == 0 ) + { + filename = strdup( data ); + parse_url( context->params, url_decode( filename, data ) ); - // We need to track the number of registered filters - mlt_properties_set_int( context->destructors, "registered", 0 ); + // We need the directory prefix which was used for the westley + if ( strchr( filename, '/' ) ) + { + char *root = NULL; + mlt_properties_set( context->producer_map, "root", filename ); + root = mlt_properties_get( context->producer_map, "root" ); + *( strrchr( root, '/' ) ) = '\0'; - // We need the directory prefix which was used for the westley - mlt_properties_set( context->producer_map, "_root", "" ); - if ( strchr( filename, '/' ) ) - { - char *root = NULL; - mlt_properties_set( context->producer_map, "_root", filename ); - root = mlt_properties_get( context->producer_map, "_root" ); - *( strrchr( root, '/' ) + 1 ) = '\0'; + // If we don't have an absolute path here, we're heading for disaster... + if ( root[ 0 ] != '/' ) + { + char *cwd = getcwd( NULL, 0 ); + char *real = malloc( strlen( cwd ) + strlen( root ) + 2 ); + sprintf( real, "%s/%s", cwd, root ); + mlt_properties_set( context->producer_map, "root", real ); + free( real ); + free( cwd ); + } + } } + // We need to track the number of registered filters + mlt_properties_set_int( context->destructors, "registered", 0 ); + // Setup SAX callbacks sax->startElement = on_start_element; sax->endElement = on_end_element; @@ -1259,7 +1339,23 @@ mlt_producer producer_westley_init( char *url ) xmlSubstituteEntitiesDefault( 1 ); // This is used to facilitate entity substitution in the SAX parser context->entity_doc = xmlNewDoc( "1.0" ); - xmlcontext = xmlCreateFileParserCtxt( filename ); + if ( info == 0 ) + xmlcontext = xmlCreateFileParserCtxt( filename ); + else + xmlcontext = xmlCreateMemoryParserCtxt( data, strlen( data ) ); + + // Invalid context - clean up and return NULL + if ( xmlcontext == NULL ) + { + mlt_properties_close( context->producer_map ); + mlt_properties_close( context->destructors ); + mlt_properties_close( context->params ); + free( context ); + free( sax ); + free( filename ); + return NULL; + } + xmlcontext->sax = sax; xmlcontext->_private = ( void* )context; @@ -1282,7 +1378,7 @@ mlt_producer producer_westley_init( char *url ) { // Verify it is a producer service (mlt_type="mlt_producer") // (producer, playlist, multitrack) - char *type = mlt_properties_get( mlt_service_properties( service ), "mlt_type" ); + char *type = mlt_properties_get( MLT_SERVICE_PROPERTIES( service ), "mlt_type" ); if ( type == NULL || ( strcmp( type, "mlt_producer" ) != 0 && strcmp( type, "producer" ) != 0 ) ) service = NULL; } @@ -1296,6 +1392,7 @@ mlt_producer producer_westley_init( char *url ) if ( well_formed && service != NULL ) { + char *title = mlt_properties_get( context->producer_map, "title" ); // Need the complete producer list for various reasons properties = context->destructors; @@ -1313,15 +1410,20 @@ mlt_producer producer_westley_init( char *url ) // We are done referencing destructor property list // Set this var to service properties for convenience - properties = mlt_service_properties( service ); + properties = MLT_SERVICE_PROPERTIES( service ); - // make the returned service destroy the connected services - mlt_properties_set_data( properties, "__destructors__", context->destructors, 0, (mlt_destructor) mlt_properties_close, NULL ); + // Assign the title + mlt_properties_set( properties, "title", title ); + + // Optimise for overlapping producers + mlt_producer_optimise( MLT_PRODUCER( service ) ); + // Handle deep copies if ( getenv( "MLT_WESTLEY_DEEP" ) == NULL ) { // Now assign additional properties - mlt_properties_set( properties, "resource", url ); + if ( info == 0 ) + mlt_properties_set( properties, "resource", data ); // This tells consumer_westley not to deep copy mlt_properties_set( properties, "westley", "was here" ); @@ -1329,6 +1431,7 @@ mlt_producer producer_westley_init( char *url ) else { // Allow the project to be edited + mlt_properties_set( properties, "_westley", "was here" ); mlt_properties_set_int( properties, "_mlt_service_hidden", 1 ); } } @@ -1336,15 +1439,13 @@ mlt_producer producer_westley_init( char *url ) { // Return null if not well formed service = NULL; - - // Clean up - mlt_properties_close( context->destructors ); } // Clean up mlt_properties_close( context->producer_map ); if ( context->params != NULL ) mlt_properties_close( context->params ); + mlt_properties_close( context->destructors ); free( context ); free( filename );