X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Finigo%2Finigo.c;h=b3a4b105f1cce68ed6179d82ae7464e888b481ff;hb=65e8ac86ee6e17a12892954ff4a8d46c4766fe0d;hp=5fd647ab1d9750403454c076f9db4e712ef8be54;hpb=bcc23ff73c82655a8cec6603112b9ff54c2ca3d6;p=melted

diff --git a/src/inigo/inigo.c b/src/inigo/inigo.c
index 5fd647a..b3a4b10 100644
--- a/src/inigo/inigo.c
+++ b/src/inigo/inigo.c
@@ -1,52 +1,19 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sched.h>
 
 #include <framework/mlt.h>
 
 #include "io.h"
 
-mlt_producer create_producer( char *file )
+static void transport_action( mlt_producer producer, char *value )
 {
-	mlt_producer result = NULL;
-
-	// 1st Line preferences
-	if ( strstr( file, ".mpg" ) )
-		result = mlt_factory_producer( "mcmpeg", file );
-	else if ( strstr( file, ".mpeg" ) )
-		result = mlt_factory_producer( "mcmpeg", file );
-	else if ( strstr( file, ".dv" ) )
-		result = mlt_factory_producer( "mcdv", file );
-	else if ( strstr( file, ".dif" ) )
-		result = mlt_factory_producer( "mcdv", file );
-	else if ( strstr( file, ".jpg" ) )
-		result = mlt_factory_producer( "pixbuf", file );
-	else if ( strstr( file, ".JPG" ) )
-		result = mlt_factory_producer( "pixbuf", file );
-	else if ( strstr( file, ".jpeg" ) )
-		result = mlt_factory_producer( "pixbuf", file );
-	else if ( strstr( file, ".png" ) )
-		result = mlt_factory_producer( "pixbuf", file );
-	else if ( strstr( file, ".txt" ) )
-		result = mlt_factory_producer( "pango", file );
-
-	// 2nd Line fallbacks
-	if ( result == NULL && strstr( file, ".dv" ) )
-		result = mlt_factory_producer( "libdv", file );
-	else if ( result == NULL && strstr( file, ".dif" ) )
-		result = mlt_factory_producer( "libdv", file );
-
-	// 3rd line fallbacks 
-	if ( result == NULL )
-		result = mlt_factory_producer( "ffmpeg", file );
-
-	return result;
-}
-
-void transport_action( mlt_producer producer, char *value )
-{
-	mlt_properties properties = mlt_producer_properties( producer );
+	mlt_properties properties = MLT_PRODUCER_PROPERTIES( producer );
 	mlt_multitrack multitrack = mlt_properties_get_data( properties, "multitrack", NULL );
+	mlt_consumer consumer = mlt_properties_get_data( properties, "transport_consumer", NULL );
+
+	mlt_properties_set_int( properties, "stats_off", 0 );
 
 	if ( strlen( value ) == 1 )
 	{
@@ -75,6 +42,7 @@ void transport_action( mlt_producer producer, char *value )
 				mlt_producer_set_speed( producer, 0 );
 				break;
 			case '6':
+			case ' ':
 				mlt_producer_set_speed( producer, 1 );
 				break;
 			case '7':
@@ -86,249 +54,270 @@ void transport_action( mlt_producer producer, char *value )
 			case '9':
 				mlt_producer_set_speed( producer, 10 );
 				break;
+			case 'd':
+				if ( multitrack != NULL )
+				{
+					int i = 0;
+					mlt_position last = -1;
+					fprintf( stderr, "\n" );
+					for ( i = 0; 1; i ++ )
+					{
+						mlt_position time = mlt_multitrack_clip( multitrack, mlt_whence_relative_start, i );
+						if ( time == last )
+							break;
+						last = time;
+						fprintf( stderr, "%d: %d\n", i, (int)time );
+					}
+				}
+				break;
+
+			case 'g':
+				if ( multitrack != NULL )
+				{
+					mlt_position time = mlt_multitrack_clip( multitrack, mlt_whence_relative_current, 0 );
+					mlt_producer_seek( producer, time );
+				}
+				break;
+			case 'H':
+				if ( producer != NULL )
+				{
+					mlt_position position = mlt_producer_position( producer );
+					mlt_producer_seek( producer, position - ( mlt_producer_get_fps( producer ) * 60 ) );
+				}
+				break;
+			case 'h':
+				if ( producer != NULL )
+				{
+					mlt_position position = mlt_producer_position( producer );
+					mlt_producer_set_speed( producer, 0 );
+					mlt_producer_seek( producer, position - 1 );
+				}
+				break;
 			case 'j':
 				if ( multitrack != NULL )
 				{
-					mlt_timecode time = mlt_multitrack_clip( multitrack, mlt_whence_relative_current, -1 );
+					mlt_position time = mlt_multitrack_clip( multitrack, mlt_whence_relative_current, 1 );
 					mlt_producer_seek( producer, time );
 				}
 				break;
 			case 'k':
 				if ( multitrack != NULL )
 				{
-					mlt_timecode time = mlt_multitrack_clip( multitrack, mlt_whence_relative_current, 0 );
+					mlt_position time = mlt_multitrack_clip( multitrack, mlt_whence_relative_current, -1 );
 					mlt_producer_seek( producer, time );
 				}
 				break;
 			case 'l':
-				if ( multitrack != NULL )
+				if ( producer != NULL )
 				{
-					mlt_timecode time = mlt_multitrack_clip( multitrack, mlt_whence_relative_current, 1 );
-					mlt_producer_seek( producer, time );
+					mlt_position position = mlt_producer_position( producer );
+					if ( mlt_producer_get_speed( producer ) != 0 )
+						mlt_producer_set_speed( producer, 0 );
+					else
+						mlt_producer_seek( producer, position + 1 );
+				}
+				break;
+			case 'L':
+				if ( producer != NULL )
+				{
+					mlt_position position = mlt_producer_position( producer );
+					mlt_producer_seek( producer, position + ( mlt_producer_get_fps( producer ) * 60 ) );
 				}
 				break;
 		}
+
+		mlt_properties_set_int( MLT_CONSUMER_PROPERTIES( consumer ), "refresh", 1 );
 	}
