Splits, joins and repeats

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

diff --git a/src/framework/mlt_playlist.c b/src/framework/mlt_playlist.c
index 9cdc8cf07d3e647f2a2c250d25abfb4dcda37061..75ea91601668012c2bca05cb470d2b9bf56042d7 100644 (file)
--- a/src/framework/mlt_playlist.c
+++ b/src/framework/mlt_playlist.c
@@ -39,6 +39,7 @@ typedef struct playlist_entry_s
        mlt_position frame_in;
        mlt_position frame_out;
        mlt_position frame_count;
+       int repeat;
        mlt_position producer_length;
        mlt_event event;
        int mix_in_length;
@@ -175,10 +176,10 @@ static int mlt_playlist_virtual_refresh( mlt_playlist this )
                           this->list[ i ]->frame_out != mlt_producer_get_out( producer ) ) )
                {
                        // This clip should be removed...
-                       if ( current_length == 1 )
+                       if ( current_length < 1 )
                        {
                                this->list[ i ]->frame_in = 0;
-                               this->list[ i ]->frame_out = 0;
+                               this->list[ i ]->frame_out = -1;
                                this->list[ i ]->frame_count = 0;
                        }
                        else 
@@ -192,6 +193,9 @@ static int mlt_playlist_virtual_refresh( mlt_playlist this )
                        this->list[ i ]->producer_length = current_length;
                }
 
+               // Calculate the frame_count
+               this->list[ i ]->frame_count = ( this->list[ i ]->frame_out - this->list[ i ]->frame_in + 1 ) * this->list[ i ]->repeat;
+
                // Update the frame_count for this clip
                frame_count += this->list[ i ]->frame_count;
        }
@@ -220,13 +224,14 @@ static void mlt_playlist_listener( mlt_producer producer, mlt_playlist this )
 
 static int mlt_playlist_virtual_append( mlt_playlist this, mlt_producer source, mlt_position in, mlt_position out )
 {
+       char *resource = source != NULL ? mlt_properties_get( mlt_producer_properties( source ), "resource" ) : NULL;
        mlt_producer producer = NULL;
        mlt_properties properties = NULL;
 
        // If we have a cut, then use the in/out points from the cut
-       if ( &this->blank == source )
+       if ( resource == NULL || !strcmp( resource, "blank" ) )
        {
-               producer = source;
+               producer = &this->blank;
                properties = mlt_producer_properties( producer );
                mlt_properties_inc_ref( properties );
        }
@@ -250,7 +255,6 @@ static int mlt_playlist_virtual_append( mlt_playlist this, mlt_producer source,
                properties = mlt_producer_properties( producer );
        }
 
-
        // Check that we have room
        if ( this->count >= this->size )
        {
@@ -265,14 +269,12 @@ static int mlt_playlist_virtual_append( mlt_playlist this, mlt_producer source,
        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 ]->repeat = 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 );
 
-       mlt_properties_set( mlt_producer_properties( source ), "eof", "pause" );
        mlt_properties_set( properties, "eof", "pause" );
-
-       mlt_producer_set_speed( source, 0 );
        mlt_producer_set_speed( producer, 0 );
 
        this->count ++;
@@ -312,6 +314,7 @@ static mlt_service mlt_playlist_virtual_seek( mlt_playlist this )
                total += this->list[ i ]->frame_count;
 
                // Check if the position indicates that we have found the clip
+               // Note that 0 length clips get skipped automatically
                if ( position < this->list[ i ]->frame_count )
                {
                        // Found it, now break
@@ -328,7 +331,8 @@ static mlt_service mlt_playlist_virtual_seek( mlt_playlist this )
        // Seek in real producer to relative position
        if ( producer != NULL )
        {
-               mlt_producer_seek( producer, position );
+               int count = this->list[ i ]->frame_count / this->list[ i ]->repeat;
+               mlt_producer_seek( producer, position % count );
        }
        else if ( !strcmp( eof, "pause" ) && total > 0 )
        {
@@ -496,9 +500,9 @@ int mlt_playlist_get_clip_info( mlt_playlist this, mlt_playlist_clip_info *info,
                info->frame_in = this->list[ index ]->frame_in;
                info->frame_out = this->list[ index ]->frame_out;
                info->frame_count = this->list[ index ]->frame_count;
+               info->repeat = this->list[ index ]->repeat;
                info->length = mlt_producer_get_length( producer );
                info->fps = mlt_producer_get_fps( producer );
-               info->event = this->list[ index ]->event;
        }
 
        return error;
@@ -691,7 +695,22 @@ int mlt_playlist_move( mlt_playlist this, int src, int dest )
        return 0;
 }
 
-/** Resize the current clip.
+/** Repeat the specified clip n times.
+*/
+
+int mlt_playlist_repeat_clip( mlt_playlist this, int clip, int repeat )
+{
+       int error = repeat < 1 || clip < 0 || clip >= this->count;
+       if ( error == 0 )
+       {
+               playlist_entry *entry = this->list[ clip ];
+               entry->repeat = repeat;
+               mlt_playlist_virtual_refresh( this );
+       }
+       return error;
+}
+
+/** Resize the specified clip.
 */
 
 int mlt_playlist_resize_clip( mlt_playlist this, int clip, mlt_position in, mlt_position out )
@@ -730,14 +749,13 @@ int mlt_playlist_split( mlt_playlist this, int clip, mlt_position position )
                playlist_entry *entry = this->list[ clip ];
                if ( position > 0 && position < entry->frame_count )
                {
-                       mlt_producer parent = mlt_producer_cut_parent( entry->producer );
                        mlt_producer split = NULL;
                        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 );
-                       split = mlt_producer_cut( parent, in + position + 1, out );
-                       mlt_playlist_insert( this, split, clip + 1, -1, -1 );
+                       split = mlt_producer_cut( entry->producer, in + position + 1, out );
+                       mlt_playlist_insert( this, split, clip + 1, 0, -1 );
                        mlt_events_unblock( mlt_playlist_properties( this ), this );
                        mlt_events_fire( mlt_playlist_properties( this ), "producer-changed", NULL );
                }
@@ -754,7 +772,7 @@ int mlt_playlist_split( mlt_playlist this, int clip, mlt_position position )
 
 int mlt_playlist_join( mlt_playlist this, int clip, int count, int merge )
 {
-       int error = clip < 0 || ( clip + 1 ) >= this->count;
+       int error = clip < 0 || ( clip ) >= this->count;
        if ( error == 0 )
        {
                int i = clip;
@@ -766,6 +784,7 @@ int mlt_playlist_join( mlt_playlist this, int clip, int count, int merge )
                {
                        playlist_entry *entry = this->list[ clip ];
                        mlt_playlist_append( new_clip, entry->producer );
+                       mlt_playlist_repeat_clip( new_clip, i, entry->repeat );
                        mlt_playlist_remove( this, clip );
                }
                mlt_events_unblock( mlt_playlist_properties( this ), this );

diff --git a/src/framework/mlt_playlist.h b/src/framework/mlt_playlist.h
index d51dacb2068486cc34adb3734cd5aa5bda49de58..0cc0a1d9ba81072817f082b6cbd690936bbe0b11 100644 (file)
--- a/src/framework/mlt_playlist.h
+++ b/src/framework/mlt_playlist.h
@@ -38,7 +38,7 @@ typedef struct
        mlt_position frame_count;
        mlt_position length;
        float fps;
-       mlt_event event;
+       int repeat;
 }
 mlt_playlist_clip_info;
 
@@ -62,6 +62,7 @@ extern int mlt_playlist_insert( mlt_playlist self, mlt_producer producer, int wh
 extern int mlt_playlist_remove( mlt_playlist self, int where );
 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_repeat_clip( mlt_playlist self, int clip, int repeat );
 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 );

diff --git a/src/modules/inigo/producer_inigo.c b/src/modules/inigo/producer_inigo.c
index 94a63ebd2b5d7f38b34873a90d689aca3ec34bda..593cc19362c0683d349fe57fe32f1b3d3cd3859c 100644 (file)
--- a/src/modules/inigo/producer_inigo.c
+++ b/src/modules/inigo/producer_inigo.c
@@ -158,10 +158,57 @@ mlt_producer producer_inigo_init( char **argv )
                                mlt_properties_inherit( properties, group );
                        }
                }
