X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fwestley%2Fproducer_westley.c;h=0a6654035adc69c7c034fb3e5f3973040fef27c0;hb=4fc3fa1bf4116848c423837437d75f103cdd0154;hp=18aa86bb7212878e4e4c89f7cca0132ddd0d64a0;hpb=de477d594bdd9c5d9ee2d3441cd0ccf49ab52feb;p=melted diff --git a/src/modules/westley/producer_westley.c b/src/modules/westley/producer_westley.c index 18aa86b..0a66540 100644 --- a/src/modules/westley/producer_westley.c +++ b/src/modules/westley/producer_westley.c @@ -3,25 +3,24 @@ * Copyright (C) 2003-2004 Ushodaya Enterprises Limited * Author: Dan Dennedy * - * 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 */ // TODO: destroy unreferenced producers (they are currently destroyed // when the returned producer is closed). -#include "producer_westley.h" #include #include #include @@ -36,6 +35,9 @@ #define STACK_SIZE 1000 #define BRANCH_SIG_LEN 4000 +#define _x (const xmlChar*) +#define _s (const char*) + #undef DEBUG #ifdef DEBUG extern xmlDocPtr westley_make_doc( mlt_service service ); @@ -79,6 +81,7 @@ struct deserialise_context_s const xmlChar *publicId; const xmlChar *systemId; mlt_properties params; + mlt_profile profile; }; typedef struct deserialise_context_s *deserialise_context; @@ -109,10 +112,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; @@ -167,7 +170,7 @@ static void track_service( mlt_properties properties, void *service, mlt_destruc // Prepend the property value with the document root -static inline void qualify_property( deserialise_context context, mlt_properties properties, char *name ) +static inline void qualify_property( deserialise_context context, mlt_properties properties, const char *name ) { char *resource = mlt_properties_get( properties, name ); if ( resource != NULL ) @@ -204,20 +207,20 @@ static int add_producer( deserialise_context context, mlt_service service, mlt_p int result = 0; // Get the parent producer - enum service_type type; + enum service_type type = mlt_invalid_type; mlt_service container = context_pop_service( context, &type ); int contained = 0; 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 @@ -280,28 +283,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 ), (const char*) atts[0], atts[1] == NULL ? "" : (const 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 ); @@ -321,6 +319,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) @@ -331,26 +333,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, (const char*) atts[0], atts[1] == NULL ? "" : (const 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 ); @@ -376,20 +379,19 @@ 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, (const char*) atts[0], atts[1] == NULL ? "" : (const char*) atts[1] ); // Out will be overwritten later as we append, so we need to save it - if ( strcmp( atts[ 0 ], "out" ) == 0 ) - mlt_properties_set( properties, "_westley.out", ( char* )atts[ 1 ] ); + if ( xmlStrcmp( atts[ 0 ], _x("out") ) == 0 ) + mlt_properties_set( properties, "_westley.out", ( const char* )atts[ 1 ] ); } if ( mlt_properties_get( properties, "id" ) != NULL ) @@ -406,20 +408,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 ); @@ -436,19 +428,57 @@ 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, (const char*) atts[0], atts[1] == NULL ? "" : (const char*) atts[1] ); +} + +// Parse a SMIL clock value (as produced by Kino 0.9.1) and return position in frames +static mlt_position parse_clock_value( char *value, double fps ) +{ + // This implementation expects a fully specified clock value - no optional + // parts (e.g. 1:05) + char *pos, *copy = strdup( value ); + int hh, mm, ss, ms; + mlt_position result = -1; + + value = copy; + pos = strchr( value, ':' ); + if ( !pos ) + return result; + *pos = '\0'; + hh = atoi( value ); + value = pos + 1; + + pos = strchr( value, ':' ); + if ( !pos ) + return result; + *pos = '\0'; + mm = atoi( value ); + value = pos + 1; + + pos = strchr( value, '.' ); + if ( !pos ) + return result; + *pos = '\0'; + ss = atoi( value ); + value = pos + 1; + + ms = atoi( value ); + free( copy ); + result = ( fps * ( ( (hh * 3600) + (mm * 60) + ss ) * 1000 + ms ) / 1000 + 0.5 ); + + return result; } 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 ) { @@ -474,13 +504,19 @@ static void on_end_producer( deserialise_context context, const xmlChar *name ) strcat( temp, ":" ); strncat( temp, resource, 1023 - strlen( temp ) ); } - producer = MLT_SERVICE( mlt_factory_producer( "fezzik", temp ) ); + producer = MLT_SERVICE( mlt_factory_producer( context->profile, "fezzik", temp ) ); } // Just in case the plugin requested doesn't exist... if ( producer == NULL && resource != NULL ) - producer = MLT_SERVICE( mlt_factory_producer( "fezzik", resource ) ); + producer = MLT_SERVICE( mlt_factory_producer( context->profile, "fezzik", resource ) ); + if ( producer == NULL ) + producer = MLT_SERVICE( mlt_factory_producer( context->profile, "fezzik", "+INVALID.txt" ) ); + + if ( producer == NULL ) + producer = MLT_SERVICE( mlt_factory_producer( context->profile, "fezzik", "colour:red" ) ); + // Track this producer track_service( context->destructors, producer, (mlt_destructor) mlt_producer_close ); @@ -500,20 +536,35 @@ static void on_end_producer( deserialise_context context, const xmlChar *name ) in = mlt_properties_get_position( properties, "in" ); // Let Kino-SMIL clipBegin be a synonym for in if ( mlt_properties_get( properties, "clipBegin" ) != NULL ) - in = mlt_properties_get_position( properties, "clipBegin" ); + { + if ( strchr( mlt_properties_get( properties, "clipBegin" ), ':' ) ) + // Parse clock value + in = parse_clock_value( mlt_properties_get( properties, "clipBegin" ), + mlt_producer_get_fps( MLT_PRODUCER( producer ) ) ); + else + // Parse frames value + in = mlt_properties_get_position( properties, "clipBegin" ); + } // Get out if ( mlt_properties_get( properties, "out" ) != NULL ) out = mlt_properties_get_position( properties, "out" ); // Let Kino-SMIL clipEnd be a synonym for out if ( mlt_properties_get( properties, "clipEnd" ) != NULL ) - out = mlt_properties_get_position( properties, "clipEnd" ); - + { + if ( strchr( mlt_properties_get( properties, "clipEnd" ), ':' ) ) + // Parse clock value + out = parse_clock_value( mlt_properties_get( properties, "clipEnd" ), + mlt_producer_get_fps( MLT_PRODUCER( producer ) ) ); + else + // Parse frames value + out = mlt_properties_get_position( properties, "clipEnd" ); + } // Remove in and out mlt_properties_set( properties, "in", NULL ); 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 ); @@ -534,7 +585,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" ); @@ -550,7 +601,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 @@ -559,7 +610,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 ); } @@ -580,9 +631,9 @@ static void on_start_blank( deserialise_context context, const xmlChar *name, co // Look for the length attribute for ( ; atts != NULL && *atts != NULL; atts += 2 ) { - if ( strcmp( atts[0], "length" ) == 0 ) + if ( xmlStrcmp( atts[0], _x("length") ) == 0 ) { - length = atoll( atts[1] ); + length = atoll( _s(atts[1]) ); break; } } @@ -606,12 +657,12 @@ static void on_start_entry( deserialise_context context, const xmlChar *name, co for ( ; atts != NULL && *atts != NULL; atts += 2 ) { - mlt_properties_set( temp, (char*) atts[0], (char*) atts[1] ); + mlt_properties_set( temp, (const char*) atts[0], atts[1] == NULL ? "" : (const char*) atts[1] ); // Look for the producer attribute - if ( strcmp( atts[ 0 ], "producer" ) == 0 ) + if ( xmlStrcmp( atts[ 0 ], _x("producer") ) == 0 ) { - mlt_producer producer = mlt_properties_get_data( context->producer_map, (char*) atts[1], NULL ); + mlt_producer producer = mlt_properties_get_data( context->producer_map, (const char*) atts[1], NULL ); if ( producer != NULL ) mlt_properties_set_data( temp, "producer", producer, 0, NULL, NULL ); } @@ -621,7 +672,7 @@ static void on_start_entry( deserialise_context context, const xmlChar *name, co if ( mlt_properties_get_data( temp, "producer", NULL ) != NULL ) { mlt_playlist_clip_info info; - enum service_type parent_type; + enum service_type parent_type = invalid_type; mlt_service parent = context_pop_service( context, &parent_type ); mlt_producer producer = mlt_properties_get_data( temp, "producer", NULL ); @@ -659,7 +710,7 @@ static void on_start_entry( deserialise_context context, const xmlChar *name, co } // Push the cut onto the stack - context_push_service( context, mlt_producer_service( entry ), mlt_entry_type ); + context_push_service( context, MLT_PRODUCER_SERVICE( entry ), mlt_entry_type ); mlt_properties_close( temp ); } @@ -667,7 +718,7 @@ static void on_start_entry( deserialise_context context, const xmlChar *name, co static void on_end_entry( deserialise_context context, const xmlChar *name ) { // Get the entry from the stack - enum service_type entry_type; + enum service_type entry_type = invalid_type; mlt_service entry = context_pop_service( context, &entry_type ); if ( entry == NULL && entry_type != mlt_entry_type ) @@ -685,18 +736,18 @@ static void on_start_track( deserialise_context context, const xmlChar *name, co // Push the dummy service onto the stack context_push_service( context, service, mlt_entry_type ); - 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 ), (const char*) atts[0], atts[1] == NULL ? "" : (const char*) atts[1] ); // Look for the producer attribute - if ( strcmp( atts[ 0 ], "producer" ) == 0 ) + if ( xmlStrcmp( atts[ 0 ], _x("producer") ) == 0 ) { - mlt_producer producer = mlt_properties_get_data( context->producer_map, (char*) atts[1], NULL ); + mlt_producer producer = mlt_properties_get_data( context->producer_map, (const 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 ); } } } @@ -709,13 +760,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 ); - enum service_type parent_type; + mlt_properties track_props = MLT_SERVICE_PROPERTIES( track ); + enum service_type parent_type = invalid_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 ) ); @@ -726,17 +777,16 @@ static void on_end_track( deserialise_context context, const xmlChar *name ) if ( multitrack != NULL ) { - // Set the track on the multitrack - // Set producer i/o if specified - if ( mlt_properties_get( track_props, "in" ) != NULL && + if ( mlt_properties_get( track_props, "in" ) != NULL || mlt_properties_get( track_props, "out" ) != NULL ) { mlt_producer cut = mlt_producer_cut( MLT_PRODUCER( producer ), mlt_properties_get_position( track_props, "in" ), mlt_properties_get_position( track_props, "out" ) ); - mlt_properties_set_int( mlt_producer_properties( cut ), "cut", 1 ); 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 @@ -774,28 +824,28 @@ static void on_start_filter( deserialise_context context, const xmlChar *name, c 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 ); // Set the properties for ( ; atts != NULL && *atts != NULL; atts += 2 ) - mlt_properties_set( properties, (char*) atts[0], (char*) atts[1] ); + mlt_properties_set( properties, (const char*) atts[0], (const char*) atts[1] ); } 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; + enum service_type parent_type = invalid_type; mlt_service parent = context_pop_service( context, &parent_type ); 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_service filter = MLT_SERVICE( mlt_factory_filter( context->profile, mlt_properties_get( properties, "mlt_service" ), NULL ) ); + mlt_properties filter_props = MLT_SERVICE_PROPERTIES( filter ); track_service( context->destructors, filter, (mlt_destructor) mlt_filter_close ); @@ -849,28 +899,29 @@ 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 ); // Set the properties for ( ; atts != NULL && *atts != NULL; atts += 2 ) - mlt_properties_set( properties, (char*) atts[0], (char*) atts[1] ); + mlt_properties_set( properties, (const char*) atts[0], (const char*) atts[1] ); } 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; + enum service_type parent_type = invalid_type; mlt_service parent = context_pop_service( context, &parent_type ); 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 ); + char *id = mlt_properties_get( properties, "mlt_service" ); + mlt_service effect = MLT_SERVICE( mlt_factory_transition( context->profile, id, NULL ) ); + mlt_properties effect_props = MLT_SERVICE_PROPERTIES( effect ); track_service( context->destructors, effect, (mlt_destructor) mlt_transition_close ); @@ -891,6 +942,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" ) ); @@ -924,7 +977,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 ) @@ -932,15 +985,15 @@ static void on_start_property( deserialise_context context, const xmlChar *name, // Set the properties for ( ; atts != NULL && *atts != NULL; atts += 2 ) { - if ( strcmp( atts[ 0 ], "name" ) == 0 ) - context->property = strdup( atts[ 1 ] ); - else if ( strcmp( atts[ 0 ], "value" ) == 0 ) - value = (char*) atts[ 1 ]; + if ( xmlStrcmp( atts[ 0 ], _x("name") ) == 0 ) + context->property = strdup( _s(atts[ 1 ]) ); + else if ( xmlStrcmp( atts[ 0 ], _x("value") ) == 0 ) + value = _s(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; @@ -948,7 +1001,7 @@ static void on_start_property( deserialise_context context, const xmlChar *name, } else { - fprintf( stderr, "Property without a service '%s'?\n", ( char * )name ); + fprintf( stderr, "Property without a service '%s'?\n", ( const char * )name ); } } @@ -956,7 +1009,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 ) { @@ -971,12 +1024,12 @@ static void on_end_property( deserialise_context context, const xmlChar *name ) // Serialise the tree to get value xmlDocDumpMemory( context->value_doc, &value, &size ); - mlt_properties_set( properties, context->property, value ); + mlt_properties_set( properties, context->property, _s(value) ); xmlFree( value ); xmlFreeDoc( context->value_doc ); context->value_doc = NULL; } - + // Close this property handling free( context->property ); context->property = NULL; @@ -985,7 +1038,7 @@ static void on_end_property( deserialise_context context, const xmlChar *name ) } else { - fprintf( stderr, "Property without a service '%s'??\n", (char *)name ); + fprintf( stderr, "Property without a service '%s'??\n", (const char *)name ); } } @@ -1006,7 +1059,7 @@ static void on_start_element( void *ctx, const xmlChar *name, const xmlChar **at if ( context->value_doc == NULL ) { // Start a new tree - context->value_doc = xmlNewDoc( "1.0" ); + context->value_doc = xmlNewDoc( _x("1.0") ); xmlDocSetRootElement( context->value_doc, node ); } else @@ -1020,29 +1073,29 @@ static void on_start_element( void *ctx, const xmlChar *name, const xmlChar **at for ( ; atts != NULL && *atts != NULL; atts += 2 ) xmlSetProp( node, atts[ 0 ], atts[ 1 ] ); } - else if ( strcmp( name, "tractor" ) == 0 ) + else if ( xmlStrcmp( name, _x("tractor") ) == 0 ) on_start_tractor( context, name, atts ); - else if ( strcmp( name, "multitrack" ) == 0 ) + else if ( xmlStrcmp( name, _x("multitrack") ) == 0 ) on_start_multitrack( context, name, atts ); - else if ( strcmp( name, "playlist" ) == 0 || strcmp( name, "seq" ) == 0 || strcmp( name, "smil" ) == 0 ) + else if ( xmlStrcmp( name, _x("playlist") ) == 0 || xmlStrcmp( name, _x("seq") ) == 0 || xmlStrcmp( name, _x("smil") ) == 0 ) on_start_playlist( context, name, atts ); - else if ( strcmp( name, "producer" ) == 0 || strcmp( name, "video" ) == 0 ) + else if ( xmlStrcmp( name, _x("producer") ) == 0 || xmlStrcmp( name, _x("video") ) == 0 ) on_start_producer( context, name, atts ); - else if ( strcmp( name, "blank" ) == 0 ) + else if ( xmlStrcmp( name, _x("blank") ) == 0 ) on_start_blank( context, name, atts ); - else if ( strcmp( name, "entry" ) == 0 ) + else if ( xmlStrcmp( name, _x("entry") ) == 0 ) on_start_entry( context, name, atts ); - else if ( strcmp( name, "track" ) == 0 ) + else if ( xmlStrcmp( name, _x("track") ) == 0 ) on_start_track( context, name, atts ); - else if ( strcmp( name, "filter" ) == 0 ) + else if ( xmlStrcmp( name, _x("filter") ) == 0 ) on_start_filter( context, name, atts ); - else if ( strcmp( name, "transition" ) == 0 ) + else if ( xmlStrcmp( name, _x("transition") ) == 0 ) on_start_transition( context, name, atts ); - else if ( strcmp( name, "property" ) == 0 ) + else if ( xmlStrcmp( name, _x("property") ) == 0 ) on_start_property( context, name, atts ); - else if ( strcmp( name, "westley" ) == 0 ) + else if ( xmlStrcmp( name, _x("westley") ) == 0 ) for ( ; atts != NULL && *atts != NULL; atts += 2 ) - mlt_properties_set( context->producer_map, ( char * )atts[ 0 ], ( char * )atts[ 1 ] ); + mlt_properties_set( context->producer_map, ( const char * )atts[ 0 ], ( const char * )atts[ 1 ] ); } static void on_end_element( void *ctx, const xmlChar *name ) @@ -1051,25 +1104,25 @@ static void on_end_element( void *ctx, const xmlChar *name ) deserialise_context context = ( deserialise_context )( xmlcontext->_private ); //printf("on_end_element: %s\n", name ); - if ( context->is_value == 1 && strcmp( name, "property" ) != 0 ) + if ( context->is_value == 1 && xmlStrcmp( name, _x("property") ) != 0 ) context_pop_node( context ); - else if ( strcmp( name, "multitrack" ) == 0 ) + else if ( xmlStrcmp( name, _x("multitrack") ) == 0 ) on_end_multitrack( context, name ); - else if ( strcmp( name, "playlist" ) == 0 || strcmp( name, "seq" ) == 0 || strcmp( name, "smil" ) == 0 ) + else if ( xmlStrcmp( name, _x("playlist") ) == 0 || xmlStrcmp( name, _x("seq") ) == 0 || xmlStrcmp( name, _x("smil") ) == 0 ) on_end_playlist( context, name ); - else if ( strcmp( name, "track" ) == 0 ) + else if ( xmlStrcmp( name, _x("track") ) == 0 ) on_end_track( context, name ); - else if ( strcmp( name, "entry" ) == 0 ) + else if ( xmlStrcmp( name, _x("entry") ) == 0 ) on_end_entry( context, name ); - else if ( strcmp( name, "tractor" ) == 0 ) + else if ( xmlStrcmp( name, _x("tractor") ) == 0 ) on_end_tractor( context, name ); - else if ( strcmp( name, "property" ) == 0 ) + else if ( xmlStrcmp( name, _x("property") ) == 0 ) on_end_property( context, name ); - else if ( strcmp( name, "producer" ) == 0 || strcmp( name, "video" ) == 0 ) + else if ( xmlStrcmp( name, _x("producer") ) == 0 || xmlStrcmp( name, _x("video") ) == 0 ) on_end_producer( context, name ); - else if ( strcmp( name, "filter" ) == 0 ) + else if ( xmlStrcmp( name, _x("filter") ) == 0 ) on_end_filter( context, name ); - else if ( strcmp( name, "transition" ) == 0 ) + else if ( xmlStrcmp( name, _x("transition") ) == 0 ) on_end_transition( context, name ); context->branch[ context->depth ] = 0; @@ -1083,7 +1136,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 ); @@ -1130,7 +1183,7 @@ static void params_to_entities( deserialise_context context ) { xmlChar *name = ( xmlChar* )mlt_properties_get_name( context->params, i ); xmlAddDocEntity( context->entity_doc, name, XML_INTERNAL_GENERAL_ENTITY, - context->publicId, context->systemId, ( xmlChar* )mlt_properties_get( context->params, name ) ); + context->publicId, context->systemId, ( xmlChar* )mlt_properties_get( context->params, _s(name) ) ); } // Flag completion @@ -1154,6 +1207,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) { @@ -1163,7 +1218,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 ); @@ -1172,19 +1228,23 @@ xmlEntityPtr on_get_entity( void *ctx, const xmlChar* name ) // Setup for entity declarations if not ready if ( xmlGetIntSubset( context->entity_doc ) == NULL ) { - xmlCreateIntSubset( context->entity_doc, "westley", "", "" ); - context->publicId = ""; - context->systemId = ""; + xmlCreateIntSubset( context->entity_doc, _x("westley"), _x(""), _x("") ); + context->publicId = _x(""); + context->systemId = _x(""); } // 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; } @@ -1256,10 +1316,25 @@ static void parse_url( mlt_properties properties, char *url ) mlt_properties_set( properties, name, value ); } -mlt_producer producer_westley_init( int info, char *data ) +// 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( mlt_profile profile, mlt_service_type servtype, const char *id, char *data ) { - if ( data == 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; @@ -1267,10 +1342,19 @@ mlt_producer producer_westley_init( int info, char *data ) struct _xmlParserCtxt *xmlcontext; int well_formed = 0; char *filename = NULL; - + int info = strcmp( id, "westley-xml" ) ? 0 : 1; + + 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(); + context->profile = profile; // Decode URL and parse parameters mlt_properties_set( context->producer_map, "root", "" ); @@ -1316,12 +1400,24 @@ mlt_producer producer_westley_init( int info, char *data ) xmlInitParser(); xmlSubstituteEntitiesDefault( 1 ); // This is used to facilitate entity substitution in the SAX parser - context->entity_doc = xmlNewDoc( "1.0" ); + context->entity_doc = xmlNewDoc( _x("1.0") ); 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; @@ -1344,7 +1440,7 @@ mlt_producer producer_westley_init( int info, char *data ) { // 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; } @@ -1376,11 +1472,8 @@ mlt_producer producer_westley_init( int info, char *data ) // 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 ); @@ -1408,15 +1501,13 @@ mlt_producer producer_westley_init( int info, char *data ) { // 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 );