+
+	mlt_properties_set_int( properties, "stats_off", 0 );
 }
 
-mlt_consumer create_consumer( char *id, mlt_producer producer )
+static mlt_consumer create_consumer( char *id, mlt_producer producer )
 {
-	char *arg = strchr( id, ':' );
+	char *arg = id != NULL ? strchr( id, ':' ) : NULL;
 	if ( arg != NULL )
 		*arg ++ = '\0';
 	mlt_consumer consumer = mlt_factory_consumer( id, arg );
 	if ( consumer != NULL )
 	{
-		mlt_properties properties = mlt_consumer_properties( consumer );
+		mlt_properties properties = MLT_CONSUMER_PROPERTIES( consumer );
 		mlt_properties_set_data( properties, "transport_callback", transport_action, 0, NULL, NULL );
 		mlt_properties_set_data( properties, "transport_producer", producer, 0, NULL, NULL );
+		mlt_properties_set_data( MLT_PRODUCER_PROPERTIES( producer ), "transport_consumer", consumer, 0, NULL, NULL );
 	}
 	return consumer;
 }
 
-void track_service( mlt_field field, void *service, mlt_destructor destructor )
+static void transport( mlt_producer producer, mlt_consumer consumer )
 {
-	mlt_properties properties = mlt_field_properties( field );
-	int registered = mlt_properties_get_int( properties, "registered" );
-	char *key = mlt_properties_get( properties, "registered" );
-	mlt_properties_set_data( properties, key, service, 0, destructor, NULL );
-	mlt_properties_set_int( properties, "registered", ++ registered );
-}
+	mlt_properties properties = MLT_PRODUCER_PROPERTIES( producer );
+	int silent = mlt_properties_get_int( MLT_CONSUMER_PROPERTIES( consumer ), "silent" );
+	struct timespec tm = { 0, 40000 };
 