+               else if ( !strcmp( argv[ i ], "-repeat" ) )
+               {
+                       int repeat = atoi( argv[ ++ i ] );
+                       if ( producer != NULL && !mlt_producer_is_cut( producer ) )
+                               mlt_playlist_append( playlist, producer );
+                       producer = NULL;
+                       if ( mlt_playlist_count( playlist ) > 0 )
+                       {
+                               mlt_playlist_clip_info info;
+                               mlt_playlist_repeat_clip( playlist, mlt_playlist_count( playlist ) - 1, repeat );
+                               mlt_playlist_get_clip_info( playlist, &info, mlt_playlist_count( playlist ) - 1 );
+                               producer = info.cut;
+                               properties = mlt_producer_properties( producer );
+                       }
+               }
+               else if ( !strcmp( argv[ i ], "-split" ) )
+               {
+                       int split = atoi( argv[ ++ i ] );
+                       if ( producer != NULL && !mlt_producer_is_cut( producer ) )
+                               mlt_playlist_append( playlist, producer );
+                       producer = NULL;
+                       if ( mlt_playlist_count( playlist ) > 0 )
+                       {
+                               mlt_playlist_clip_info info;
+                               mlt_playlist_get_clip_info( playlist, &info, mlt_playlist_count( playlist ) - 1 );
+                               split = split < 0 ? info.frame_out + split : split;
+                               mlt_playlist_split( playlist, mlt_playlist_count( playlist ) - 1, split );
+                               mlt_playlist_get_clip_info( playlist, &info, mlt_playlist_count( playlist ) - 1 );
+                               producer = info.cut;
+                               properties = mlt_producer_properties( producer );
+                       }
+               }
+               else if ( !strcmp( argv[ i ], "-join" ) )
+               {
+                       int clips = atoi( argv[ ++ i ] );
+                       if ( producer != NULL && !mlt_producer_is_cut( producer ) )
+                               mlt_playlist_append( playlist, producer );
+                       producer = NULL;
+                       if ( mlt_playlist_count( playlist ) > 0 )
+                       {
+                               mlt_playlist_clip_info info;
+                               mlt_playlist_join( playlist, mlt_playlist_count( playlist ) - clips - 1, clips, 0 );
+                               mlt_playlist_get_clip_info( playlist, &info, mlt_playlist_count( playlist ) - 1 );
+                               producer = info.cut;
+                               properties = mlt_producer_properties( producer );
+                       }
+               }
                else if ( !strcmp( argv[ i ], "-mix" ) )
                {
                        int length = atoi( argv[ ++ i ] );
-                       if ( producer != NULL )
+                       if ( producer != NULL && !mlt_producer_is_cut( producer ) )
                                mlt_playlist_append( playlist, producer );
                        producer = NULL;
                        if ( mlt_playlist_count( playlist ) >= 2 )
@@ -231,7 +278,7 @@ mlt_producer producer_inigo_init( char **argv )
                }
                else if ( !strcmp( argv[ i ], "-blank" ) )
                {
-                       if ( producer != NULL )
+                       if ( producer != NULL && !mlt_producer_is_cut( producer ) )
                                mlt_playlist_append( playlist, producer );
                        producer = NULL;
                        mlt_playlist_blank( playlist, atof( argv[ ++ i ] ) );
@@ -241,7 +288,7 @@ mlt_producer producer_inigo_init( char **argv )
                                  !strcmp( argv[ i ], "-hide-video" ) ||
                                  !strcmp( argv[ i ], "-hide-audio" ) )
                {
-                       if ( producer != NULL )
+                       if ( producer != NULL && !mlt_producer_is_cut( producer ) )
                                mlt_playlist_append( playlist, producer );
                        producer = NULL;
                        mlt_multitrack_connect( multitrack, mlt_playlist_producer( playlist ), track ++ );
@@ -264,7 +311,7 @@ mlt_producer producer_inigo_init( char **argv )
                }
                else if ( argv[ i ][ 0 ] != '-' )
                {
-                       if ( producer != NULL )
+                       if ( producer != NULL && !mlt_producer_is_cut( producer ) )
                                mlt_playlist_append( playlist, producer );
                        if ( title == NULL )
                                title = argv[ i ];
@@ -290,7 +337,7 @@ mlt_producer producer_inigo_init( char **argv )
        }
 
        // Connect last producer to playlist
