Adding the mix part 1

git-svn-id: https://mlt.svn.sourceforge.net/svnroot/mlt/trunk/mlt@413 d19143bc-622f-0410-bfdd-b5b2a6649095

diff --git a/src/framework/mlt_field.c b/src/framework/mlt_field.c
index 3ba08419ae1d8bc5b00ab571b61f472008905c0d..2439fe97f39ebfef57468966b64c08221eeeaebd 100644 (file)
--- a/src/framework/mlt_field.c
+++ b/src/framework/mlt_field.c
@@ -146,6 +146,9 @@ int mlt_field_plant_filter( mlt_field this, mlt_filter that, int track )
 
                // Reconnect tractor to new producer
                mlt_tractor_connect( this->tractor, this->producer );
+
+               // Fire an event
+               mlt_events_fire( mlt_field_properties( this ), "service-changed", NULL );
        }
 
        return result;
@@ -167,6 +170,9 @@ int mlt_field_plant_transition( mlt_field this, mlt_transition that, int a_track
 
                // Reconnect tractor to new producer
                mlt_tractor_connect( this->tractor, this->producer );
+
+               // Fire an event
+               mlt_events_fire( mlt_field_properties( this ), "service-changed", NULL );
        }
 
        return 0;

diff --git a/src/framework/mlt_playlist.c b/src/framework/mlt_playlist.c
index 2f752195e28100ed814fce6433ebceb8b64a2a99..366b021c733cece7418ae7f98ee55324b85af4b8 100644 (file)
--- a/src/framework/mlt_playlist.c
+++ b/src/framework/mlt_playlist.c
@@ -21,7 +21,10 @@
 #include "config.h"
 
 #include "mlt_playlist.h"
+#include "mlt_tractor.h"
+#include "mlt_field.h"
 #include "mlt_frame.h"
+#include "mlt_transition.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -30,13 +33,18 @@
 /** Virtual playlist entry.
 */
 
-typedef struct
+typedef struct playlist_entry_s
 {
        mlt_producer producer;
        mlt_position frame_in;
        mlt_position frame_out;
        mlt_position frame_count;
+       mlt_position producer_length;
        mlt_event event;
+       int mix_in_length;
+       int mix_out_length;
+       struct playlist_entry_s *mix_in;
+       struct playlist_entry_s *mix_out;
 }
 playlist_entry;
 
@@ -57,6 +65,8 @@ struct mlt_playlist_s
 */
 
 static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int index );
+static int mlt_playlist_unmix( mlt_playlist this, int clip );
+static int mlt_playlist_resize_mix( mlt_playlist this, int clip, int in, int out );
 
 /** Constructor.
 */
@@ -142,6 +152,7 @@ static int mlt_playlist_virtual_refresh( mlt_playlist this )
        {
                // Get the producer
                mlt_producer producer = this->list[ i ]->producer;
+               int current_length = mlt_producer_get_out( producer ) - mlt_producer_get_in( producer ) + 1;
 
                // If fps is 0
                if ( fps == 0 )
@@ -158,6 +169,26 @@ static int mlt_playlist_virtual_refresh( mlt_playlist this )
                        mlt_properties_set_double( mlt_producer_properties( producer ), "fps", fps );
                }
 
+               // Check if the length of the producer has changed
+               if ( this->list[ i ]->producer_length != current_length )
+               {
+                       // This clip should be removed...
+                       if ( this->list[ i ]->frame_in > current_length )
+                       {
+                               this->list[ i ]->frame_count = 0;
+                               this->list[ i ]->frame_in = 0;
+                               this->list[ i ]->frame_out = 0;
+                       }
+                       else if ( this->list[ i ]->frame_out >= current_length )
+                       {
+                               this->list[ i ]->frame_out = current_length - 1;
+                               this->list[ i ]->frame_count = this->list[ i ]->frame_out - this->list[ i ]->frame_in + 1;
+                       }
+
+                       // Update the producer_length
+                       this->list[ i ]->producer_length = current_length;
+               }
+
                // Update the frame_count for this clip
                frame_count += this->list[ i ]->frame_count;
        }