-mlt_filter create_filter( mlt_field field, char *id, int track )
-{
-	char *arg = strchr( id, ':' );
-	if ( arg != NULL )
-		*arg ++ = '\0';
-	mlt_filter filter = mlt_factory_filter( id, arg );
-	if ( filter != NULL )
+	if ( mlt_properties_get_int( properties, "done" ) == 0 && !mlt_consumer_is_stopped( consumer ) )
 	{
-		mlt_field_plant_filter( field, filter, track );
-		track_service( field, filter, ( mlt_destructor )mlt_filter_close );
-	}
-	return filter;
-}
-
-mlt_transition create_transition( mlt_field field, char *id, int track )
-{
-	char *arg = strchr( id, ':' );
-	if ( arg != NULL )
-		*arg ++ = '\0';
-	mlt_transition transition = mlt_factory_transition( id, arg );
-	if ( transition != NULL )
-	{
-		mlt_field_plant_transition( field, transition, track, track + 1 );
-		track_service( field, transition, ( mlt_destructor )mlt_transition_close );
-	}
-	return transition;
-}
-
-void set_properties( mlt_properties properties, char *namevalue )
-{
-	mlt_properties_parse( properties, namevalue );
-}
+		if ( !silent )
+		{
+			term_init( );
+
+			fprintf( stderr, "+-----+ +-----+ +-----+ +-----+ +-----+ +-----+ +-----+ +-----+ +-----+\n" );
+			fprintf( stderr, "|1=-10| |2= -5| |3= -2| |4= -1| |5=  0| |6=  1| |7=  2| |8=  5| |9= 10|\n" );
+			fprintf( stderr, "+-----+ +-----+ +-----+ +-----+ +-----+ +-----+ +-----+ +-----+ +-----+\n" );
+
+			fprintf( stderr, "+---------------------------------------------------------------------+\n" );
+			fprintf( stderr, "|               H = back 1 minute,  L = forward 1 minute              |\n" );
+			fprintf( stderr, "|                 h = previous frame,  l = next frame                 |\n" );
+			fprintf( stderr, "|           g = start of clip, j = next clip, k = previous clip       |\n" );
+			fprintf( stderr, "|                0 = restart, q = quit, space = play                  |\n" );
+			fprintf( stderr, "+---------------------------------------------------------------------+\n" );
+		}
 
-void transport( mlt_producer producer )
-{
-	mlt_properties properties = mlt_producer_properties( producer );
+		while( mlt_properties_get_int( properties, "done" ) == 0 && !mlt_consumer_is_stopped( consumer ) )
+		{
+			int value = silent ? -1 : term_read( );
 
-	term_init( );
+			if ( value != -1 )
+			{
+				char string[ 2 ] = { value, 0 };
+				transport_action( producer, string );
+			}
 
-	fprintf( stderr, "+-----+ +-----+ +-----+ +-----+ +-----+ +-----+ +-----+ +-----+ +-----+\n" );
-	fprintf( stderr, "|1=-10| |2= -5| |3= -2| |4= -1| |5=  0| |6=  1| |7=  2| |8=  5| |9= 10|\n" );
-	fprintf( stderr, "+-----+ +-----+ +-----+ +-----+ +-----+ +-----+ +-----+ +-----+ +-----+\n" );
+			if ( !silent && mlt_properties_get_int( properties, "stats_off" ) == 0 )
+				fprintf( stderr, "Current Position: %10d\r", (int)mlt_producer_position( producer ) );
 
-	fprintf( stderr, "+---------------------------------------------------------------------+\n" );
-	fprintf( stderr, "|             j = previous, k = restart current, l = next             |\n" );
-	fprintf( stderr, "|                       0 = restart, q = quit                         |\n" );
-	fprintf( stderr, "+---------------------------------------------------------------------+\n" );
+			if ( silent )
+				nanosleep( &tm, NULL );
+		}
 
-	while( mlt_properties_get_int( properties, "done" ) == 0 )
-	{
-		int value = term_read( );
-		if ( value != -1 )
-			transport_action( producer, ( char * )&value );
+		if ( !silent )
+			fprintf( stderr, "\n" );
 	}
 }
 
 int main( int argc, char **argv )
 {
 	int i;
-	int track = 0;
 	mlt_consumer consumer = NULL;
-	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 );
+	mlt_producer inigo = NULL;
+	FILE *store = NULL;
+	char *name = NULL;
+	struct sched_param scp;
+
+	// Use realtime scheduling if possible
+	memset( &scp, '\0', sizeof( scp ) );
+	scp.sched_priority = sched_get_priority_max( SCHED_FIFO ) - 1;
+#ifndef __DARWIN__
+	sched_setscheduler( 0, SCHED_FIFO, &scp );
+#endif
 
 	// Construct the factory
