X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fwestley%2Fconsumer_westley.c;h=63e320e5b7342bf3f282bae8c3003042d2fef6d6;hb=c12c6c380fa37b6a0d28ce98fdcda487a8aca76d;hp=c90d584d81ee1fd7cbe8e1aa9593da5eda0b1a56;hpb=870a1069dd7a1b33623f3284c089b9be2dfb4491;p=melted diff --git a/src/modules/westley/consumer_westley.c b/src/modules/westley/consumer_westley.c index c90d584..63e320e 100644 --- a/src/modules/westley/consumer_westley.c +++ b/src/modules/westley/consumer_westley.c @@ -24,6 +24,7 @@ #include #include #include +#include #include #define ID_SIZE 128 @@ -40,6 +41,7 @@ struct serialise_context_s int transition_count; int pass; mlt_properties hide_map; + char *root; }; typedef struct serialise_context_s* serialise_context; @@ -165,7 +167,7 @@ mlt_consumer consumer_westley_init( char *arg ) return NULL; } -static inline void serialise_properties( mlt_properties properties, xmlNode *node ) +static inline void serialise_properties( serialise_context context, mlt_properties properties, xmlNode *node ) { int i; xmlNode *p; @@ -179,16 +181,24 @@ static inline void serialise_properties( mlt_properties properties, xmlNode *nod mlt_properties_get_value( properties, i ) != NULL && strcmp( name, "westley" ) != 0 && strcmp( name, "in" ) != 0 && - strcmp( name, "out" ) != 0 ) + strcmp( name, "out" ) != 0 && + strcmp( name, "id" ) != 0 && + strcmp( name, "root" ) != 0 && + strcmp( name, "width" ) != 0 && + strcmp( name, "height" ) != 0 ) { + char *value = mlt_properties_get_value( properties, i ); p = xmlNewChild( node, NULL, "property", NULL ); xmlNewProp( p, "name", mlt_properties_get_name( properties, i ) ); - xmlNodeSetContent( p, mlt_properties_get_value( properties, i ) ); + if ( strcmp( context->root, "" ) && !strncmp( value, context->root, strlen( context->root ) ) ) + xmlNodeSetContent( p, value + strlen( context->root ) + 1 ); + else + xmlNodeSetContent( p, value ); } } } -static inline void serialise_producer_filters( serialise_context context, mlt_service service, xmlNode *node ) +static inline void serialise_service_filters( serialise_context context, mlt_service service, xmlNode *node ) { int i; xmlNode *p; @@ -202,12 +212,23 @@ static inline void serialise_producer_filters( serialise_context context, mlt_se { // Get a new id - if already allocated, do nothing char *id = westley_get_id( context, mlt_filter_service( filter ), westley_filter ); - if ( id == NULL ) - continue; - - p = xmlNewChild( node, NULL, "filter", NULL ); - xmlNewProp( p, "id", id ); - serialise_properties( properties, p ); + if ( id != NULL ) + { + int in = mlt_properties_get_position( properties, "in" ); + int out = mlt_properties_get_position( properties, "out" ); + p = xmlNewChild( node, NULL, "filter", NULL ); + xmlNewProp( p, "id", id ); + if ( in != 0 || out != 0 ) + { + char temp[ 20 ]; + sprintf( temp, "%d", in ); + xmlNewProp( p, "in", temp ); + sprintf( temp, "%d", out ); + xmlNewProp( p, "out", temp ); + } + serialise_properties( context, properties, p ); + serialise_service_filters( context, mlt_filter_service( filter ), p ); + } } } } @@ -215,12 +236,13 @@ static inline void serialise_producer_filters( serialise_context context, mlt_se static void serialise_producer( serialise_context context, mlt_service service, xmlNode *node ) { xmlNode *child = node; - mlt_properties properties = mlt_service_properties( service ); + mlt_service parent = MLT_SERVICE( mlt_producer_cut_parent( MLT_PRODUCER( service ) ) ); if ( context->pass == 0 ) { + mlt_properties properties = mlt_service_properties( parent ); // Get a new id - if already allocated, do nothing - char *id = westley_get_id( context, service, westley_producer ); + char *id = westley_get_id( context, parent, westley_producer ); if ( id == NULL ) return; @@ -228,30 +250,38 @@ static void serialise_producer( serialise_context context, mlt_service service, // Set the id xmlNewProp( child, "id", id ); - serialise_properties( properties, child ); - serialise_producer_filters( context, service, child ); + xmlNewProp( child, "in", mlt_properties_get( properties, "in" ) ); + xmlNewProp( child, "out", mlt_properties_get( properties, "out" ) ); + serialise_properties( context, properties, child ); + serialise_service_filters( context, service, child ); // Add producer to the map mlt_properties_set_int( context->hide_map, id, mlt_properties_get_int( properties, "hide" ) ); } else { - // Get a new id - if already allocated, do nothing - char *id = westley_get_id( context, service, westley_existing ); - xmlNewProp( node, "producer", id ); + char *id = westley_get_id( context, parent, westley_existing ); + mlt_properties properties = mlt_service_properties( service ); + xmlNewProp( node, "parent", id ); + xmlNewProp( node, "in", mlt_properties_get( properties, "in" ) ); + xmlNewProp( node, "out", mlt_properties_get( properties, "out" ) ); } } +static void serialise_tractor( serialise_context context, mlt_service service, xmlNode *node ); + static void serialise_multitrack( serialise_context context, mlt_service service, xmlNode *node ) { int i; - xmlNode *child = node; if ( context->pass == 0 ) { // 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 ); + { + mlt_producer producer = mlt_producer_cut_parent( mlt_multitrack_track( MLT_MULTITRACK( service ), i ) ); + serialise_service( context, MLT_SERVICE( producer ), node ); + } } else { @@ -260,26 +290,29 @@ static void serialise_multitrack( serialise_context context, mlt_service service if ( id == NULL ) return; - // Create the multitrack node - child = xmlNewChild( node, NULL, "multitrack", NULL ); - - // Set the id - xmlNewProp( child, "id", id ); - // Serialise the tracks for ( i = 0; i < mlt_multitrack_count( MLT_MULTITRACK( service ) ); i++ ) { - xmlNode *track = xmlNewChild( child, NULL, "track", NULL ); + xmlNode *track = xmlNewChild( node, NULL, "track", NULL ); int hide = 0; mlt_producer producer = mlt_multitrack_track( MLT_MULTITRACK( service ), i ); + mlt_properties properties = mlt_producer_properties( producer ); - char *id = westley_get_id( context, MLT_SERVICE( producer ), westley_existing ); + mlt_service parent = MLT_SERVICE( mlt_producer_cut_parent( producer ) ); + + char *id = westley_get_id( context, MLT_SERVICE( parent ), westley_existing ); xmlNewProp( track, "producer", id ); + if ( mlt_properties_get_int( properties, "_cut" ) == 1 ) + { + xmlNewProp( track, "in", mlt_properties_get( properties, "in" ) ); + xmlNewProp( track, "out", mlt_properties_get( properties, "out" ) ); + } hide = mlt_properties_get_int( context->hide_map, id ); if ( hide ) xmlNewProp( track, "hide", hide == 1 ? "video" : ( hide == 2 ? "audio" : "both" ) ); } + serialise_service_filters( context, service, node ); } } @@ -304,12 +337,13 @@ static void serialise_playlist( serialise_context context, mlt_service service, { if ( info.producer != NULL ) { - char *service_s = mlt_properties_get( mlt_producer_properties( info.producer ), "mlt_service" ); - char *resource_s = mlt_properties_get( mlt_producer_properties( info.producer ), "resource" ); - if ( service_s != NULL && strcmp( service_s, "blank" ) != 0 ) - serialise_service( context, MLT_SERVICE( info.producer ), node ); - else if ( resource_s != NULL && !strcmp( resource_s, "" ) ) - serialise_playlist( context, MLT_SERVICE( info.producer ), node ); + mlt_producer producer = mlt_producer_cut_parent( info.producer ); + char *service_s = mlt_properties_get( mlt_producer_properties( producer ), "mlt_service" ); + char *resource_s = mlt_properties_get( mlt_producer_properties( producer ), "resource" ); + if ( resource_s != NULL && !strcmp( resource_s, "" ) ) + serialise_playlist( context, MLT_SERVICE( producer ), node ); + else if ( service_s != NULL && strcmp( service_s, "blank" ) != 0 ) + serialise_service( context, MLT_SERVICE( producer ), node ); } } } @@ -327,7 +361,8 @@ static void serialise_playlist( serialise_context context, mlt_service service, { if ( ! mlt_playlist_get_clip_info( MLT_PLAYLIST( service ), &info, i ) ) { - char *service_s = mlt_properties_get( mlt_producer_properties( info.producer ), "mlt_service" ); + mlt_producer producer = mlt_producer_cut_parent( info.producer ); + char *service_s = mlt_properties_get( mlt_producer_properties( producer ), "mlt_service" ); if ( service_s != NULL && strcmp( service_s, "blank" ) == 0 ) { char length[ 20 ]; @@ -340,15 +375,24 @@ static void serialise_playlist( serialise_context context, mlt_service service, { char temp[ 20 ]; xmlNode *entry = xmlNewChild( child, NULL, "entry", NULL ); - id = westley_get_id( context, MLT_SERVICE( info.producer ), westley_existing ); + id = westley_get_id( context, MLT_SERVICE( producer ), westley_existing ); xmlNewProp( entry, "producer", id ); sprintf( temp, "%d", info.frame_in ); xmlNewProp( entry, "in", temp ); sprintf( temp, "%d", info.frame_out ); xmlNewProp( entry, "out", temp ); + if ( info.repeat > 1 ) + { + sprintf( temp, "%d", info.repeat ); + xmlNewProp( entry, "repeat", temp ); + } + if ( mlt_producer_is_cut( info.cut ) ) + serialise_service_filters( context, mlt_producer_service( info.cut ), entry ); } } } + + serialise_service_filters( context, service, child ); } else if ( strcmp( (const char*) node->name, "tractor" ) != 0 ) { @@ -383,6 +427,7 @@ static void serialise_tractor( serialise_context context, mlt_service service, x // Recurse on connected producer serialise_service( context, mlt_service_producer( service ), child ); + serialise_service_filters( context, service, child ); } } @@ -408,7 +453,8 @@ static void serialise_filter( serialise_context context, mlt_service service, xm xmlNewProp( child, "in", mlt_properties_get( properties, "in" ) ); xmlNewProp( child, "out", mlt_properties_get( properties, "out" ) ); - serialise_properties( properties, child ); + serialise_properties( context, properties, child ); + serialise_service_filters( context, service, child ); } } @@ -434,7 +480,8 @@ static void serialise_transition( serialise_context context, mlt_service service xmlNewProp( child, "in", mlt_properties_get( properties, "in" ) ); xmlNewProp( child, "out", mlt_properties_get( properties, "out" ) ); - serialise_properties( properties, child ); + serialise_properties( context, properties, child ); + serialise_service_filters( context, service, child ); } } @@ -449,7 +496,20 @@ static void serialise_service( serialise_context context, mlt_service service, x // Tell about the producer if ( strcmp( mlt_type, "producer" ) == 0 ) { - serialise_producer( context, service, node ); + char *mlt_service = mlt_properties_get( properties, "mlt_service" ); + if ( mlt_properties_get( properties, "westley" ) == NULL && !strcmp( mlt_service, "tractor" ) ) + { + context->pass = 0; + serialise_tractor( context, service, node ); + context->pass = 1; + serialise_tractor( context, service, node ); + context->pass = 0; + break; + } + else + { + serialise_producer( context, service, node ); + } if ( mlt_properties_get( properties, "westley" ) != NULL ) break; } @@ -475,7 +535,11 @@ static void serialise_service( serialise_context context, mlt_service service, x // Recurse on tractor's producer else if ( strcmp( resource, "" ) == 0 ) { + context->pass = 0; serialise_tractor( context, service, node ); + context->pass = 1; + serialise_tractor( context, service, node ); + context->pass = 0; break; } @@ -507,12 +571,28 @@ static void serialise_service( serialise_context context, mlt_service service, x xmlDocPtr westley_make_doc( mlt_service service ) { + mlt_properties properties = mlt_service_properties( service ); xmlDocPtr doc = xmlNewDoc( "1.0" ); xmlNodePtr root = xmlNewNode( NULL, "westley" ); struct serialise_context_s *context = calloc( 1, sizeof( struct serialise_context_s ) ); xmlDocSetRootElement( doc, root ); - + + // If we have root, then deal with it now + if ( mlt_properties_get( properties, "root" ) != NULL ) + { + xmlNewProp( root, "root", mlt_properties_get( properties, "root" ) ); + context->root = strdup( mlt_properties_get( properties, "root" ) ); + } + else + { + context->root = strdup( "" ); + } + + // Assign a title property + if ( mlt_properties_get( properties, "title" ) != NULL ) + xmlNewProp( root, "title", mlt_properties_get( properties, "title" ) ); + // Construct the context maps context->id_map = mlt_properties_new(); context->hide_map = mlt_properties_new(); @@ -532,12 +612,12 @@ xmlDocPtr westley_make_doc( mlt_service service ) // Cleanup resource mlt_properties_close( context->id_map ); mlt_properties_close( context->hide_map ); + free( context->root ); free( context ); return doc; } - static int consumer_start( mlt_consumer this ) { xmlDocPtr doc = NULL; @@ -546,20 +626,57 @@ static int consumer_start( mlt_consumer this ) mlt_service service = mlt_service_producer( mlt_consumer_service( this ) ); if ( service != NULL ) { - char *resource = mlt_properties_get( mlt_consumer_properties( this ), "resource" ); + mlt_properties properties = mlt_consumer_properties( this ); + char *resource = mlt_properties_get( properties, "resource" ); + + // Set the title if provided + if ( mlt_properties_get( properties, "title" ) ) + mlt_properties_set( mlt_service_properties( service ), "title", mlt_properties_get( properties, "title" ) ); + else if ( mlt_properties_get( mlt_service_properties( service ), "title" ) == NULL ) + mlt_properties_set( mlt_service_properties( service ), "title", "Anonymous Submission" ); + + // Check for a root on the consumer properties and pass to service + if ( mlt_properties_get( properties, "root" ) ) + mlt_properties_set( mlt_service_properties( service ), "root", mlt_properties_get( properties, "root" ) ); + + // Specify roots in other cases... + if ( resource != NULL && mlt_properties_get( properties, "root" ) == NULL ) + { + // Get the current working directory + char *cwd = getcwd( NULL, 0 ); + mlt_properties_set( mlt_service_properties( service ), "root", cwd ); + free( cwd ); + } + // Make the document doc = westley_make_doc( service ); - + + // Handle the output if ( resource == NULL || !strcmp( resource, "" ) ) + { xmlDocFormatDump( stdout, doc, 1 ); + } + else if ( strchr( resource, '.' ) == NULL ) + { + xmlChar *buffer = NULL; + int length = 0; + xmlDocDumpMemory( doc, &buffer, &length ); + mlt_properties_set( properties, resource, buffer ); + xmlFree( buffer ); + } else + { xmlSaveFormatFile( resource, doc, 1 ); + } + // Close the document xmlFreeDoc( doc ); } mlt_consumer_stop( this ); + mlt_consumer_stopped( this ); + return 0; }