From 97bdd568301d386c96de4390a864ff952a808595 Mon Sep 17 00:00:00 2001 From: Dan Dennedy Date: Fri, 8 May 2009 00:01:11 -0700 Subject: [PATCH] Add mvsp mlt module. Signed-off-by: Dan Dennedy --- .gitignore | 2 + docs/melted++.txt | 38 ++++++++ src/modules/mvsp/Makefile | 34 ++++++++ src/modules/mvsp/configure | 7 ++ src/modules/mvsp/consumer_mvsp.c | 174 ++++++++++++++++++++++++++++++++++++++ src/modules/mvsp/factory.c | 29 ++++++ 6 files changed, 284 insertions(+), 0 deletions(-) create mode 100644 docs/melted++.txt create mode 100644 src/modules/mvsp/Makefile create mode 100755 src/modules/mvsp/configure create mode 100644 src/modules/mvsp/consumer_mvsp.c create mode 100644 src/modules/mvsp/factory.c diff --git a/.gitignore b/.gitignore index 63f6b59..dd70438 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,5 @@ config.mak config.h .depend +*~ + diff --git a/docs/melted++.txt b/docs/melted++.txt new file mode 100644 index 0000000..843dea4 --- /dev/null +++ b/docs/melted++.txt @@ -0,0 +1,38 @@ +Servers and Westley Docs +------------------------ + + One of the key features of MLT is its server capabilities. This feature + allows you to pass westley documents seamlessly from one process to + another and even to different computers on your network. + + The miracle playout server is one such example of an application which + uses this functionality - you can build your own servers into your own + processes with ease. + + A server process would be running as follows: + + #include + using namespace Mlt; + + int main( void ) + { + Miracle miracle( "miracle", 5250 ); + miracle.start( ); + miracle.execute( "uadd sdl" ); + miracle.execute( "play u0" ); + miracle.wait_for_shutdown( ); + return 0; + } + + Typically, when you have an MLT object such as a producer or a playlist, + you can send a westley representation of this to a running server with: + + Conumser valerie( "valerie", "localhost:5250" ); + valerie.connect( producer ); + valerie.start( ); + + The effect of the push will be to append the producer on to the first + unit (u0). + + You can completely customise the miracle server - an example of this + is shown below. diff --git a/src/modules/mvsp/Makefile b/src/modules/mvsp/Makefile new file mode 100644 index 0000000..3e5cdaf --- /dev/null +++ b/src/modules/mvsp/Makefile @@ -0,0 +1,34 @@ +include ../../../config.mak + +TARGET = ../libmltmvsp$(LIBSUF) + +OBJS = factory.o \ + consumer_mvsp.o + +CFLAGS += -I../.. + +LDFLAGS += -L../../mvsp -lmvsp +LDFLAGS += -L../../framework -lmlt + +SRCS := $(OBJS:.o=.c) + +all: $(TARGET) + +$(TARGET): $(OBJS) + $(CC) $(SHFLAGS) -o $@ $(OBJS) $(LDFLAGS) + +depend: $(SRCS) + $(CC) -MM $(CFLAGS) $^ 1>.depend + +distclean: clean + rm -f .depend + +clean: + rm -f $(OBJS) $(TARGET) + +install: all + install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt" + +ifneq ($(wildcard .depend),) +include .depend +endif diff --git a/src/modules/mvsp/configure b/src/modules/mvsp/configure new file mode 100755 index 0000000..6a56196 --- /dev/null +++ b/src/modules/mvsp/configure @@ -0,0 +1,7 @@ +#!/bin/sh + +if [ "$help" != "1" ] +then + echo "- pending move to melted: disabling" + touch ../disable-mvsp +fi diff --git a/src/modules/mvsp/consumer_mvsp.c b/src/modules/mvsp/consumer_mvsp.c new file mode 100644 index 0000000..4d4c9a3 --- /dev/null +++ b/src/modules/mvsp/consumer_mvsp.c @@ -0,0 +1,174 @@ +/* + * consumer_valerie.c -- pushes a service via valerie + * Copyright (C) 2003-2004 Ushodaya Enterprises Limited + * Author: Charles Yates + * + * 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 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 + * Lesser General Public License for more details. + * + * 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 + */ + +#include +#include +#include +#include +#include +#include +#include +#include + +static int consumer_is_stopped( mlt_consumer this ); +static int consumer_start( mlt_consumer this ); + +/** This is what will be called by the factory +*/ + +mlt_consumer consumer_valerie_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg ) +{ + // Create the consumer object + mlt_consumer this = calloc( sizeof( struct mlt_consumer_s ), 1 ); + + // If no malloc'd and consumer init ok + if ( this != NULL && mlt_consumer_init( this, NULL, profile ) == 0 ) + { + if ( arg != NULL && strchr( arg, ':' ) ) + { + char *temp = NULL; + int port = atoi( strchr( arg, ':' ) + 1 ); + mlt_properties_set( MLT_CONSUMER_PROPERTIES( this ), "server", arg ); + temp = mlt_properties_get( MLT_CONSUMER_PROPERTIES( this ), "server" ); + *( strchr( temp, ':' ) ) = '\0'; + mlt_properties_set_int( MLT_CONSUMER_PROPERTIES( this ), "port", port ); + } + else + { + mlt_properties_set( MLT_CONSUMER_PROPERTIES( this ), "server", arg == NULL ? "localhost" : arg ); + mlt_properties_set_int( MLT_CONSUMER_PROPERTIES( this ), "port", 5250 ); + } + + mlt_properties_set_int( MLT_CONSUMER_PROPERTIES( this ), "unit", 0 ); + mlt_properties_set( MLT_CONSUMER_PROPERTIES( this ), "command", "append" ); + + // Allow thread to be started/stopped + this->start = consumer_start; + this->is_stopped = consumer_is_stopped; + + // Return the consumer produced + return this; + } + + // malloc or consumer init failed + free( this ); + + // Indicate failure + return NULL; +} + +static int consumer_start( mlt_consumer this ) +{ + // Get the producer service + mlt_service service = mlt_service_producer( MLT_CONSUMER_SERVICE( this ) ); + + // Get the properties object + mlt_properties properties = MLT_CONSUMER_PROPERTIES( this ); + + // Get all the properties now + char *server = mlt_properties_get( properties, "server" ); + int port = mlt_properties_get_int( properties, "port" ); + char *cmd = mlt_properties_get( properties, "command" ); + int unit = mlt_properties_get_int( properties, "unit" ); + char *title = mlt_properties_get( properties, "title" ); + char command[ 2048 ]; + + // If this is a reuse, then a valerie object will exist + valerie connection = mlt_properties_get_data( properties, "connection", NULL ); + + // Special case - we can get a doc too... + char *doc = mlt_properties_get( properties, "westley" ); + + // Set the title if provided + if ( service != NULL ) + { + if ( title != NULL ) + mlt_properties_set( MLT_SERVICE_PROPERTIES( service ), "title", title ); + else if ( mlt_properties_get( MLT_SERVICE_PROPERTIES( service ), "title" ) == NULL ) + mlt_properties_set( MLT_SERVICE_PROPERTIES( service ), "title", "Anonymous Submission" ); + title = mlt_properties_get( MLT_SERVICE_PROPERTIES( service ), "title" ); + } + + strcpy( command, cmd == NULL ? "" : cmd ); + if ( strstr( command, "title=" ) == NULL && title != NULL ) + { + strcat( command, " title=\"" ); + strcat( command, title ); + strcat( command, "\"" ); + } + + if ( service != NULL || doc != NULL ) + { + // Initiate the connection if required + if ( connection == NULL ) + { + valerie_parser parser = valerie_parser_init_remote( server, port ); + connection = valerie_init( parser ); + if ( valerie_connect( connection ) == valerie_ok ) + { + mlt_properties_set_data( properties, "connection", connection, 0, ( mlt_destructor )valerie_close, NULL ); + mlt_properties_set_data( properties, "parser", parser, 0, ( mlt_destructor )valerie_parser_close, NULL ); + } + else + { + fprintf( stderr, "Unable to connect to the server at %s:%d\n", server, port ); + mlt_properties_set_int( properties, "_error", 1 ); + valerie_close( connection ); + valerie_parser_close( parser ); + connection = NULL; + } + } + + // If we have connection, push the service over + if ( connection != NULL ) + { + if ( doc == NULL ) + { + int error; + + // Push the service + error = valerie_unit_push( connection, unit, command, service ); + + // Report error + if ( error != valerie_ok ) + fprintf( stderr, "Push failed on %s:%d %s u%d (%d)\n", server, port, command, unit, error ); + } + else + { + // Push the service + int error = valerie_unit_receive( connection, unit, command, doc ); + + // Report error + if ( error != valerie_ok ) + fprintf( stderr, "Send failed on %s:%d %s u%d (%d)\n", server, port, command, unit, error ); + } + } + } + + mlt_consumer_stop( this ); + mlt_consumer_stopped( this ); + + return 0; +} + +static int consumer_is_stopped( mlt_consumer this ) +{ + return 1; +} diff --git a/src/modules/mvsp/factory.c b/src/modules/mvsp/factory.c new file mode 100644 index 0000000..6dcae27 --- /dev/null +++ b/src/modules/mvsp/factory.c @@ -0,0 +1,29 @@ +/* + * factory.c -- the factory method interfaces + * Copyright (C) 2003-2004 Ushodaya Enterprises Limited + * Author: Charles Yates + * + * 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 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 + * Lesser General Public License for more details. + * + * 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 + */ + +#include +#include + +extern mlt_consumer consumer_valerie_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg ); + +MLT_REPOSITORY +{ + MLT_REGISTER( consumer_type, "valerie", consumer_valerie_init ); +} -- 1.7.4.4