X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fwestley%2Fproducer_westley.c;h=0568a67d44e6ce01e26b8c098c6ae363df7cf992;hb=b6c72f309b9b2637109ffe020b4de4b278473c42;hp=75fd54184b6a24ca9203c24c61cd15ef6266d461;hpb=bf3264b9e340ba5c11cbf59835a8af3db94e0cc2;p=melted diff --git a/src/modules/westley/producer_westley.c b/src/modules/westley/producer_westley.c index 75fd541..0568a67 100644 --- a/src/modules/westley/producer_westley.c +++ b/src/modules/westley/producer_westley.c @@ -21,7 +21,6 @@ // 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; @@ -204,7 +207,7 @@ 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; @@ -294,7 +297,7 @@ static void on_start_tractor( deserialise_context context, const xmlChar *name, track_service( context->destructors, service, (mlt_destructor) mlt_tractor_close ); for ( ; atts != NULL && *atts != NULL; atts += 2 ) - mlt_properties_set( MLT_SERVICE_PROPERTIES( service ), (char*) atts[0], atts[1] == NULL ? "" : (char*) atts[1] ); + mlt_properties_set( MLT_SERVICE_PROPERTIES( service ), (const char*) atts[0], atts[1] == NULL ? "" : (const char*) atts[1] ); mlt_properties_set_int( MLT_TRACTOR_PROPERTIES( tractor ), "global_feed", 1 ); @@ -350,7 +353,7 @@ static void on_start_multitrack( deserialise_context context, const xmlChar *nam mlt_service service = MLT_SERVICE( mlt_tractor_multitrack( MLT_TRACTOR( parent ) ) ); mlt_properties properties = MLT_SERVICE_PROPERTIES( service ); for ( ; atts != NULL && *atts != NULL; atts += 2 ) - mlt_properties_set( properties, (char*) atts[0], atts[1] == NULL ? "" : (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 ); @@ -384,11 +387,11 @@ static void on_start_playlist( deserialise_context context, const xmlChar *name, for ( ; atts != NULL && *atts != NULL; atts += 2 ) { - mlt_properties_set( properties, (char*) atts[0], atts[1] == NULL ? "" : (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 ) @@ -430,7 +433,7 @@ static void on_start_producer( deserialise_context context, const xmlChar *name, context_push_service( context, service, mlt_dummy_producer_type ); for ( ; atts != NULL && *atts != NULL; atts += 2 ) - mlt_properties_set( properties, (char*) atts[0], atts[1] == NULL ? "" : (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 @@ -501,18 +504,18 @@ 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( "fezzik", "+INVALID.txt" ) ); + producer = MLT_SERVICE( mlt_factory_producer( context->profile, "fezzik", "+INVALID.txt" ) ); if ( producer == NULL ) - producer = MLT_SERVICE( mlt_factory_producer( "fezzik", "colour:red" ) ); + producer = MLT_SERVICE( mlt_factory_producer( context->profile, "fezzik", "colour:red" ) ); // Track this producer track_service( context->destructors, producer, (mlt_destructor) mlt_producer_close ); @@ -537,7 +540,7 @@ static void on_end_producer( deserialise_context context, const xmlChar *name ) if ( strchr( mlt_properties_get( properties, "clipBegin" ), ':' ) ) // Parse clock value in = parse_clock_value( mlt_properties_get( properties, "clipBegin" ), - mlt_properties_get_double( mlt_producer_properties( MLT_PRODUCER( producer ) ), "fps" ) ); + mlt_producer_get_fps( MLT_PRODUCER( producer ) ) ); else // Parse frames value in = mlt_properties_get_position( properties, "clipBegin" ); @@ -551,7 +554,7 @@ static void on_end_producer( deserialise_context context, const xmlChar *name ) if ( strchr( mlt_properties_get( properties, "clipEnd" ), ':' ) ) // Parse clock value out = parse_clock_value( mlt_properties_get( properties, "clipEnd" ), - mlt_properties_get_double( mlt_producer_properties( MLT_PRODUCER( producer ) ), "fps" ) ); + mlt_producer_get_fps( MLT_PRODUCER( producer ) ) ); else // Parse frames value out = mlt_properties_get_position( properties, "clipEnd" ); @@ -628,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; } } @@ -654,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], atts[1] == NULL ? "" : (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 ); } @@ -669,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 ); @@ -715,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 ) @@ -737,12 +740,12 @@ static void on_start_track( deserialise_context context, const xmlChar *name, co for ( ; atts != NULL && *atts != NULL; atts += 2 ) { - mlt_properties_set( MLT_SERVICE_PROPERTIES( service ), (char*) atts[0], atts[1] == NULL ? "" : (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 ); } @@ -758,7 +761,7 @@ 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; + enum service_type parent_type = invalid_type; mlt_service parent = context_pop_service( context, &parent_type ); mlt_multitrack multitrack = NULL; @@ -827,7 +830,7 @@ static void on_start_filter( deserialise_context context, const xmlChar *name, c // 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 ) @@ -836,12 +839,12 @@ static void on_end_filter( deserialise_context context, const xmlChar *name ) mlt_service service = context_pop_service( context, &type ); 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_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 ); @@ -902,7 +905,7 @@ static void on_start_transition( deserialise_context context, const xmlChar *nam // 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 ) @@ -911,12 +914,13 @@ static void on_end_transition( deserialise_context context, const xmlChar *name mlt_service service = context_pop_service( context, &type ); 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 ) ); + 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 ); @@ -981,10 +985,10 @@ 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 ) @@ -997,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 ); } } @@ -1020,7 +1024,7 @@ 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; @@ -1034,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 ); } } @@ -1055,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 @@ -1069,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 ) @@ -1100,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; @@ -1179,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 @@ -1224,9 +1228,9 @@ static 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 @@ -1329,7 +1333,7 @@ static int file_exists( char *file ) return exists; } -mlt_producer producer_westley_init( int info, char *data ) +mlt_producer producer_westley_init( mlt_profile profile, mlt_service_type servtype, const char *id, char *data ) { xmlSAXHandler *sax = calloc( 1, sizeof( xmlSAXHandler ) ); struct deserialise_context_s *context = calloc( 1, sizeof( struct deserialise_context_s ) ); @@ -1338,6 +1342,7 @@ 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; @@ -1349,6 +1354,7 @@ mlt_producer producer_westley_init( int info, char *data ) 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", "" ); @@ -1394,7 +1400,7 @@ 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