-       if ( producer != NULL )
+       if ( producer != NULL && !mlt_producer_is_cut( producer ) )
                mlt_playlist_append( playlist, producer );
 
        // Track the last playlist too

diff --git a/src/modules/westley/consumer_westley.c b/src/modules/westley/consumer_westley.c
index 286d0ea9b3e8e5c89ee412f5b91a3502f34ae14f..6a9644c190173cb877cdaa82f9ddacd45a7c96e7 100644 (file)
--- a/src/modules/westley/consumer_westley.c
+++ b/src/modules/westley/consumer_westley.c
@@ -358,6 +358,8 @@ static void serialise_playlist( serialise_context context, mlt_service service,
                                                serialise_tractor( context, MLT_SERVICE( producer ), node );
                                                context->pass --;
                                        }
+                                       else if ( resource_s != NULL && !strcmp( resource_s, "<playlist>" ) )
+                                               serialise_playlist( context, MLT_SERVICE( producer ), node );
                                        else if ( service_s != NULL && strcmp( service_s, "blank" ) != 0 )
                                                serialise_service( context, MLT_SERVICE( producer ), node );
                                }
@@ -397,6 +399,11 @@ static void serialise_playlist( serialise_context context, mlt_service service,
                                        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 );
                                }

diff --git a/src/modules/westley/producer_westley.c b/src/modules/westley/producer_westley.c
index 6ea81c7e12983c76a82d674207d688be8416f34a..fa4040653489a72557bc36ad6799dde2f7be7826 100644 (file)
--- a/src/modules/westley/producer_westley.c
+++ b/src/modules/westley/producer_westley.c
@@ -639,6 +639,14 @@ static void on_start_entry( deserialise_context context, const xmlChar *name, co
                                mlt_playlist_append( MLT_PLAYLIST( parent ), producer );
                        }
 
+                       // Handle the repeat property
+                       if ( mlt_properties_get_int( temp, "repeat" ) > 0 )
+                       {
+                               mlt_playlist_repeat_clip( MLT_PLAYLIST( parent ),
+                                                                                 mlt_playlist_count( MLT_PLAYLIST( parent ) ) - 1,
+                                                                                 mlt_properties_get_int( temp, "repeat" ) );
+                       }
+
                        mlt_playlist_get_clip_info( MLT_PLAYLIST( parent ), &info, mlt_playlist_count( MLT_PLAYLIST( parent ) ) - 1 );
                        entry = info.cut;
                }