// Allow thread to be started/stopped
this->start = consumer_start;
+ mlt_properties_set( mlt_consumer_properties( this ), "resource", arg );
+
// Return the consumer produced
return this;
}
// Enumerate the properties
for ( i = 0; i < mlt_properties_count( properties ); i++ )
{
+ if ( mlt_properties_get_value( properties, i ) != NULL )
+ {
#if 0
- p = xmlNewChild( node, NULL, "prop", NULL );
+ p = xmlNewChild( node, NULL, "prop", NULL );
#else
- p = node;
+ p = node;
#endif
- xmlNewProp( p, mlt_properties_get_name( properties, i ), mlt_properties_get_value( properties, i ) );
+ xmlNewProp( p, mlt_properties_get_name( properties, i ), mlt_properties_get_value( properties, i ) );
+ }
}
}
-static xmlNode* serialise_service( serialise_context context, mlt_service service, xmlNode *node )
+static void serialise_service( serialise_context context, mlt_service service, xmlNode *node )
{
int i;
xmlNode *child = node;
child = xmlNewChild( node, NULL, "producer", NULL );
// Set the id
- if ( mlt_properties_get( properties, "id" ) != NULL )
- xmlNewProp( child, "id", mlt_properties_get( properties, "mlt_service" ) );
- else
+ if ( mlt_properties_get( properties, "id" ) == NULL )
{
snprintf( id, 30, "producer%d", context->producer_count++ );
xmlNewProp( child, "id", id );
}
- //xmlNewProp( child, "type", mlt_properties_get( properties, "mlt_service" ) );
- //xmlNewProp( child, "src", mlt_properties_get( properties, "resource" ) );
serialise_properties( properties, child );
}
child = xmlNewChild( node, NULL, "multitrack", NULL );
// Set the id
- if ( mlt_properties_get( properties, "id" ) != NULL )
- xmlNewProp( child, "id", mlt_properties_get( properties, "mlt_service" ) );
- else
+ if ( mlt_properties_get( properties, "id" ) == NULL )
{
snprintf( id, 30, "multitrack%d", context->multitrack_count++ );
xmlNewProp( child, "id", id );
child = xmlNewChild( node, NULL, "playlist", NULL );
// Set the id
- if ( mlt_properties_get( properties, "id" ) != NULL )
- xmlNewProp( child, "id", mlt_properties_get( properties, "mlt_service" ) );
- else
+ if ( mlt_properties_get( properties, "id" ) == NULL )
{
snprintf( id, 30, "playlist%d", context->playlist_count++ );
xmlNewProp( child, "id", id );
char length[ 20 ];
length[ 19 ] = '\0';
xmlNode *entry = xmlNewChild( child, NULL, "blank", NULL );
- snprintf( length, 19, "%lld", info.length );
+ snprintf( length, 19, "%lld", info.frame_count );
xmlNewProp( entry, "length", length );
}
else
child = xmlNewChild( node, NULL, "tractor", NULL );
// Set the id
- if ( mlt_properties_get( properties, "id" ) != NULL )
- xmlNewProp( child, "id", mlt_properties_get( properties, "mlt_service" ) );
- else
+ if ( mlt_properties_get( properties, "id" ) == NULL )
{
snprintf( id, 30, "tractor%d", context->tractor_count++ );
xmlNewProp( child, "id", id );
else if ( strcmp( mlt_type, "filter" ) == 0 )
{
// Recurse on connected producer
- child = serialise_service( context, MLT_SERVICE( MLT_FILTER( service )->producer ), node );
-
- // sanity check
- if ( child == NULL )
- break;
+ serialise_service( context, MLT_SERVICE( MLT_FILTER( service )->producer ), node );
- node = xmlNewChild( child, NULL, "filter", NULL );
+ child = xmlNewChild( node, NULL, "filter", NULL );
// Set the id
- if ( mlt_properties_get( properties, "id" ) != NULL )
- xmlNewProp( node, "id", mlt_properties_get( properties, "mlt_service" ) );
- else
+ if ( mlt_properties_get( properties, "id" ) == NULL )
{
snprintf( id, 30, "filter%d", context->filter_count++ );
- xmlNewProp( node, "id", id );
+ xmlNewProp( child, "id", id );
}
- //xmlNewProp( node, "type", mlt_properties_get( properties, "mlt_service" ) );
-
- serialise_properties( properties, node );
+ serialise_properties( properties, child );
break;
}
else if ( strcmp( mlt_type, "transition" ) == 0 )
{
// Recurse on connected producer
- child = serialise_service( context, MLT_SERVICE( MLT_TRANSITION( service )->producer ), node );
-
- // sanity check
- if ( child == NULL )
- break;
+ serialise_service( context, MLT_SERVICE( MLT_TRANSITION( service )->producer ), node );
- node = xmlNewChild( child, NULL, "transition", NULL );
+ child = xmlNewChild( node, NULL, "transition", NULL );
// Set the id
- if ( mlt_properties_get( properties, "id" ) != NULL )
- xmlNewProp( node, "id", mlt_properties_get( properties, "mlt_service" ) );
- else
+ if ( mlt_properties_get( properties, "id" ) == NULL )
{
snprintf( id, 30, "transition%d", context->transition_count++ );
- xmlNewProp( node, "id", id );
+ xmlNewProp( child, "id", id );
}
- //xmlNewProp( node, "type", mlt_properties_get( properties, "mlt_service" ) );
-
- serialise_properties( properties, node );
+ serialise_properties( properties, child );
break;
}
// Get the next connected service
service = mlt_service_get_producer( service );
}
- return child;
}
static int consumer_start( mlt_consumer this )
// Remember inigo
if ( mlt_properties_get( mlt_service_properties( service ), "mlt_service" ) != NULL &&
strcmp( mlt_properties_get( mlt_service_properties( service ), "mlt_service" ), "inigo" ) == 0 )
- {
inigo = service;
-
- // Turn inigo's producer into a framework producer
- mlt_properties_set( mlt_service_properties( service ), "mlt_type", "mlt_producer" );
- }
+
+ // Ensure producer is a framework producer
+ mlt_properties_set( mlt_service_properties( service ), "mlt_type", "mlt_producer" );
serialise_service( &context, service, root );
- xmlDocFormatDump( stderr, doc, 1 );
+
+ if ( mlt_properties_get( mlt_consumer_properties( this ), "resource" ) == NULL )
+ xmlDocFormatDump( stderr, doc, 1 );
+ else
+ xmlSaveFormatFile( mlt_properties_get( mlt_consumer_properties( this ), "resource" ), doc, 1 );
}
xmlFreeDoc( doc );
#include <libxml/parser.h>
-static mlt_producer parse_westley( char *file )
+#define STACK_SIZE 1000
+
+struct deserialise_context_s
+{
+ mlt_service stack_service[ STACK_SIZE ];
+ int stack_service_size;
+ int track_count;
+ mlt_properties producer_map;
+ int filter_count;
+ int transition_count;
+};
+typedef struct deserialise_context_s *deserialise_context;
+
+
+/** Push a service.
+*/
+
+static int context_push_service( deserialise_context this, mlt_service that )
{
- return NULL;
+ int ret = this->stack_service_size >= STACK_SIZE;
+ if ( ret == 0 )
+ this->stack_service[ this->stack_service_size ++ ] = that;
+ return ret;
}
-mlt_producer producer_westley_init( char *filename )
+/** Pop a service.
+*/
+
+static mlt_service context_pop_service( deserialise_context this )
+{
+ mlt_service result = NULL;
+ if ( this->stack_service_size > 0 )
+ result = this->stack_service[ -- this->stack_service_size ];
+ return result;
+}
+
+static void on_start_tractor( deserialise_context context, const xmlChar *name, const xmlChar **atts)
+{
+ mlt_service service = mlt_tractor_service( mlt_tractor_init() );
+
+ for ( ; atts != NULL && *atts != NULL; atts += 2 )
+ mlt_properties_set( mlt_service_properties( service ), (char*) atts[0], (char*) atts[1] );
+
+ context_push_service( context, service );
+}
+
+static void on_start_multitrack( deserialise_context context, const xmlChar *name, const xmlChar **atts)
+{
+ mlt_service service = mlt_multitrack_service( mlt_multitrack_init() );
+
+ for ( ; atts != NULL && *atts != NULL; atts += 2 )
+ mlt_properties_set( mlt_service_properties( service ), (char*) atts[0], (char*) atts[1] );
+
+ context_push_service( context, service );
+}
+
+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 );
+
+ for ( ; atts != NULL && *atts != NULL; atts += 2 )
+ mlt_properties_set( properties, (char*) atts[0], (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 );
+
+ context_push_service( context, service );
+}
+
+static void on_start_producer( deserialise_context context, const xmlChar *name, const xmlChar **atts)
{
- int i;
- int track = 0;
- mlt_producer producer = NULL;
- mlt_playlist playlist = mlt_playlist_init( );
- mlt_properties group = mlt_properties_new( );
- mlt_properties properties = group;
- mlt_field field = mlt_field_init( );
- mlt_properties field_properties = mlt_field_properties( field );
- mlt_multitrack multitrack = mlt_field_multitrack( field );
-
- // We need to track the number of registered filters
- mlt_properties_set_int( field_properties, "registered", 0 );
-
- // Parse
- producer = parse_westley( filename );
-
- // TODO
+ mlt_properties properties = mlt_properties_new();
+ mlt_service service = NULL;
+
+ for ( ; atts != NULL && *atts != NULL; atts += 2 )
+ mlt_properties_set( properties, (char*) atts[0], (char*) atts[1] );
+
+ if ( mlt_properties_get( properties, "mlt_service" ) != NULL )
+ {
+ service = MLT_SERVICE( mlt_factory_producer( mlt_properties_get( properties, "mlt_service" ),
+ mlt_properties_get( properties, "resource" ) ) );
+ }
+ else
+ {
+ // Unspecified producer, use inigo
+ char *args[2] = { mlt_properties_get( properties, "resource" ), 0 };
+ service = MLT_SERVICE( mlt_factory_producer( "inigo", args ) );
+ }
+
+ if ( mlt_properties_get( properties, "id" ) != NULL )
+ mlt_properties_set_data( context->producer_map, mlt_properties_get( properties, "id" ), service, 0, NULL, NULL );
+
+ mlt_properties_inherit( mlt_service_properties( service ), properties );
+ mlt_properties_close( properties );
+
+ context_push_service( context, service );
+}
+
+static void on_start_blank( deserialise_context context, const xmlChar *name, const xmlChar **atts)
+{
+ // Get the playlist from the stack
+ mlt_service service = context_pop_service( context );
+ mlt_position length = 0;
+
+ // Look for the length attribute
+ for ( ; atts != NULL && *atts != NULL; atts += 2 )
+ {
+ if ( strcmp( atts[0], "length" ) == 0 )
+ {
+ length = atoll( atts[1] );
+ break;
+ }
+ }
+
+ // Append a blank to the playlist
+ mlt_playlist_blank( MLT_PLAYLIST( service ), length );
+
+ // Push the playlist back onto the stack
+ context_push_service( context, service );
+}
+
+static void on_start_entry_track( deserialise_context context, const xmlChar *name, const xmlChar **atts)
+{
+ // Look for the producer attribute
+ for ( ; atts != NULL && *atts != NULL; atts += 2 )
+ {
+ if ( strcmp( atts[0], "producer" ) == 0 )
+ {
+ if ( mlt_properties_get_data( context->producer_map, (char*) atts[1], NULL ) != NULL )
+ // Push the referenced producer onto the stack
+ context_push_service( context, MLT_SERVICE( mlt_properties_get_data( context->producer_map, (char*) atts[1], NULL ) ) );
+ break;
+ }
+ }
+}
+
+static void on_start_filter( deserialise_context context, const xmlChar *name, const xmlChar **atts)
+{
+ char *id;
+ mlt_properties properties = mlt_properties_new();
+
+ // Get the producer from the stack
+ mlt_service producer = context_pop_service( context );
+
+ // Set the properties
+ for ( ; atts != NULL && *atts != NULL; atts += 2 )
+ mlt_properties_set( properties, (char*) atts[0], (char*) atts[1] );
+
+ // Create the filter
+ mlt_service service = MLT_SERVICE( mlt_factory_filter( mlt_properties_get( properties, "mlt_service" ), NULL ) );
+
+ // Connect the filter to the producer
+ mlt_filter_connect( MLT_FILTER( service ), producer,
+ mlt_properties_get_int( properties, "track" ) );
+
+ // Generate an id if one does not exist
+ if ( mlt_properties_get( properties, "id" ) == NULL )
+ {
+ char id[ 31 ];
+ id[ 30 ] = '\0';
+ snprintf( id, 30, "filter%d", context->filter_count++ );
+ mlt_properties_set( properties, "id", id );
+ }
+
+ // Propogate the properties
+ mlt_properties_inherit( mlt_service_properties( service ), properties );
+ mlt_properties_close( properties );
+
+ // Get the parent producer from the stack
+ mlt_service tractor = context_pop_service( context );
+
+ if ( tractor != NULL )
+ {
+ // Connect the filter to the tractor
+ if ( strcmp( mlt_properties_get( mlt_service_properties( tractor ), "resource" ), "<tractor>" ) == 0 )
+ mlt_tractor_connect( MLT_TRACTOR( tractor ), service );
+
+ // Push the parent producer back onto the stack
+ context_push_service( context, tractor );
+ }
+
+ // If a producer alias is in the producer_map, get it
+ id = mlt_properties_get( context->producer_map, mlt_properties_get( mlt_service_properties( producer ), "id" ) );
+ if ( id != NULL && mlt_properties_get_data( context->producer_map, id, NULL ) != NULL )
+ {
+ mlt_properties_set_data( context->producer_map, id, service, 0, NULL, NULL );
+
+ // For filter chain support, add an alias to the producer map
+ // alias the filter id as the producer id
+ mlt_properties_set( context->producer_map, mlt_properties_get( mlt_service_properties( service ), "id" ), id );
+ }
+ else
+ {
+ // If the producer is in the producer_map, update it
+ id = mlt_properties_get( mlt_service_properties( producer ), "id" );
+ if ( id != NULL && mlt_properties_get_data( context->producer_map, id, NULL ) != NULL )
+ {
+ mlt_properties_set_data( context->producer_map, id, service, 0, NULL, NULL );
+
+ // For filter chain support, add an alias to the producer map
+ // alias the filter id as the producer id
+ mlt_properties_set( context->producer_map, mlt_properties_get( mlt_service_properties( service ), "id" ), id );
+ }
+ }
+
+ // Push the filter onto the stack
+ context_push_service( context, service );
+}
+
+static void on_start_transition( deserialise_context context, const xmlChar *name, const xmlChar **atts)
+{
+ mlt_properties properties = mlt_properties_new();
+
+ // Get the producer from the stack
+ mlt_service producer = context_pop_service( context );
+
+ // Set the properties
+ for ( ; atts != NULL && *atts != NULL; atts += 2 )
+ mlt_properties_set( properties, (char*) atts[0], (char*) atts[1] );
+
+ // Create the transition
+ mlt_service service = MLT_SERVICE( mlt_factory_transition( mlt_properties_get( properties, "mlt_service" ), NULL ) );
+
+ // Generate an id if one does not exist
+ if ( mlt_properties_get( properties, "id" ) == NULL )
+ {
+ char id[ 31 ];
+ id[ 30 ] = '\0';
+ snprintf( id, 30, "transition%d", context->transition_count++ );
+ mlt_properties_set( properties, "id", id );
+ }
+
+ // Propogate the properties
+ mlt_properties_inherit( mlt_service_properties( service ), properties );
+ mlt_properties_close( properties );
+
+ // Connect the filter to the producer
+ mlt_transition_connect( MLT_TRANSITION( service ), producer,
+ mlt_properties_get_int( mlt_service_properties( service ), "a_track" ),
+ mlt_properties_get_int( mlt_service_properties( service ), "b_track" ) );
+
+ // Get the tractor from the stack
+ mlt_service tractor = context_pop_service( context );
+
+ // Connect the tractor to the transition
+ mlt_tractor_connect( MLT_TRACTOR( tractor ), service );
+
+ // Push the tractor back onto the stack
+ context_push_service( context, tractor );
+
+ // Push the transition onto the stack
+ context_push_service( context, service );
+}
+
+static void on_end_multitrack( deserialise_context context, const xmlChar *name )
+{
+ // Get the producer (multitrack) from the stack
+ mlt_service producer = context_pop_service( context );
+
+ // Get the tractor from the stack
+ mlt_service service = context_pop_service( context );
+
+ // Connect the tractor to the producer
+ mlt_tractor_connect( MLT_TRACTOR( service ), producer );
+ mlt_properties_set_data( mlt_service_properties( service ), "multitrack",
+ MLT_MULTITRACK( producer ), 0, NULL, NULL );
+
+ // Push the tractor back onto the stack
+ context_push_service( context, service );
+
+ // Push the producer back onto the stack
+ context_push_service( context, producer );
+}
+
+static void on_end_playlist( deserialise_context context, const xmlChar *name )
+{
+ // Get the producer (playlist) from the stack
+ mlt_service producer = context_pop_service( context );
+
+ // Push the producer back onto the stack
+ context_push_service( context, producer );
+}
+
+static void on_end_track( deserialise_context context, const xmlChar *name )
+{
+ // Get the producer from the stack
+ mlt_service producer = context_pop_service( context );
+
+ // Get the multitrack from the stack
+ mlt_service service = context_pop_service( context );
+
+ // Set the track on the multitrack
+ mlt_multitrack_connect( MLT_MULTITRACK( service ),
+ MLT_PRODUCER( producer ),
+ context->track_count++ );
+
+ // Push the multitrack back onto the stack
+ context_push_service( context, service );
+}
+
+static void on_end_entry( deserialise_context context, const xmlChar *name )
+{
+ // Get the producer from the stack
+ mlt_service producer = context_pop_service( context );
+
+ // Get the playlist from the stack
+ mlt_service service = context_pop_service( context );
+
+ // Append the producer to the playlist
+ mlt_playlist_append_io( MLT_PLAYLIST( service ),
+ MLT_PRODUCER( producer ),
+ mlt_properties_get_position( mlt_service_properties( producer ), "in" ),
+ mlt_properties_get_position( mlt_service_properties( producer ), "out" ) );
+
+ // Push the playlist back onto the stack
+ context_push_service( context, service );
+}
+
+static void on_start_element( void *ctx, const xmlChar *name, const xmlChar **atts)
+{
+ deserialise_context context = ( deserialise_context ) ctx;
- // Connect producer to playlist
- if ( producer != NULL )
- mlt_playlist_append( playlist, producer );
+ if ( strcmp( name, "tractor" ) == 0 )
+ on_start_tractor( context, name, atts );
+ else if ( strcmp( name, "multitrack" ) == 0 )
+ on_start_multitrack( context, name, atts );
+ else if ( strcmp( name, "playlist" ) == 0 )
+ on_start_playlist( context, name, atts );
+ else if ( strcmp( name, "producer" ) == 0 )
+ 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, "filter" ) == 0 )
+ on_start_filter( context, name, atts );
+ else if ( strcmp( name, "transition" ) == 0 )
+ on_start_transition( context, name, atts );
+}
- // We must have a producer at this point
- if ( mlt_playlist_count( playlist ) > 0 )
+static void on_end_element( void *ctx, const xmlChar *name )
+{
+ deserialise_context context = ( deserialise_context ) ctx;
+
+ if ( strcmp( name, "multitrack" ) == 0 )
+ on_end_multitrack( context, name );
+ else if ( strcmp( name, "playlist" ) == 0 )
+ on_end_playlist( context, name );
+ else if ( strcmp( name, "track" ) == 0 )
+ on_end_track( context, name );
+ else if ( strcmp( name, "entry" ) == 0 )
+ on_end_entry( context, name );
+ else if ( strcmp( name, "tractor" ) == 0 )
{
- // Connect multitrack to producer
- mlt_multitrack_connect( multitrack, mlt_playlist_producer( playlist ), track );
+ // Discard the last producer
+ context_pop_service( context );
}
+}
+
+
+mlt_producer producer_westley_init( char *filename )
+{
+ xmlSAXHandler *sax = calloc( 1, sizeof( xmlSAXHandler ) );
+ struct deserialise_context_s *context = calloc( 1, sizeof( struct deserialise_context_s ) );
+
+ context->producer_map = mlt_properties_new();
+ sax->startElement = on_start_element;
+ sax->endElement = on_end_element;
+
+ xmlInitParser();
+ xmlSAXUserParseFile( sax, context, filename );
+ xmlCleanupParser();
+ free( sax );
+
+ mlt_properties_close( context->producer_map );
+
+ mlt_service service = context_pop_service( context );
+ free( context );
- mlt_tractor tractor = mlt_field_tractor( field );
- mlt_producer prod = mlt_tractor_producer( tractor );
- mlt_properties props = mlt_tractor_properties( tractor );
- mlt_properties_set( mlt_producer_properties( prod ), "resource", filename );
- mlt_properties_set_data( props, "multitrack", multitrack, 0, NULL, NULL );
- mlt_properties_set_data( props, "field", field, 0, NULL, NULL );
- mlt_properties_set_data( props, "group", group, 0, NULL, NULL );
- mlt_properties_set_position( props, "length", mlt_producer_get_out( mlt_multitrack_producer( multitrack ) ) + 1 );
- mlt_producer_set_in_and_out( prod, 0, mlt_producer_get_out( mlt_multitrack_producer( multitrack ) ) );
- mlt_properties_set_double( props, "fps", mlt_producer_get_fps( mlt_multitrack_producer( multitrack ) ) );
-
- return mlt_tractor_producer( tractor );
+ return MLT_PRODUCER( service );
}
projects / mlt / commitdiff