-	mlt_factory_init( getenv( "MLT_REPOSITORY" ) );
-
-	// We need to track the number of registered filters
-	mlt_properties_set_int( field_properties, "registered", 0 );
+	mlt_factory_init( NULL );
 
-	// Parse the arguments
+	// Check for serialisation switch first
 	for ( i = 1; i < argc; i ++ )
 	{
-		if ( !strcmp( argv[ i ], "-consumer" ) )
-		{
-			consumer = create_consumer( argv[ ++ i ], mlt_multitrack_producer( multitrack ) );
-			if ( consumer != NULL )
-			{
-				properties = mlt_consumer_properties( consumer );
-				mlt_properties_inherit( properties, group );
-			}
-		}
-		else if ( !strcmp( argv[ i ], "-group" ) )
+		if ( !strcmp( argv[ i ], "-serialise" ) )
 		{
-			if ( mlt_properties_count( group ) != 0 )
-			{
-				mlt_properties_close( group );
-				group = mlt_properties_new( );
-			}
-			if ( group != NULL )
-				properties = group;
+			name = argv[ ++ i ];
+			if ( strstr( name, ".inigo" ) )
+				store = fopen( name, "w" );
 		}
-		else if ( !strcmp( argv[ i ], "-filter" ) )
+	}
+
+	// Get inigo producer
+	if ( argc > 1 )
+		inigo = mlt_factory_producer( "inigo", &argv[ 1 ] );
+
+	if ( argc > 1 && inigo != NULL && mlt_producer_get_length( inigo ) > 0 )
+	{
+		// Get inigo's properties
+		mlt_properties inigo_props = MLT_PRODUCER_PROPERTIES( inigo );
+
+		// Get the last group
+		mlt_properties group = mlt_properties_get_data( inigo_props, "group", 0 );
+
+		// Parse the arguments
+		for ( i = 1; i < argc; i ++ )
 		{
-			mlt_filter filter = create_filter( field, argv[ ++ i ], track );
-			if ( filter != NULL )
+			if ( !strcmp( argv[ i ], "-consumer" ) )
 			{
-				properties = mlt_filter_properties( filter );
-				mlt_properties_inherit( properties, group );
+				consumer = create_consumer( argv[ ++ i ], inigo );
+				while ( argv[ i + 1 ] != NULL && strstr( argv[ i + 1 ], "=" ) )
+					mlt_properties_parse( group, argv[ ++ i ] );
 			}
-		}
-		else if ( !strcmp( argv[ i ], "-transition" ) )
-		{
-			mlt_transition transition = create_transition( field, argv[ ++ i ], track );
-			if ( transition != NULL )
+			else if ( !strcmp( argv[ i ], "-serialise" ) )
 			{
-				properties = mlt_transition_properties( transition );
-				mlt_properties_inherit( properties, group );
+				i ++;
 			}
-		}
-		else if ( !strcmp( argv[ i ], "-blank" ) )
-		{
-			if ( producer != NULL )
-				mlt_playlist_append( playlist, producer );
-			producer = NULL;
-			mlt_playlist_blank( playlist, atof( argv[ ++ i ] ) );
-		}
-		else if ( !strcmp( argv[ i ], "-track" ) )
-		{
-			if ( producer != NULL )
-				mlt_playlist_append( playlist, producer );
-			producer = NULL;
-			mlt_multitrack_connect( multitrack, mlt_playlist_producer( playlist ), track ++ );
-			playlist = mlt_playlist_init( );
-		}
-		else if ( !strstr( argv[ i ], "=" ) )
-		{
-			if ( producer != NULL )
-				mlt_playlist_append( playlist, producer );
-			producer = create_producer( argv[ i ] );
-			if ( producer != NULL )
+			else
 			{
-				properties = mlt_producer_properties( producer );
-				mlt_properties_inherit( properties, group );
-			}
-		}
-		else
-		{
-			set_properties( properties, argv[ i ] );
-		}
-	}
+				if ( store != NULL )
+					fprintf( store, "%s\n", argv[ i ] );
 
