X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_playlist.c;h=bd9d6b239a429384d9b7081c5a8ba8ebe742552f;hb=9b115c18489fdc84e2198fef65e4e444f579ff24;hp=be707f6c27aa33e35eea7d231c4831246994008e;hpb=909d149697331a560edb1924f58fc58c5a25aaea;p=melted diff --git a/src/framework/mlt_playlist.c b/src/framework/mlt_playlist.c index be707f6..bd9d6b2 100644 --- 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 #include @@ -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,29 @@ 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 != &this->blank && + ( this->list[ i ]->frame_in != mlt_producer_get_in( producer ) || + this->list[ i ]->frame_out != mlt_producer_get_out( producer ) ) ) + { + // This clip should be removed... + if ( current_length == 1 ) + { + this->list[ i ]->frame_in = 0; + this->list[ i ]->frame_out = 0; + this->list[ i ]->frame_count = 0; + } + else + { + this->list[ i ]->frame_in = mlt_producer_get_in( producer ); + this->list[ i ]->frame_out = mlt_producer_get_out( producer ); + this->list[ i ]->frame_count = current_length; + } + + // 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; } @@ -184,9 +218,38 @@ static void mlt_playlist_listener( mlt_producer producer, mlt_playlist this ) /** Append to the virtual playlist. */ -static int mlt_playlist_virtual_append( mlt_playlist this, mlt_producer producer, mlt_position in, mlt_position out ) +static int mlt_playlist_virtual_append( mlt_playlist this, mlt_producer source, mlt_position in, mlt_position out ) { - mlt_properties properties = mlt_producer_properties( producer ); + 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 ) + { + producer = source; + properties = mlt_producer_properties( producer ); + mlt_properties_inc_ref( properties ); + } + else if ( mlt_producer_is_cut( source ) ) + { + producer = source; + if ( in == -1 ) + in = mlt_producer_get_in( producer ); + if ( out == -1 || out > mlt_producer_get_out( producer ) ) + out = mlt_producer_get_out( producer ); + properties = mlt_producer_properties( producer ); + mlt_properties_inc_ref( properties ); + } + else + { + producer = mlt_producer_cut( source, in, out ); + if ( in == -1 || in < mlt_producer_get_in( producer ) ) + in = mlt_producer_get_in( producer ); + if ( out == -1 || out > mlt_producer_get_out( producer ) ) + out = mlt_producer_get_out( producer ); + properties = mlt_producer_properties( producer ); + } + // Check that we have room if ( this->count >= this->size ) @@ -202,16 +265,18 @@ 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 ); + 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 ++; - mlt_properties_inc_ref( properties ); - return mlt_playlist_virtual_refresh( this ); } @@ -263,7 +328,6 @@ static mlt_service mlt_playlist_virtual_seek( mlt_playlist this ) // Seek in real producer to relative position if ( producer != NULL ) { - position += this->list[ i ]->frame_in; mlt_producer_seek( producer, position ); } else if ( !strcmp( eof, "pause" ) && total > 0 ) @@ -282,7 +346,7 @@ static mlt_service mlt_playlist_virtual_seek( mlt_playlist this ) mlt_producer this_producer = mlt_playlist_producer( this ); mlt_producer_seek( this_producer, 0 ); producer = entry->producer; - mlt_producer_seek( producer, entry->frame_in ); + mlt_producer_seek( producer, 0 ); } else { @@ -422,7 +486,7 @@ int mlt_playlist_get_clip_info( mlt_playlist this, mlt_playlist_clip_info *info, memset( info, 0, sizeof( mlt_playlist_clip_info ) ); if ( !error ) { - mlt_producer producer = this->list[ index ]->producer; + mlt_producer producer = mlt_producer_cut_parent( this->list[ index ]->producer ); mlt_properties properties = mlt_producer_properties( producer ); info->clip = index; info->producer = producer; @@ -522,7 +586,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 ); @@ -530,22 +595,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 ++ ) @@ -560,11 +630,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. @@ -631,15 +704,15 @@ 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; if ( in <= -1 ) in = 0; - if ( out <= -1 || out >= mlt_producer_get_playtime( producer ) ) - out = mlt_producer_get_playtime( producer ) - 1; + if ( out <= -1 || out >= mlt_producer_get_length( producer ) ) + out = mlt_producer_get_length( producer ) - 1; if ( out < in ) { @@ -648,10 +721,7 @@ int mlt_playlist_resize_clip( mlt_playlist this, int clip, mlt_position in, mlt_ out = t; } - entry->frame_in = in; - entry->frame_out = out; - entry->frame_count = out - in + 1; - mlt_playlist_virtual_refresh( this ); + mlt_producer_set_in_and_out( producer, in, out ); } return error; } @@ -667,12 +737,16 @@ 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 ); mlt_events_unblock( mlt_playlist_properties( this ), this ); - mlt_playlist_insert( this, entry->producer, clip + 1, in + position + 1, out ); + mlt_events_fire( mlt_playlist_properties( this ), "producer-changed", NULL ); } else { @@ -698,7 +772,7 @@ int mlt_playlist_join( mlt_playlist this, int clip, int count, int merge ) for ( i = 0; i <= count; i ++ ) { playlist_entry *entry = this->list[ clip ]; - mlt_playlist_append_io( new_clip, entry->producer, entry->frame_in, entry->frame_out ); + mlt_playlist_append( new_clip, entry->producer ); mlt_playlist_remove( this, clip ); } mlt_events_unblock( mlt_playlist_properties( this ), this ); @@ -708,6 +782,159 @@ 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 *clip_a = this->list[ clip ]; + playlist_entry *clip_b = this->list[ clip + 1 ]; + mlt_producer track_a; + mlt_producer track_b; + mlt_tractor tractor = mlt_tractor_new( ); + mlt_events_block( mlt_playlist_properties( this ), this ); + + track_a = mlt_producer_cut( clip_a->producer, clip_a->frame_out - length + 1, clip_a->frame_out ); + mlt_properties_set_int( mlt_producer_properties( track_a ), "cut", 1 ); + track_b = mlt_producer_cut( clip_b->producer, clip_b->frame_in, clip_b->frame_in + length - 1 ); + mlt_properties_set_int( mlt_producer_properties( track_b ), "cut", 1 ); + + mlt_playlist_resize_clip( this, clip, clip_a->frame_in, clip_a->frame_out - length + 1 ); + mlt_playlist_resize_clip( this, clip + 1, clip_b->frame_in + length, clip_b->frame_out ); + + mlt_tractor_set_track( tractor, track_a, 0 ); + mlt_tractor_set_track( tractor, track_b, 1 ); + mlt_playlist_insert( this, mlt_tractor_producer( tractor ), clip + 1, -1, -1 ); + mlt_properties_set_data( mlt_tractor_properties( tractor ), "mlt_mix", tractor, 0, NULL, NULL ); + + 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 ); + } + + if ( clip_b->frame_count <= 0 ) + mlt_playlist_remove( this, clip + 2 ); + + if ( clip_a->frame_count <= 0 ) + mlt_playlist_remove( this, clip ); + + mlt_events_unblock( mlt_playlist_properties( this ), this ); + mlt_events_fire( mlt_playlist_properties( this ), "producer-changed", NULL ); + mlt_producer_close( track_a ); + mlt_producer_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; + } + else + { + mlt_tractor tractor = ( mlt_tractor )mix->producer; + mlt_playlist playlist = ( mlt_playlist )mlt_tractor_get_track( tractor, 0 ); + mlt_producer producer = playlist->list[ 0 ]->producer; + mlt_playlist_insert( this, producer, clip, playlist->list[0]->frame_in, playlist->list[0]->frame_out ); + clip ++; + } + + 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; + } + else + { + mlt_tractor tractor = ( mlt_tractor )mix->producer; + mlt_playlist playlist = ( mlt_playlist )mlt_tractor_get_track( tractor, 1 ); + mlt_producer producer = playlist->list[ 0 ]->producer; + mlt_playlist_insert( this, producer, clip + 1, playlist->list[0]->frame_in, playlist->list[0]->frame_out ); + } + + 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. */