@@ -202,6 +233,7 @@ static int mlt_playlist_virtual_append( mlt_playlist this, mlt_producer producer
        this->list[ this->count ]->frame_in = in;
        this->list[ this->count ]->frame_out = out;
        this->list[ this->count ]->frame_count = out - in + 1;
+       this->list[ this->count ]->producer_length = mlt_producer_get_out( producer ) - mlt_producer_get_in( producer ) + 1;
        this->list[ this->count ]->event = mlt_events_listen( properties, this, "producer-changed", ( mlt_listener )mlt_playlist_listener );
        mlt_event_inc_ref( this->list[ this->count ]->event );
 
@@ -523,7 +555,8 @@ int mlt_playlist_insert( mlt_playlist this, mlt_producer producer, int where, ml
 
 int mlt_playlist_remove( mlt_playlist this, int where )
 {
-       if ( this->count > 0 )
+       int error = where < 0 || where >= this->count;
+       if ( error == 0 && mlt_playlist_unmix( this, where ) != 0 )
        {
                // We need to know the current clip and the position within the playlist
                int current = mlt_playlist_current_clip( this );
@@ -531,22 +564,27 @@ int mlt_playlist_remove( mlt_playlist this, int where )
 
                // We need all the details about the clip we're removing
                mlt_playlist_clip_info where_info;
+               playlist_entry *entry = this->list[ where ];
 
                // Loop variable
                int i = 0;
 
+               // Get the clip info 
+               mlt_playlist_get_clip_info( this, &where_info, where );
+
                // Make sure the clip to be removed is valid and correct if necessary
                if ( where < 0 ) 
                        where = 0;
                if ( where >= this->count )
                        where = this->count - 1;
 
-               // Get the clip info of the clip to be removed
-               mlt_playlist_get_clip_info( this, &where_info, where );
-
                // Close the producer associated to the clip info
-               mlt_event_close( where_info.event );
-               mlt_producer_close( where_info.producer );
+               mlt_event_close( entry->event );
+               mlt_producer_close( entry->producer );
+               if ( entry->mix_in != NULL )
+                       entry->mix_in->mix_out = NULL;
+               if ( entry->mix_out != NULL )
+                       entry->mix_out->mix_in = NULL;
 
                // Reorganise the list
                for ( i = where + 1; i < this->count; i ++ )
@@ -561,11 +599,14 @@ int mlt_playlist_remove( mlt_playlist this, int where )
                else if ( this->count == 0 )
                        mlt_producer_seek( mlt_playlist_producer( this ), 0 );
 
+               // Free the entry
+               free( entry );
+
                // Refresh the playlist
                mlt_playlist_virtual_refresh( this );
        }
 
-       return 0;
+       return error;
 }
 
 /** Move an entry in the playlist.
@@ -632,7 +673,7 @@ int mlt_playlist_move( mlt_playlist this, int src, int dest )
 int mlt_playlist_resize_clip( mlt_playlist this, int clip, mlt_position in, mlt_position out )
 {
        int error = clip < 0 || clip >= this->count;
-       if ( error == 0 )
+       if ( error == 0 && mlt_playlist_resize_mix( this, clip, in, out ) != 0 )
        {
                playlist_entry *entry = this->list[ clip ];
                mlt_producer producer = entry->producer;
@@ -666,14 +707,23 @@ int mlt_playlist_split( mlt_playlist this, int clip, mlt_position position )
        if ( error == 0 )
        {
                playlist_entry *entry = this->list[ clip ];
+               playlist_entry *new_entry = NULL;
                if ( position > 0 && position < entry->frame_count )
                {
                        int in = entry->frame_in;
                        int out = entry->frame_out;
                        mlt_events_block( mlt_playlist_properties( this ), this );
                        mlt_playlist_resize_clip( this, clip, in, in + position );
-                       mlt_events_unblock( mlt_playlist_properties( this ), this );
                        mlt_playlist_insert( this, entry->producer, clip + 1, in + position + 1, out );
+                       new_entry = this->list[ clip + 1 ];
+                       new_entry->mix_out = entry->mix_out;
+                       new_entry->mix_out_length = entry->mix_out_length;
+                       if ( entry->mix_out != NULL )
+                               entry->mix_out->mix_in = new_entry;
+                       entry->mix_out = NULL;
+                       entry->mix_out_length = 0;
+                       mlt_events_unblock( mlt_playlist_properties( this ), this );
+                       mlt_events_fire( mlt_playlist_properties( this ), "producer-changed", NULL );
                }
                else
                {
@@ -709,6 +759,144 @@ int mlt_playlist_join( mlt_playlist this, int clip, int count, int merge )
        return error;
 }
 
+int mlt_playlist_mix( mlt_playlist this, int clip, int length, mlt_transition transition )
+{
+       int error = ( clip < 0 || clip + 1 >= this->count ) && this->list[ clip ]->mix_out != NULL;
+       if ( error == 0 )
+       {
+               playlist_entry *mix = NULL;
+               playlist_entry *clip_a = this->list[ clip ];
+               playlist_entry *clip_b = this->list[ clip + 1 ];
+               mlt_tractor tractor = mlt_tractor_new( );
+               mlt_playlist track_a = mlt_playlist_init( );
+               mlt_playlist track_b = mlt_playlist_init( );
+               mlt_properties_set_int( mlt_tractor_properties( tractor ), "mlt_mix", 1 );
+               mlt_events_block( mlt_playlist_properties( this ), this );
+               mlt_playlist_resize_clip( this, clip, clip_a->frame_in, clip_a->frame_out - length );
+               mlt_playlist_resize_clip( this, clip + 1, clip_b->frame_in + length, clip_b->frame_out );
+               mlt_tractor_set_track( tractor, mlt_playlist_producer( track_a ), 0 );
+               mlt_tractor_set_track( tractor, mlt_playlist_producer( track_b ), 1 );
+               mlt_playlist_append_io( track_a, clip_a->producer, clip_a->frame_out + 1, clip_a->frame_out + length );
+               mlt_playlist_append_io( track_b, clip_b->producer, clip_b->frame_in - length, clip_b->frame_in - 1 );
+               mlt_playlist_insert( this, mlt_tractor_producer( tractor ), clip + 1, -1, -1 );
+
+               // Store mix info so that we can manipulate clips on either side
+               mix = this->list[ clip + 1 ];
+               mix->mix_in = clip_a;
+               mix->mix_out = clip_b;
+               mix->mix_out_length = length;
+               mix->mix_in_length = length;
+               clip_a->mix_out = mix;
+               clip_a->mix_out_length = length;
+               clip_b->mix_in = mix;
+               clip_b->mix_in_length = length;
+
+               if ( transition != NULL )
+               {
+                       mlt_field field = mlt_tractor_field( tractor );
+                       mlt_field_plant_transition( field, transition, 0, 1 );
+                       mlt_transition_set_in_and_out( transition, 0, length - 1 );
+               }
+               mlt_events_unblock( mlt_playlist_properties( this ), this );
+               mlt_events_fire( mlt_playlist_properties( this ), "producer-changed", NULL );
+               mlt_playlist_close( track_a );
+               mlt_playlist_close( track_b );
+               mlt_tractor_close( tractor );
+       }
+       return error;
+}
+
+static int mlt_playlist_unmix( mlt_playlist this, int clip )
+{
+       int error = ( clip < 0 || clip >= this->count ); 
+
+       // Ensure that the clip request is actually a mix
+       if ( error == 0 )
+       {
+               mlt_producer producer = this->list[ clip ]->producer;
+               mlt_properties properties = mlt_producer_properties( producer );
+               error = !mlt_properties_get_int( properties, "mlt_mix" );
+       }
+
+       if ( error == 0 )
+       {
+               playlist_entry *mix = this->list[ clip ];
+               playlist_entry *clip_a = mix->mix_in;
+               playlist_entry *clip_b = mix->mix_out;
+               int length = mix->mix_in_length;
+               mlt_events_block( mlt_playlist_properties( this ), this );
+
+               if ( clip_a != NULL )
+               {
+                       clip_a->frame_out += length;
+                       clip_a->frame_count += length;
+                       clip_a->mix_out = NULL;
+                       clip_a->mix_out_length = 0;
+               }
+
+               if ( clip_b != NULL )
+               {
+                       clip_b->frame_in -= length;
+                       clip_b->frame_count += length;
+                       clip_b->mix_in = NULL;
+                       clip_b->mix_in_length = 0;
+               }
+
+               mlt_properties_set_int( mlt_producer_properties( mix->producer ), "mlt_mix", 0 );
+               mlt_playlist_remove( this, clip );
+               mlt_events_unblock( mlt_playlist_properties( this ), this );
+               mlt_events_fire( mlt_playlist_properties( this ), "producer-changed", NULL );
+       }
+       return error;
+}
+
+static int mlt_playlist_resize_mix( mlt_playlist this, int clip, int in, int out )
+{
+       int error = ( clip < 0 || clip >= this->count ); 
+
+       // Ensure that the clip request is actually a mix
+       if ( error == 0 )
+       {
+               mlt_producer producer = this->list[ clip ]->producer;
+               mlt_properties properties = mlt_producer_properties( producer );
+               error = !mlt_properties_get_int( properties, "mlt_mix" );
+       }
+
+       if ( error == 0 )
+       {
+               playlist_entry *mix = this->list[ clip ];
+               playlist_entry *clip_a = mix->mix_in;
+               playlist_entry *clip_b = mix->mix_out;
+               int length = out - in + 1;
+               int length_diff = length - mix->mix_in_length;
+               mlt_events_block( mlt_playlist_properties( this ), this );
+
+               if ( clip_a != NULL )
+               {
+                       clip_a->frame_out -= length_diff;
+                       clip_a->frame_count -= length_diff;
+                       clip_a->mix_out_length -= length_diff;
+               }
+
+               if ( clip_b != NULL )
+               {
+                       clip_b->frame_in += length_diff;
+                       clip_b->frame_count -= length_diff;
+                       clip_b->mix_in_length -= length_diff;
+               }
+
+               mix->frame_in = 0;
+               mix->frame_out = length - 1;
+               mix->frame_count = length;
+               mix->mix_in_length = length;
+               mix->mix_out_length = length;
+
+               mlt_events_unblock( mlt_playlist_properties( this ), this );
+               mlt_events_fire( mlt_playlist_properties( this ), "producer-changed", NULL );
+       }
+       return error;
+}
+
 /** Get the current frame.
 */
 

diff --git a/src/framework/mlt_playlist.h b/src/framework/mlt_playlist.h
index 1566b1a89f9acbcab64f23a1d937e0f8af3b3052..dee8e074a98967fe739abad6630a83f31f35f832 100644 (file)
--- a/src/framework/mlt_playlist.h
+++ b/src/framework/mlt_playlist.h
@@ -64,6 +64,7 @@ extern int mlt_playlist_move( mlt_playlist self, int from, int to );
 extern int mlt_playlist_resize_clip( mlt_playlist self, int clip, mlt_position in, mlt_position out );
 extern int mlt_playlist_split( mlt_playlist self, int clip, mlt_position position );
 extern int mlt_playlist_join( mlt_playlist self, int clip, int count, int merge );
+extern int mlt_playlist_mix( mlt_playlist self, int clip, int length, mlt_transition transition );
 extern void mlt_playlist_close( mlt_playlist self );
 
 #endif

diff --git a/src/modules/inigo/producer_inigo.c b/src/modules/inigo/producer_inigo.c
index 83434cf8b1fe3aa4074fc6c70cb9e3fe6f05427e..c5ded59dbab5520a9adb2da3f2a78126b7114d45 100644 (file)
--- a/src/modules/inigo/producer_inigo.c
+++ b/src/modules/inigo/producer_inigo.c
@@ -121,6 +121,7 @@ mlt_producer producer_inigo_init( char **argv )
        int i;
        int track = 0;
        mlt_producer producer = NULL;
+       mlt_tractor mix = NULL;
        mlt_playlist playlist = mlt_playlist_init( );
        mlt_properties group = mlt_properties_new( );
        mlt_properties properties = group;
@@ -156,6 +157,30 @@ mlt_producer producer_inigo_init( char **argv )
                                mlt_properties_inherit( properties, group );
                        }
                }