-	// Connect producer to playlist
-	if ( producer != NULL )
-		mlt_playlist_append( playlist, producer );
+				i ++;
 
+				while ( argv[ i ] != NULL && argv[ i ][ 0 ] != '-' )
+				{
+					if ( store != NULL )
+						fprintf( store, "%s\n", argv[ i ] );
+					i += 1;
+				}
 
-	// We must have a producer at this point
-	if ( mlt_playlist_count( playlist ) > 0 )
-	{
-		// If we have no consumer, default to sdl
-		if ( consumer == NULL )
-		{
-			consumer = create_consumer( "sdl", mlt_multitrack_producer( multitrack ) );
-			if ( consumer != NULL )
-			{
-				properties = mlt_consumer_properties( consumer );
-				mlt_properties_inherit( properties, group );
+				i --;
 			}
 		}
 
-		// Connect multitrack to producer
-		mlt_multitrack_connect( multitrack, mlt_playlist_producer( playlist ), track );
+		// If we have no consumer, default to sdl
+		if ( store == NULL && consumer == NULL )
+			consumer = create_consumer( NULL, inigo );
+
+		if ( consumer != NULL && store == NULL )
+		{
+			// Apply group settings
+			mlt_properties properties = MLT_CONSUMER_PROPERTIES( consumer );
+			mlt_properties_inherit( properties, group );
 
-		// Connect consumer to tractor
-		mlt_consumer_connect( consumer, mlt_field_service( field ) );
+			// Connect consumer to inigo
+			mlt_consumer_connect( consumer, MLT_PRODUCER_SERVICE( inigo ) );
 
-		// Transport functionality
-		transport( mlt_multitrack_producer( multitrack ) );
+			// Start the consumer
+			mlt_consumer_start( consumer );
 
-		// Close the services
-		mlt_consumer_close( consumer );
-		mlt_producer_close( producer );
+			// Transport functionality
+			transport( inigo, consumer );
+
+			// Stop the consumer
+			mlt_consumer_stop( consumer );
+		}
+		else if ( store != NULL )
+		{
+			fprintf( stderr, "Project saved as %s.\n", name );
+			fclose( store );
+		}
 	}
 	else
 	{
 		fprintf( stderr, "Usage: inigo [ -group [ name=value ]* ]\n"
 						 "             [ -consumer id[:arg] [ name=value ]* ]\n"
-        				 "             [ -filter id[:arg] [ name=value ] * ]\n"
-        				 "             [ -transition id[:arg] [ name=value ] * ]\n"
-						 "             [ -blank time ]\n"
-        				 "             [ producer [ name=value ] * ]+\n" );
+						 "             [ -filter filter[:arg] [ name=value ] * ]\n"
+						 "             [ -attach filter[:arg] [ name=value ] * ]\n"
+						 "             [ -mix length [ -mixer transition ]* ]\n"
+						 "             [ -transition id[:arg] [ name=value ] * ]\n"
+						 "             [ -blank frames ]\n"
+						 "             [ -track ]\n"
+						 "             [ -split relative-frame ]\n"
+						 "             [ -join clips ]\n"
+						 "             [ -repeat times ]\n"
+						 "             [ producer [ name=value ] * ]+\n" );
 	}
 
-	// Close the field
-	mlt_field_close( field );
+	// Close the consumer
+	if ( consumer != NULL )
+		mlt_consumer_close( consumer );
 
-	// Close the group
-	mlt_properties_close( group );
+	// Close the producer
+	if ( inigo != NULL )
+		mlt_producer_close( inigo );
 
 	// Close the factory
 	mlt_factory_close( );