X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fwestley%2Fconsumer_westley.c;h=437d9f4c159f3adb8d298f74bd26b1e8c0009721;hb=6405eb05b56e753e9ab7c9ac2c16826d3a0c0ec5;hp=8bdb58305b5f75a0a5b3806bda033a4a2cccf467;hpb=520454d526bdcd58f1ac6ab7532dc2529b822808;p=melted diff --git a/src/modules/westley/consumer_westley.c b/src/modules/westley/consumer_westley.c index 8bdb583..437d9f4 100644 --- a/src/modules/westley/consumer_westley.c +++ b/src/modules/westley/consumer_westley.c @@ -26,10 +26,13 @@ #include #include +#define ID_SIZE 128 + /** Forward references to static functions. */ static int consumer_start( mlt_consumer parent ); +static int consumer_is_stopped( mlt_consumer this ); /** This is what will be called by the factory - anything can be passed in via the argument, but keep it simple. @@ -43,11 +46,11 @@ mlt_consumer consumer_westley_init( char *arg ) // If no malloc'd and consumer init ok if ( this != NULL && mlt_consumer_init( this, NULL ) == 0 ) { - // We have stuff to clean up, so override the close method - //parent->close = consumer_close; - // Allow thread to be started/stopped this->start = consumer_start; + this->is_stopped = consumer_is_stopped; + + mlt_properties_set( mlt_consumer_properties( this ), "resource", arg ); // Return the consumer produced return this; @@ -60,116 +63,327 @@ mlt_consumer consumer_westley_init( char *arg ) return NULL; } -void serialise_service( mlt_service service ) + +// This maintains counters for adding ids to elements +struct serialise_context_s +{ + int producer_count; + int multitrack_count; + int playlist_count; + int tractor_count; + int filter_count; + int transition_count; + int pass; + mlt_properties producer_map; +}; +typedef struct serialise_context_s* serialise_context; + + +static inline void serialise_properties( mlt_properties properties, xmlNode *node ) +{ + int i; + xmlNode *p; + + // Enumerate the properties + for ( i = 0; i < mlt_properties_count( properties ); i++ ) + { + char *name = mlt_properties_get_name( properties, i ); + if ( name != NULL && + name[ 0 ] != '_' && + mlt_properties_get_value( properties, i ) != NULL && + strcmp( name, "westley" ) != 0 && + strcmp( name, "in" ) != 0 && + strcmp( name, "out" ) != 0 ) + { + p = xmlNewChild( node, NULL, "property", NULL ); + xmlNewProp( p, "name", mlt_properties_get_name( properties, i ) ); + xmlNodeSetContent( p, mlt_properties_get_value( properties, i ) ); + } + } +} + +static void serialise_service( serialise_context context, mlt_service service, xmlNode *node ) { + int i; + xmlNode *child = node; + char id[ ID_SIZE + 1 ]; + char key[ 11 ]; + id[ ID_SIZE ] = '\0'; + key[ 10 ] = '\0'; + // Iterate over consumer/producer connections while ( service != NULL ) { - char *mlt_type = mlt_properties_get( mlt_service_properties(service ), "mlt_type" ); + mlt_properties properties = mlt_service_properties( service ); + char *mlt_type = mlt_properties_get( properties, "mlt_type" ); // Tell about the producer if ( strcmp( mlt_type, "producer" ) == 0 ) { - fprintf( stderr, "mlt_type '%s' mlt_service '%s' resource '%s'\n", mlt_type, - mlt_properties_get( mlt_service_properties( service ), "mlt_service" ), - mlt_properties_get( mlt_service_properties( service ), "resource" ) ); + if ( context->pass == 0 ) + { + child = xmlNewChild( node, NULL, "producer", NULL ); + + // Set the id + if ( mlt_properties_get( properties, "id" ) == NULL ) + { + snprintf( id, ID_SIZE, "producer%d", context->producer_count++ ); + xmlNewProp( child, "id", id ); + } + else + strncpy( id, mlt_properties_get( properties, "id" ), ID_SIZE ); + serialise_properties( properties, child ); + + // Add producer to the map + snprintf( key, 10, "%p", service ); + mlt_properties_set( context->producer_map, key, id ); + } + else + { + snprintf( key, 10, "%p", service ); + xmlNewProp( node, "producer", mlt_properties_get( context->producer_map, key ) ); + } + if ( mlt_properties_get( properties, "westley" ) != NULL ) + break; } - + // Tell about the framework container producers else if ( strcmp( mlt_type, "mlt_producer" ) == 0 ) { - fprintf( stderr, "mlt_type '%s' resource '%s'\n", mlt_type, - mlt_properties_get( mlt_service_properties( service ), "resource" ) ); - // Recurse on multitrack's tracks - if ( strcmp( mlt_properties_get( mlt_service_properties( service ), "resource" ), "" ) == 0 ) + if ( strcmp( mlt_properties_get( properties, "resource" ), "" ) == 0 ) { - int i; + if ( context->pass == 0 ) + { + // Iterate over the tracks + for ( i = 0; i < mlt_multitrack_count( MLT_MULTITRACK( service ) ); i++ ) + { + serialise_service( context, MLT_SERVICE( mlt_multitrack_track( MLT_MULTITRACK( service ), i ) ), node ); + } + } + else + { + // Iterate over the tracks to collect the producers + for ( i = 0; i < mlt_multitrack_count( MLT_MULTITRACK( service ) ); i++ ) + { + serialise_service( context, MLT_SERVICE( mlt_multitrack_track( MLT_MULTITRACK( service ), i ) ), node ); + } - fprintf( stderr, "contains...\n" ); - for ( i = 0; i < mlt_multitrack_count( MLT_MULTITRACK( service ) ); i++ ) - serialise_service( MLT_SERVICE( mlt_multitrack_track( MLT_MULTITRACK( service ), i ) ) ); - fprintf( stderr, "...done.\n" ); + child = xmlNewChild( node, NULL, "multitrack", NULL ); + + // Set the id + if ( mlt_properties_get( properties, "id" ) == NULL ) + { + snprintf( id, ID_SIZE, "multitrack%d", context->multitrack_count++ ); + xmlNewProp( child, "id", id ); + } + + // Iterate over the tracks + for ( i = 0; i < mlt_multitrack_count( MLT_MULTITRACK( service ) ); i++ ) + { + xmlNode *track = xmlNewChild( child, NULL, "track", NULL ); + snprintf( key, 10, "%p", MLT_SERVICE( mlt_multitrack_track( MLT_MULTITRACK( service ), i ) ) ); + xmlNewProp( track, "producer", mlt_properties_get( context->producer_map, key ) ); + } + } + break; } // Recurse on playlist's clips - else if ( strcmp( mlt_properties_get( mlt_service_properties( service ), "resource" ), "" ) == 0 ) + else if ( strcmp( mlt_properties_get( properties, "resource" ), "" ) == 0 ) { - int i; mlt_playlist_clip_info info; + + if ( context->pass == 0 ) + { + // Iterate over the playlist entries to collect the producers + for ( i = 0; i < mlt_playlist_count( MLT_PLAYLIST( service ) ); i++ ) + { + if ( ! mlt_playlist_get_clip_info( MLT_PLAYLIST( service ), &info, i ) ) + { + if ( strcmp( mlt_properties_get( mlt_producer_properties( info.producer ), "mlt_service" ), "blank" ) != 0 ) + { + serialise_service( context, MLT_SERVICE( info.producer ), node ); + } + } + } + + child = xmlNewChild( node, NULL, "playlist", NULL ); + + // Set the id + if ( mlt_properties_get( properties, "id" ) == NULL ) + { + snprintf( id, ID_SIZE, "playlist%d", context->playlist_count++ ); + xmlNewProp( child, "id", id ); + } + else + strncpy( id, mlt_properties_get( properties, "id" ), ID_SIZE ); + + // Add producer to the map + snprintf( key, 10, "%p", service ); + mlt_properties_set( context->producer_map, key, id ); - fprintf( stderr, "contains...\n" ); - for ( i = 0; i < mlt_playlist_count( MLT_PLAYLIST( service ) ); i++ ) + // Iterate over the playlist entries + for ( i = 0; i < mlt_playlist_count( MLT_PLAYLIST( service ) ); i++ ) + { + if ( ! mlt_playlist_get_clip_info( MLT_PLAYLIST( service ), &info, i ) ) + { + if ( strcmp( mlt_properties_get( mlt_producer_properties( info.producer ), "mlt_service" ), "blank" ) == 0 ) + { + char length[ 20 ]; + length[ 19 ] = '\0'; + xmlNode *entry = xmlNewChild( child, NULL, "blank", NULL ); + snprintf( length, 19, "%lld", info.frame_count ); + xmlNewProp( entry, "length", length ); + } + else + { + xmlNode *entry = xmlNewChild( child, NULL, "entry", NULL ); + snprintf( key, 10, "%p", MLT_SERVICE( info.producer ) ); + xmlNewProp( entry, "producer", mlt_properties_get( context->producer_map, key ) ); + xmlNewProp( entry, "in", mlt_properties_get( mlt_producer_properties( info.producer ), "in" ) ); + xmlNewProp( entry, "out", mlt_properties_get( mlt_producer_properties( info.producer ), "out" ) ); + } + } + } + } + else if ( strcmp( (const char*) node->name, "tractor" ) != 0 ) { - if ( ! mlt_playlist_get_clip_info( MLT_PLAYLIST( service ), &info, i ) ) - serialise_service( MLT_SERVICE( info.producer ) ); + snprintf( key, 10, "%p", service ); + xmlNewProp( node, "producer", mlt_properties_get( context->producer_map, key ) ); } - fprintf( stderr, "...done.\n" ); + } + + // Recurse on tractor's producer + else if ( strcmp( mlt_properties_get( properties, "resource" ), "" ) == 0 ) + { + if ( context->pass == 0 ) + { + // Recurse on connected producer + serialise_service( context, mlt_service_get_producer( service ), node ); + } + else + { + child = xmlNewChild( node, NULL, "tractor", NULL ); + + // Set the id + if ( mlt_properties_get( properties, "id" ) == NULL ) + { + snprintf( id, ID_SIZE, "tractor%d", context->tractor_count++ ); + xmlNewProp( child, "id", id ); + } + + xmlNewProp( child, "in", mlt_properties_get( properties, "in" ) ); + xmlNewProp( child, "out", mlt_properties_get( properties, "out" ) ); + + // Recurse on connected producer + serialise_service( context, mlt_service_get_producer( service ), child ); + } + break; } } // Tell about a filter else if ( strcmp( mlt_type, "filter" ) == 0 ) { - fprintf( stderr, "mlt_type '%s' mlt_service '%s'\n", mlt_type, - mlt_properties_get( mlt_service_properties( service ), "mlt_service" ) ); - - fprintf( stderr, "is applied to\n" ); - // Recurse on connected producer - serialise_service( MLT_SERVICE( MLT_FILTER( service )->producer ) ); + serialise_service( context, MLT_SERVICE( MLT_FILTER( service )->producer ), node ); + + if ( context->pass == 1 ) + { + child = xmlNewChild( node, NULL, "filter", NULL ); + + // Set the id + if ( mlt_properties_get( properties, "id" ) == NULL ) + { + snprintf( id, ID_SIZE, "filter%d", context->filter_count++ ); + xmlNewProp( child, "id", id ); + xmlNewProp( child, "in", mlt_properties_get( properties, "in" ) ); + xmlNewProp( child, "out", mlt_properties_get( properties, "out" ) ); + } + + serialise_properties( properties, child ); + } + break; } // Tell about a transition else if ( strcmp( mlt_type, "transition" ) == 0 ) { - fprintf( stderr, "mlt_type '%s' mlt_service '%s'\n", mlt_type, - mlt_properties_get( mlt_service_properties( service ), "mlt_service" ) ); - - fprintf( stderr, "is applied to\n" ); - // Recurse on connected producer - serialise_service( MLT_SERVICE( MLT_TRANSITION( service )->producer ) ); + serialise_service( context, MLT_SERVICE( MLT_TRANSITION( service )->producer ), node ); + + if ( context->pass == 1 ) + { + child = xmlNewChild( node, NULL, "transition", NULL ); + + // Set the id + if ( mlt_properties_get( properties, "id" ) == NULL ) + { + snprintf( id, ID_SIZE, "transition%d", context->transition_count++ ); + xmlNewProp( child, "id", id ); + xmlNewProp( child, "in", mlt_properties_get( properties, "in" ) ); + xmlNewProp( child, "out", mlt_properties_get( properties, "out" ) ); + } + + serialise_properties( properties, child ); + } + break; } // Get the next connected service service = mlt_service_get_producer( service ); - if ( service != NULL ) - fprintf( stderr, "is connected to\n" ); } } static int consumer_start( mlt_consumer this ) { - // get a handle on properties - mlt_properties properties = mlt_consumer_properties( this ); - mlt_service inigo = NULL; + xmlDoc *doc = xmlNewDoc( "1.0" ); + xmlNode *root = xmlNewNode( NULL, "westley" ); + xmlDocSetRootElement( doc, root ); - fprintf( stderr, "mlt_type '%s' mlt_service '%s'\n", - mlt_properties_get( properties, "mlt_type" ), - mlt_properties_get( properties, "mlt_service" ) ); - // Get the producer service mlt_service service = mlt_service_get_producer( mlt_consumer_service( this ) ); if ( service != NULL ) { - fprintf( stderr, "is connected to\n" ); - + struct serialise_context_s *context = calloc( 1, sizeof( struct serialise_context_s ) ); + context->producer_map = mlt_properties_new(); + // 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; + + // Ensure producer is a framework producer + mlt_properties_set( mlt_service_properties( service ), "mlt_type", "mlt_producer" ); + + // In pass one, we serialise the end producers and playlists, + // adding them to a map keyed by address. + serialise_service( context, service, root ); - serialise_service( service ); + // In pass two, we serialise the tractor and reference the + // producers and playlists + context->pass++; + serialise_service( context, service, root ); + + mlt_properties_close( context->producer_map ); + free( context ); + + if ( mlt_properties_get( mlt_consumer_properties( this ), "resource" ) == NULL ) + xmlDocFormatDump( stdout, doc, 1 ); + else + xmlSaveFormatFile( mlt_properties_get( mlt_consumer_properties( this ), "resource" ), doc, 1 ); } + xmlFreeDoc( doc ); mlt_consumer_stop( this ); - // Tell inigo, enough already! - if ( inigo != NULL ) - mlt_properties_set_int( mlt_service_properties( inigo ), "done", 1 ); - return 0; } +static int consumer_is_stopped( mlt_consumer this ) +{ + return 1; +} +