+               else if ( !strcmp( argv[ i ], "-mix" ) )
+               {
+                       int length = atoi( argv[ ++ i ] );
+                       if ( producer != NULL )
+                               mlt_playlist_append( playlist, producer );
+                       producer = NULL;
+                       if ( mlt_playlist_count( playlist ) >= 2 )
+                       {
+                               if ( mlt_playlist_mix( playlist, mlt_playlist_count( playlist ) - 2, length, NULL ) == 0 )
+                               {
+                                       mlt_playlist_clip_info info;
+                                       mlt_playlist_get_clip_info( playlist, &info, mlt_playlist_count( playlist ) - 2 );
+                                       mix = ( mlt_tractor )info.producer;
+                               }
+                               else
+                               {
+                                       fprintf( stderr, "Mix failed?\n" );
+                               }
+                       }
+                       else
+                       {
+                               fprintf( stderr, "Invalid position for a mix...\n" );
+                       }
+               }
                else if ( !strcmp( argv[ i ], "-filter" ) )
                {
                        mlt_filter filter = create_filter( field, argv[ ++ i ], track );
@@ -174,6 +199,33 @@ mlt_producer producer_inigo_init( char **argv )
                                mlt_properties_inherit( properties, group );
                        }
                }
+               else if ( !strcmp( argv[ i ], "-mixer" ) )
+               {
+                       if ( mix != NULL )
+                       {
+                               char *id = strdup( argv[ ++ i ] );
+                               char *arg = strchr( id, ':' );
+                               mlt_field field = mlt_tractor_field( mix );
+                               mlt_transition transition = NULL;
+                               if ( arg != NULL )
+                                       *arg ++ = '\0';
+                               transition = mlt_factory_transition( id, arg );
+                               if ( transition != NULL )
+                               {
+                                       properties = mlt_transition_properties( transition );
+                                       mlt_properties_inherit( properties, group );
+                                       mlt_field_plant_transition( field, transition, 0, 1 );
+                                       mlt_properties_set_position( properties, "in", 0 );
+                                       mlt_properties_set_position( properties, "out", mlt_producer_get_out( ( mlt_producer )mix ) );
+                                       mlt_transition_close( transition );
+                               }
+                               free( id );
+                       }
+                       else
+                       {
+                               fprintf( stderr, "Invalid mixer...\n" );
+                       }
+               }
                else if ( !strcmp( argv[ i ], "-blank" ) )
                {
                        if ( producer != NULL )

diff --git a/src/modules/westley/consumer_westley.c b/src/modules/westley/consumer_westley.c
index cc02e9933e77290b2a2d44e0df98614f8cc0fcff..bfb8591051ef9a8e29435726e47163d94f435d7f 100644 (file)
--- a/src/modules/westley/consumer_westley.c
+++ b/src/modules/westley/consumer_westley.c
@@ -179,7 +179,10 @@ 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, "width" ) != 0 &&
+                        strcmp( name, "height" ) != 0 )
                {
                        p = xmlNewChild( node, NULL, "property", NULL );
                        xmlNewProp( p, "name", mlt_properties_get_name( properties, i ) );
@@ -246,7 +249,6 @@ static void serialise_producer( serialise_context context, mlt_service service,
 static void serialise_multitrack( serialise_context context, mlt_service service, xmlNode *node )
 {
        int i;
-       xmlNode *child = node;
        
        if ( context->pass == 0 )
        {
@@ -261,16 +263,10 @@ 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 );
 
@@ -281,10 +277,12 @@ static void serialise_multitrack( serialise_context context, mlt_service service
                        if ( hide )
                                xmlNewProp( track, "hide", hide == 1 ? "video" : ( hide == 2 ? "audio" : "both" ) );
                }
-               serialise_service_filters( context, service, child );
+               serialise_service_filters( context, service, node );
        }
 }
 
+static void serialise_tractor( serialise_context context, mlt_service service, xmlNode *node );
+
 static void serialise_playlist( serialise_context context, mlt_service service, xmlNode *node )
 {
        int i;
@@ -308,7 +306,14 @@ static void serialise_playlist( serialise_context context, mlt_service service,
                                {
                                        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 )
+                                       if ( resource_s != NULL && !strcmp( resource_s, "<tractor>" ) )
+                                       {
+                                               serialise_tractor( context, MLT_SERVICE( info.producer ), node );
+                                               context->pass ++;
+                                               serialise_tractor( context, MLT_SERVICE( info.producer ), node );
+                                               context->pass --;
+                                       }
+                                       else 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, "<playlist>" ) )
                                                serialise_playlist( context, MLT_SERVICE( info.producer ), node );

diff --git a/src/modules/westley/producer_westley.c b/src/modules/westley/producer_westley.c
index 4d862dda5153a0f1ae49f0e689a9e7fecf3c8155..8705035a21245b96c4495afe818e430d0b35def5 100644 (file)
--- a/src/modules/westley/producer_westley.c
+++ b/src/modules/westley/producer_westley.c
@@ -1318,11 +1318,19 @@ mlt_producer producer_westley_init( char *url )
                // make the returned service destroy the connected services
                mlt_properties_set_data( properties, "__destructors__", context->destructors, 0, (mlt_destructor) mlt_properties_close, NULL );
 
-               // Now assign additional properties
-               mlt_properties_set( properties, "resource", url );
+               if ( getenv( "MLT_WESTLEY_DEEP" ) == NULL )
+               {
+                       // Now assign additional properties
+                       mlt_properties_set( properties, "resource", url );
 
-               // This tells consumer_westley not to deep copy
-               mlt_properties_set( properties, "westley", "was here" );
+                       // This tells consumer_westley not to deep copy
+                       mlt_properties_set( properties, "westley", "was here" );
+               }
+               else
+               {
+                       // Allow the project to be edited
+                       mlt_properties_set_int( properties, "_mlt_service_hidden", 1 );
+               }
        }
        else
        {