X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_playlist.c;h=eac06425a87b7c7390b7178fc117ce22d83e1b1b;hb=bf3264b9e340ba5c11cbf59835a8af3db94e0cc2;hp=2cf7e86ea114954e76b18995649f0bd74151d6f9;hpb=b21b66672758c0dade3c3549cc7f6822bb853523;p=melted diff --git a/src/framework/mlt_playlist.c b/src/framework/mlt_playlist.c index 2cf7e86..eac0642 100644 --- a/src/framework/mlt_playlist.c +++ b/src/framework/mlt_playlist.c @@ -3,19 +3,19 @@ * Copyright (C) 2003-2004 Ushodaya Enterprises Limited * Author: Charles Yates * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * 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 program is distributed in the hope that it will be useful, + * 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 General Public License for more details. + * 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 General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * 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 "config.h" @@ -34,7 +34,7 @@ /** Virtual playlist entry. */ -typedef struct playlist_entry_s +struct playlist_entry_s { mlt_producer producer; mlt_position frame_in; @@ -44,20 +44,6 @@ typedef struct playlist_entry_s mlt_position producer_length; mlt_event event; int preservation_hack; -} -playlist_entry; - -/** Private definition. -*/ - -struct mlt_playlist_s -{ - struct mlt_producer_s parent; - struct mlt_producer_s blank; - - int size; - int count; - playlist_entry **list; }; /** Forward declarations @@ -89,19 +75,19 @@ mlt_playlist mlt_playlist_init( ) // Initialise blank mlt_producer_init( &this->blank, NULL ); - mlt_properties_set( mlt_producer_properties( &this->blank ), "mlt_service", "blank" ); - mlt_properties_set( mlt_producer_properties( &this->blank ), "resource", "blank" ); + mlt_properties_set( MLT_PRODUCER_PROPERTIES( &this->blank ), "mlt_service", "blank" ); + mlt_properties_set( MLT_PRODUCER_PROPERTIES( &this->blank ), "resource", "blank" ); // Indicate that this producer is a playlist - mlt_properties_set_data( mlt_playlist_properties( this ), "playlist", this, 0, NULL, NULL ); + mlt_properties_set_data( MLT_PLAYLIST_PROPERTIES( this ), "playlist", this, 0, NULL, NULL ); // Specify the eof condition - mlt_properties_set( mlt_playlist_properties( this ), "eof", "pause" ); - mlt_properties_set( mlt_playlist_properties( this ), "resource", "" ); - mlt_properties_set( mlt_playlist_properties( this ), "mlt_type", "mlt_producer" ); - mlt_properties_set_position( mlt_playlist_properties( this ), "in", 0 ); - mlt_properties_set_position( mlt_playlist_properties( this ), "out", -1 ); - mlt_properties_set_position( mlt_playlist_properties( this ), "length", 0 ); + mlt_properties_set( MLT_PLAYLIST_PROPERTIES( this ), "eof", "pause" ); + mlt_properties_set( MLT_PLAYLIST_PROPERTIES( this ), "resource", "" ); + mlt_properties_set( MLT_PLAYLIST_PROPERTIES( this ), "mlt_type", "mlt_producer" ); + mlt_properties_set_position( MLT_PLAYLIST_PROPERTIES( this ), "in", 0 ); + mlt_properties_set_position( MLT_PLAYLIST_PROPERTIES( this ), "out", -1 ); + mlt_properties_set_position( MLT_PLAYLIST_PROPERTIES( this ), "length", 0 ); this->size = 10; this->list = malloc( this->size * sizeof( playlist_entry * ) ); @@ -123,7 +109,7 @@ mlt_producer mlt_playlist_producer( mlt_playlist this ) mlt_service mlt_playlist_service( mlt_playlist this ) { - return mlt_producer_service( &this->parent ); + return MLT_PRODUCER_SERVICE( &this->parent ); } /** Get the propertues associated to this playlist. @@ -131,7 +117,7 @@ mlt_service mlt_playlist_service( mlt_playlist this ) mlt_properties mlt_playlist_properties( mlt_playlist this ) { - return mlt_producer_properties( &this->parent ); + return MLT_PRODUCER_PROPERTIES( &this->parent ); } /** Refresh the playlist after a clip has been changed. @@ -140,7 +126,7 @@ mlt_properties mlt_playlist_properties( mlt_playlist this ) static int mlt_playlist_virtual_refresh( mlt_playlist this ) { // Obtain the properties - mlt_properties properties = mlt_playlist_properties( this ); + mlt_properties properties = MLT_PLAYLIST_PROPERTIES( this ); // Get the fps of the first producer double fps = mlt_properties_get_double( properties, "first_fps" ); @@ -159,13 +145,13 @@ static int mlt_playlist_virtual_refresh( mlt_playlist this ) // Inherit it from the producer fps = mlt_producer_get_fps( producer ); } - else if ( fps != mlt_properties_get_double( mlt_producer_properties( producer ), "fps" ) ) + else if ( fps != mlt_properties_get_double( MLT_PRODUCER_PROPERTIES( producer ), "fps" ) ) { // Generate a warning for now - the following attempt to fix may fail fprintf( stderr, "Warning: fps mismatch on playlist producer %d\n", this->count ); // It should be safe to impose fps on an image producer, but not necessarily safe for video - mlt_properties_set_double( mlt_producer_properties( producer ), "fps", fps ); + mlt_properties_set_double( MLT_PRODUCER_PROPERTIES( producer ), "fps", fps ); } // Check if the length of the producer has changed @@ -231,7 +217,7 @@ static int mlt_playlist_virtual_append( mlt_playlist this, mlt_producer source, // Make sure the blank is long enough to accomodate the length specified if ( out - in + 1 > mlt_producer_get_length( &this->blank ) ) { - mlt_properties blank_props = mlt_producer_properties( &this->blank ); + mlt_properties blank_props = MLT_PRODUCER_PROPERTIES( &this->blank ); mlt_events_block( blank_props, blank_props ); mlt_producer_set_in_and_out( &this->blank, in, out ); mlt_events_unblock( blank_props, blank_props ); @@ -249,10 +235,10 @@ static int mlt_playlist_virtual_append( mlt_playlist this, mlt_producer source, else { producer = source; - mlt_properties_inc_ref( mlt_producer_properties( producer ) ); + mlt_properties_inc_ref( MLT_PRODUCER_PROPERTIES( producer ) ); } - properties = mlt_producer_properties( producer ); + properties = MLT_PRODUCER_PROPERTIES( producer ); } else if ( mlt_producer_is_cut( source ) ) { @@ -261,7 +247,7 @@ static int mlt_playlist_virtual_append( mlt_playlist this, mlt_producer source, 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 ); + properties = MLT_PRODUCER_PROPERTIES( producer ); mlt_properties_inc_ref( properties ); } else @@ -271,11 +257,24 @@ static int mlt_playlist_virtual_append( mlt_playlist this, mlt_producer source, 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 ); + properties = MLT_PRODUCER_PROPERTIES( producer ); } // Fetch the cuts parent properties - parent = mlt_producer_properties( mlt_producer_cut_parent( producer ) ); + parent = MLT_PRODUCER_PROPERTIES( mlt_producer_cut_parent( producer ) ); + + // Remove fezzik normalisers for fx cuts + if ( mlt_properties_get_int( parent, "meta.fx_cut" ) ) + { + mlt_service service = MLT_PRODUCER_SERVICE( mlt_producer_cut_parent( producer ) ); + mlt_filter filter = mlt_service_filter( service, 0 ); + while ( filter != NULL && mlt_properties_get_int( MLT_FILTER_PROPERTIES( filter ), "_fezzik" ) ) + { + mlt_service_detach( service, filter ); + filter = mlt_service_filter( service, 0 ); + } + mlt_properties_set_int( MLT_PRODUCER_PROPERTIES( producer ), "meta.fx_cut", 1 ); + } // Check that we have room if ( this->count >= this->size ) @@ -354,7 +353,7 @@ static mlt_service mlt_playlist_virtual_seek( mlt_playlist this, int *progressiv mlt_producer producer = mlt_playlist_locate( this, &position, &i, &total ); // Get the properties - mlt_properties properties = mlt_playlist_properties( this ); + mlt_properties properties = MLT_PLAYLIST_PROPERTIES( this ); // Get the eof handling char *eof = mlt_properties_get( properties, "eof" ); @@ -364,16 +363,16 @@ static mlt_service mlt_playlist_virtual_seek( mlt_playlist this, int *progressiv { int count = this->list[ i ]->frame_count / this->list[ i ]->repeat; *progressive = count == 1; - mlt_producer_seek( producer, position % count ); + mlt_producer_seek( producer, (int)position % count ); } else if ( !strcmp( eof, "pause" ) && total > 0 ) { playlist_entry *entry = this->list[ this->count - 1 ]; int count = entry->frame_count / entry->repeat; - mlt_producer this_producer = mlt_playlist_producer( this ); + mlt_producer this_producer = MLT_PLAYLIST_PRODUCER( this ); mlt_producer_seek( this_producer, original - 1 ); producer = entry->producer; - mlt_producer_seek( producer, entry->frame_out % count ); + mlt_producer_seek( producer, (int)entry->frame_out % count ); mlt_producer_set_speed( this_producer, 0 ); mlt_producer_set_speed( producer, 0 ); *progressive = count == 1; @@ -381,7 +380,7 @@ static mlt_service mlt_playlist_virtual_seek( mlt_playlist this, int *progressiv else if ( !strcmp( eof, "loop" ) && total > 0 ) { playlist_entry *entry = this->list[ 0 ]; - mlt_producer this_producer = mlt_playlist_producer( this ); + mlt_producer this_producer = MLT_PLAYLIST_PRODUCER( this ); mlt_producer_seek( this_producer, 0 ); producer = entry->producer; mlt_producer_seek( producer, 0 ); @@ -391,7 +390,7 @@ static mlt_service mlt_playlist_virtual_seek( mlt_playlist this, int *progressiv producer = &this->blank; } - return mlt_producer_service( producer ); + return MLT_PRODUCER_SERVICE( producer ); } /** Invoked when a producer indicates that it has prematurely reached its end. @@ -525,7 +524,7 @@ int mlt_playlist_get_clip_info( mlt_playlist this, mlt_playlist_clip_info *info, if ( !error ) { mlt_producer producer = mlt_producer_cut_parent( this->list[ index ]->producer ); - mlt_properties properties = mlt_producer_properties( producer ); + mlt_properties properties = MLT_PRODUCER_PROPERTIES( producer ); info->clip = index; info->producer = producer; info->cut = this->list[ index ]->producer; @@ -562,7 +561,7 @@ int mlt_playlist_clear( mlt_playlist this ) mlt_producer_close( this->list[ i ]->producer ); } this->count = 0; - mlt_properties_set_double( mlt_playlist_properties( this ), "first_fps", 0 ); + mlt_properties_set_double( MLT_PLAYLIST_PROPERTIES( this ), "first_fps", 0 ); return mlt_playlist_virtual_refresh( this ); } @@ -602,12 +601,12 @@ int mlt_playlist_blank( mlt_playlist this, mlt_position length ) int mlt_playlist_insert( mlt_playlist this, mlt_producer producer, int where, mlt_position in, mlt_position out ) { // Append to end - mlt_events_block( mlt_playlist_properties( this ), this ); + mlt_events_block( MLT_PLAYLIST_PROPERTIES( this ), this ); mlt_playlist_append_io( this, producer, in, out ); // Move to the position specified mlt_playlist_move( this, this->count - 1, where ); - mlt_events_unblock( mlt_playlist_properties( this ), this ); + mlt_events_unblock( MLT_PLAYLIST_PROPERTIES( this ), this ); return mlt_playlist_virtual_refresh( this ); } @@ -622,12 +621,12 @@ int mlt_playlist_remove( mlt_playlist this, int where ) { // We need to know the current clip and the position within the playlist int current = mlt_playlist_current_clip( this ); - mlt_position position = mlt_producer_position( mlt_playlist_producer( this ) ); + mlt_position position = mlt_producer_position( MLT_PLAYLIST_PRODUCER( this ) ); // We need all the details about the clip we're removing mlt_playlist_clip_info where_info; playlist_entry *entry = this->list[ where ]; - mlt_properties properties = mlt_producer_properties( entry->producer ); + mlt_properties properties = MLT_PRODUCER_PROPERTIES( entry->producer ); // Loop variable int i = 0; @@ -660,7 +659,8 @@ int mlt_playlist_remove( mlt_playlist this, int where ) mlt_properties_set_data( mix, "mix_in", NULL, 0, NULL, NULL ); } - mlt_producer_clear( entry->producer ); + if ( mlt_properties_ref_count( MLT_PRODUCER_PROPERTIES( entry->producer ) ) == 1 ) + mlt_producer_clear( entry->producer ); } // Close the producer associated to the clip info @@ -669,11 +669,11 @@ int mlt_playlist_remove( mlt_playlist this, int where ) // Correct position if ( where == current ) - mlt_producer_seek( mlt_playlist_producer( this ), where_info.start ); + mlt_producer_seek( MLT_PLAYLIST_PRODUCER( this ), where_info.start ); else if ( where < current && this->count > 0 ) - mlt_producer_seek( mlt_playlist_producer( this ), position - where_info.frame_count ); + mlt_producer_seek( MLT_PLAYLIST_PRODUCER( this ), position - where_info.frame_count ); else if ( this->count == 0 ) - mlt_producer_seek( mlt_playlist_producer( this ), 0 ); + mlt_producer_seek( MLT_PLAYLIST_PRODUCER( this ), 0 ); // Free the entry free( entry ); @@ -706,7 +706,7 @@ int mlt_playlist_move( mlt_playlist this, int src, int dest ) if ( src != dest && this->count > 1 ) { int current = mlt_playlist_current_clip( this ); - mlt_position position = mlt_producer_position( mlt_playlist_producer( this ) ); + mlt_position position = mlt_producer_position( MLT_PLAYLIST_PRODUCER( this ) ); playlist_entry *src_entry = NULL; // We need all the details about the current clip @@ -736,7 +736,7 @@ int mlt_playlist_move( mlt_playlist this, int src, int dest ) this->list[ dest ] = src_entry; mlt_playlist_get_clip_info( this, ¤t_info, current ); - mlt_producer_seek( mlt_playlist_producer( this ), current_info.start + position ); + mlt_producer_seek( MLT_PLAYLIST_PRODUCER( this ), current_info.start + position ); mlt_playlist_virtual_refresh( this ); } @@ -768,16 +768,19 @@ int mlt_playlist_resize_clip( mlt_playlist this, int clip, mlt_position in, mlt_ { playlist_entry *entry = this->list[ clip ]; mlt_producer producer = entry->producer; + mlt_properties properties = MLT_PLAYLIST_PROPERTIES( this ); + + mlt_events_block( properties, properties ); if ( mlt_producer_is_blank( producer ) ) { // Make sure the blank is long enough to accomodate the length specified if ( out - in + 1 > mlt_producer_get_length( &this->blank ) ) { - mlt_properties blank_props = mlt_producer_properties( &this->blank ); - mlt_events_block( blank_props, blank_props ); - mlt_producer_set_in_and_out( &this->blank, in, out ); - mlt_events_unblock( blank_props, blank_props ); + mlt_properties blank_props = MLT_PRODUCER_PROPERTIES( &this->blank ); + mlt_properties_set_int( blank_props, "length", out - in + 1 ); + mlt_properties_set_int( MLT_PRODUCER_PROPERTIES( producer ), "length", out - in + 1 ); + mlt_producer_set_in_and_out( &this->blank, 0, out - in ); } } @@ -794,6 +797,8 @@ int mlt_playlist_resize_clip( mlt_playlist this, int clip, mlt_position in, mlt_ } mlt_producer_set_in_and_out( producer, in, out ); + mlt_events_unblock( properties, properties ); + mlt_playlist_virtual_refresh( this ); } return error; } @@ -808,23 +813,32 @@ int mlt_playlist_split( mlt_playlist this, int clip, mlt_position position ) { playlist_entry *entry = this->list[ clip ]; position = position < 0 ? entry->frame_count + position - 1 : position; - if ( position >= 0 && position <= entry->frame_count ) + if ( position >= 0 && position < entry->frame_count - 1 ) { int in = entry->frame_in; int out = entry->frame_out; - mlt_events_block( mlt_playlist_properties( this ), this ); + mlt_events_block( MLT_PLAYLIST_PROPERTIES( this ), this ); mlt_playlist_resize_clip( this, clip, in, in + position ); if ( !mlt_producer_is_blank( entry->producer ) ) { + int i = 0; + mlt_properties entry_properties = MLT_PRODUCER_PROPERTIES( entry->producer ); mlt_producer split = mlt_producer_cut( entry->producer, in + position + 1, out ); + mlt_properties split_properties = MLT_PRODUCER_PROPERTIES( split ); mlt_playlist_insert( this, split, clip + 1, 0, -1 ); + for ( i = 0; i < mlt_properties_count( entry_properties ); i ++ ) + { + char *name = mlt_properties_get_name( entry_properties, i ); + if ( name != NULL && !strncmp( name, "meta.", 5 ) ) + mlt_properties_set( split_properties, name, mlt_properties_get_value( entry_properties, i ) ); + } mlt_producer_close( split ); } else { mlt_playlist_insert( this, &this->blank, clip + 1, 0, out - position - 1 ); } - mlt_events_unblock( mlt_playlist_properties( this ), this ); + mlt_events_unblock( MLT_PLAYLIST_PROPERTIES( this ), this ); mlt_playlist_virtual_refresh( this ); } else @@ -835,19 +849,50 @@ int mlt_playlist_split( mlt_playlist this, int clip, mlt_position position ) return error; } +/** Split the playlist at the absolute position. +*/ + +int mlt_playlist_split_at( mlt_playlist this, mlt_position position, int left ) +{ + int result = this == NULL ? -1 : 0; + if ( !result ) + { + if ( position >= 0 && position < mlt_producer_get_playtime( MLT_PLAYLIST_PRODUCER( this ) ) ) + { + int clip = mlt_playlist_get_clip_index_at( this, position ); + mlt_playlist_clip_info info; + mlt_playlist_get_clip_info( this, &info, clip ); + if ( left && position != info.start ) + mlt_playlist_split( this, clip, position - info.start - 1 ); + else if ( !left ) + mlt_playlist_split( this, clip, position - info.start ); + result = position; + } + else if ( position <= 0 ) + { + result = 0; + } + else + { + result = mlt_producer_get_playtime( MLT_PLAYLIST_PRODUCER( this ) ); + } + } + return result; +} + /** Join 1 or more consecutive clips. */ int mlt_playlist_join( mlt_playlist this, int clip, int count, int merge ) { - int error = clip < 0 || ( clip ) >= this->count; + int error = clip < 0 || clip >= this->count; if ( error == 0 ) { int i = clip; mlt_playlist new_clip = mlt_playlist_init( ); - mlt_events_block( mlt_playlist_properties( this ), this ); + mlt_events_block( MLT_PLAYLIST_PROPERTIES( this ), this ); if ( clip + count >= this->count ) - count = this->count - clip; + count = this->count - clip - 1; for ( i = 0; i <= count; i ++ ) { playlist_entry *entry = this->list[ clip ]; @@ -856,8 +901,8 @@ int mlt_playlist_join( mlt_playlist this, int clip, int count, int merge ) entry->preservation_hack = 1; mlt_playlist_remove( this, clip ); } - mlt_events_unblock( mlt_playlist_properties( this ), this ); - mlt_playlist_insert( this, mlt_playlist_producer( new_clip ), clip, 0, -1 ); + mlt_events_unblock( MLT_PLAYLIST_PROPERTIES( this ), this ); + mlt_playlist_insert( this, MLT_PLAYLIST_PRODUCER( new_clip ), clip, 0, -1 ); mlt_playlist_close( new_clip ); } return error; @@ -876,7 +921,7 @@ int mlt_playlist_mix( mlt_playlist this, int clip, int length, mlt_transition tr mlt_producer track_a = NULL; mlt_producer track_b = NULL; mlt_tractor tractor = mlt_tractor_new( ); - mlt_events_block( mlt_playlist_properties( this ), this ); + mlt_events_block( MLT_PLAYLIST_PROPERTIES( this ), this ); // Check length is valid for both clips and resize if necessary. int max_size = clip_a->frame_count > clip_b->frame_count ? clip_a->frame_count : clip_b->frame_count; @@ -898,8 +943,8 @@ int mlt_playlist_mix( mlt_playlist this, int clip, int length, mlt_transition tr mlt_tractor_set_track( tractor, track_b, 1 ); // Insert the mix object into the playlist - 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 ); + 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 ); // Attach the transition if ( transition != NULL ) @@ -924,8 +969,8 @@ int mlt_playlist_mix( mlt_playlist this, int clip, int length, mlt_transition tr else if ( clip_b->frame_out - clip_b->frame_in > length ) { mlt_playlist_resize_clip( this, clip + 2, clip_b->frame_in + length, clip_b->frame_out ); - mlt_properties_set_data( mlt_producer_properties( clip_b->producer ), "mix_in", tractor, 0, NULL, NULL ); - mlt_properties_set_data( mlt_tractor_properties( tractor ), "mix_out", clip_b->producer, 0, NULL, NULL ); + mlt_properties_set_data( MLT_PRODUCER_PROPERTIES( clip_b->producer ), "mix_in", tractor, 0, NULL, NULL ); + mlt_properties_set_data( MLT_TRACTOR_PROPERTIES( tractor ), "mix_out", clip_b->producer, 0, NULL, NULL ); } else { @@ -942,8 +987,8 @@ int mlt_playlist_mix( mlt_playlist this, int clip, int length, mlt_transition tr else if ( clip_a->frame_out - clip_a->frame_in > length ) { mlt_playlist_resize_clip( this, clip, clip_a->frame_in, clip_a->frame_out - length ); - mlt_properties_set_data( mlt_producer_properties( clip_a->producer ), "mix_out", tractor, 0, NULL, NULL ); - mlt_properties_set_data( mlt_tractor_properties( tractor ), "mix_in", clip_a->producer, 0, NULL, NULL ); + mlt_properties_set_data( MLT_PRODUCER_PROPERTIES( clip_a->producer ), "mix_out", tractor, 0, NULL, NULL ); + mlt_properties_set_data( MLT_TRACTOR_PROPERTIES( tractor ), "mix_in", clip_a->producer, 0, NULL, NULL ); } else { @@ -952,7 +997,7 @@ int mlt_playlist_mix( mlt_playlist this, int clip, int length, mlt_transition tr } // Unblock and force a fire off of change events to listeners - mlt_events_unblock( mlt_playlist_properties( this ), this ); + mlt_events_unblock( MLT_PLAYLIST_PROPERTIES( this ), this ); mlt_playlist_virtual_refresh( this ); mlt_tractor_close( tractor ); } @@ -965,7 +1010,7 @@ int mlt_playlist_mix( mlt_playlist this, int clip, int length, mlt_transition tr int mlt_playlist_mix_add( mlt_playlist this, int clip, mlt_transition transition ) { mlt_producer producer = mlt_producer_cut_parent( mlt_playlist_get_clip( this, clip ) ); - mlt_properties properties = producer != NULL ? mlt_producer_properties( producer ) : NULL; + mlt_properties properties = producer != NULL ? MLT_PRODUCER_PROPERTIES( producer ) : NULL; mlt_tractor tractor = properties != NULL ? mlt_properties_get_data( properties, "mlt_mix", NULL ) : NULL; int error = transition == NULL || tractor == NULL; if ( error == 0 ) @@ -990,7 +1035,7 @@ mlt_producer mlt_playlist_get_clip( mlt_playlist this, int clip ) /** Return the clip at the specified position. */ -mlt_producer mlt_playlist_get_clip_at( mlt_playlist this, int position ) +mlt_producer mlt_playlist_get_clip_at( mlt_playlist this, mlt_position position ) { int index = 0, total = 0; return mlt_playlist_locate( this, &position, &index, &total ); @@ -999,7 +1044,7 @@ mlt_producer mlt_playlist_get_clip_at( mlt_playlist this, int position ) /** Return the clip index of the specified position. */ -int mlt_playlist_get_clip_index_at( mlt_playlist this, int position ) +int mlt_playlist_get_clip_index_at( mlt_playlist this, mlt_position position ) { int index = 0, total = 0; mlt_playlist_locate( this, &position, &index, &total ); @@ -1012,7 +1057,7 @@ int mlt_playlist_get_clip_index_at( mlt_playlist this, int position ) int mlt_playlist_clip_is_mix( mlt_playlist this, int clip ) { mlt_producer producer = mlt_producer_cut_parent( mlt_playlist_get_clip( this, clip ) ); - mlt_properties properties = producer != NULL ? mlt_producer_properties( producer ) : NULL; + mlt_properties properties = producer != NULL ? MLT_PRODUCER_PROPERTIES( producer ) : NULL; mlt_tractor tractor = properties != NULL ? mlt_properties_get_data( properties, "mlt_mix", NULL ) : NULL; return tractor != NULL; } @@ -1029,7 +1074,7 @@ static int mlt_playlist_unmix( mlt_playlist this, int clip ) if ( error == 0 ) { mlt_producer producer = mlt_producer_cut_parent( this->list[ clip ]->producer ); - mlt_properties properties = mlt_producer_properties( producer ); + mlt_properties properties = MLT_PRODUCER_PROPERTIES( producer ); error = mlt_properties_get_data( properties, "mlt_mix", NULL ) == NULL || this->list[ clip ]->preservation_hack; } @@ -1038,11 +1083,11 @@ static int mlt_playlist_unmix( mlt_playlist this, int clip ) { playlist_entry *mix = this->list[ clip ]; mlt_tractor tractor = ( mlt_tractor )mlt_producer_cut_parent( mix->producer ); - mlt_properties properties = mlt_tractor_properties( tractor ); + mlt_properties properties = MLT_TRACTOR_PROPERTIES( tractor ); mlt_producer clip_a = mlt_properties_get_data( properties, "mix_in", NULL ); mlt_producer clip_b = mlt_properties_get_data( properties, "mix_out", NULL ); - int length = mlt_producer_get_playtime( mlt_tractor_producer( tractor ) ); - mlt_events_block( mlt_playlist_properties( this ), this ); + int length = mlt_producer_get_playtime( MLT_TRACTOR_PRODUCER( tractor ) ); + mlt_events_block( MLT_PLAYLIST_PROPERTIES( this ), this ); if ( clip_a != NULL ) { @@ -1067,7 +1112,7 @@ static int mlt_playlist_unmix( mlt_playlist this, int clip ) mlt_properties_set_data( properties, "mlt_mix", NULL, 0, NULL, NULL ); mlt_playlist_remove( this, clip ); - mlt_events_unblock( mlt_playlist_properties( this ), this ); + mlt_events_unblock( MLT_PLAYLIST_PROPERTIES( this ), this ); mlt_playlist_virtual_refresh( this ); } return error; @@ -1081,7 +1126,7 @@ static int mlt_playlist_resize_mix( mlt_playlist this, int clip, int in, int out if ( error == 0 ) { mlt_producer producer = mlt_producer_cut_parent( this->list[ clip ]->producer ); - mlt_properties properties = mlt_producer_properties( producer ); + mlt_properties properties = MLT_PRODUCER_PROPERTIES( producer ); error = mlt_properties_get_data( properties, "mlt_mix", NULL ) == NULL; } @@ -1089,14 +1134,14 @@ static int mlt_playlist_resize_mix( mlt_playlist this, int clip, int in, int out { playlist_entry *mix = this->list[ clip ]; mlt_tractor tractor = ( mlt_tractor )mlt_producer_cut_parent( mix->producer ); - mlt_properties properties = mlt_tractor_properties( tractor ); + mlt_properties properties = MLT_TRACTOR_PROPERTIES( tractor ); mlt_producer clip_a = mlt_properties_get_data( properties, "mix_in", NULL ); mlt_producer clip_b = mlt_properties_get_data( properties, "mix_out", NULL ); mlt_producer track_a = mlt_tractor_get_track( tractor, 0 ); mlt_producer track_b = mlt_tractor_get_track( tractor, 1 ); int length = out - in + 1; - int length_diff = length - mlt_producer_get_playtime( mlt_tractor_producer( tractor ) ); - mlt_events_block( mlt_playlist_properties( this ), this ); + int length_diff = length - mlt_producer_get_playtime( MLT_TRACTOR_PRODUCER( tractor ) ); + mlt_events_block( MLT_PLAYLIST_PROPERTIES( this ), this ); if ( clip_a != NULL ) mlt_producer_set_in_and_out( clip_a, mlt_producer_get_in( clip_a ), mlt_producer_get_out( clip_a ) - length_diff ); @@ -1106,12 +1151,12 @@ static int mlt_playlist_resize_mix( mlt_playlist this, int clip, int in, int out mlt_producer_set_in_and_out( track_a, mlt_producer_get_in( track_a ) - length_diff, mlt_producer_get_out( track_a ) ); mlt_producer_set_in_and_out( track_b, mlt_producer_get_in( track_b ), mlt_producer_get_out( track_b ) + length_diff ); - mlt_producer_set_in_and_out( mlt_multitrack_producer( mlt_tractor_multitrack( tractor ) ), in, out ); - mlt_producer_set_in_and_out( mlt_tractor_producer( tractor ), in, out ); - mlt_properties_set_position( mlt_producer_properties( mix->producer ), "length", out - in + 1 ); + mlt_producer_set_in_and_out( MLT_MULTITRACK_PRODUCER( mlt_tractor_multitrack( tractor ) ), in, out ); + mlt_producer_set_in_and_out( MLT_TRACTOR_PRODUCER( tractor ), in, out ); + mlt_properties_set_position( MLT_PRODUCER_PROPERTIES( mix->producer ), "length", out - in + 1 ); mlt_producer_set_in_and_out( mix->producer, in, out ); - mlt_events_unblock( mlt_playlist_properties( this ), this ); + mlt_events_unblock( MLT_PLAYLIST_PROPERTIES( this ), this ); mlt_playlist_virtual_refresh( this ); } return error; @@ -1125,7 +1170,7 @@ void mlt_playlist_consolidate_blanks( mlt_playlist this, int keep_length ) if ( this != NULL ) { int i = 0; - mlt_properties properties = mlt_playlist_properties( this ); + mlt_properties properties = MLT_PLAYLIST_PROPERTIES( this ); mlt_events_block( properties, properties ); for ( i = 1; i < this->count; i ++ ) @@ -1133,15 +1178,14 @@ void mlt_playlist_consolidate_blanks( mlt_playlist this, int keep_length ) playlist_entry *left = this->list[ i - 1 ]; playlist_entry *right = this->list[ i ]; - if ( mlt_producer_cut_parent( left->producer ) == mlt_producer_cut_parent( right->producer ) && - mlt_producer_is_blank( left->producer ) ) + if ( mlt_producer_is_blank( left->producer ) && mlt_producer_is_blank( right->producer ) ) { mlt_playlist_resize_clip( this, i - 1, 0, left->frame_count + right->frame_count - 1 ); mlt_playlist_remove( this, i -- ); } } - if ( !keep_length ) + if ( !keep_length && this->count > 0 ) { playlist_entry *last = this->list[ this->count - 1 ]; if ( mlt_producer_is_blank( last->producer ) ) @@ -1161,6 +1205,14 @@ int mlt_playlist_is_blank( mlt_playlist this, int clip ) return this == NULL || mlt_producer_is_blank( mlt_playlist_get_clip( this, clip ) ); } +/** Determine if the specified position is a blank. +*/ + +int mlt_playlist_is_blank_at( mlt_playlist this, mlt_position position ) +{ + return this == NULL || mlt_producer_is_blank( mlt_playlist_get_clip_at( this, position ) ); +} + /** Replace the specified clip with a blank and return the clip. */ @@ -1172,25 +1224,25 @@ mlt_producer mlt_playlist_replace_with_blank( mlt_playlist this, int clip ) playlist_entry *entry = this->list[ clip ]; int in = entry->frame_in; int out = entry->frame_out; - mlt_properties properties = mlt_playlist_properties( this ); + mlt_properties properties = MLT_PLAYLIST_PROPERTIES( this ); producer = entry->producer; - mlt_properties_inc_ref( mlt_producer_properties( producer ) ); + mlt_properties_inc_ref( MLT_PRODUCER_PROPERTIES( producer ) ); mlt_events_block( properties, properties ); mlt_playlist_remove( this, clip ); mlt_playlist_blank( this, out - in ); mlt_playlist_move( this, this->count - 1, clip ); - mlt_producer_set_in_and_out( producer, in, out ); mlt_events_unblock( properties, properties ); mlt_playlist_virtual_refresh( this ); + mlt_producer_set_in_and_out( producer, in, out ); } return producer; } void mlt_playlist_insert_blank( mlt_playlist this, int clip, int length ) { - if ( this != NULL && length > 0 ) + if ( this != NULL && length >= 0 ) { - mlt_properties properties = mlt_playlist_properties( this ); + mlt_properties properties = MLT_PLAYLIST_PROPERTIES( this ); mlt_events_block( properties, properties ); mlt_playlist_blank( this, length ); mlt_playlist_move( this, this->count - 1, clip ); @@ -1199,12 +1251,12 @@ void mlt_playlist_insert_blank( mlt_playlist this, int clip, int length ) } } -void mlt_playlist_pad_blanks( mlt_playlist this, int position, int length, int find ) +void mlt_playlist_pad_blanks( mlt_playlist this, mlt_position position, int length, int find ) { if ( this != NULL && length != 0 ) { int clip = mlt_playlist_get_clip_index_at( this, position ); - mlt_properties properties = mlt_playlist_properties( this ); + mlt_properties properties = MLT_PLAYLIST_PROPERTIES( this ); mlt_events_block( properties, properties ); if ( find && clip < this->count && !mlt_playlist_is_blank( this, clip ) ) clip ++; @@ -1226,12 +1278,12 @@ void mlt_playlist_pad_blanks( mlt_playlist this, int position, int length, int f } } -int mlt_playlist_insert_at( mlt_playlist this, int position, mlt_producer producer, int mode ) +int mlt_playlist_insert_at( mlt_playlist this, mlt_position position, mlt_producer producer, int mode ) { int ret = this == NULL || position < 0 || producer == NULL; if ( ret == 0 ) { - mlt_properties properties = mlt_playlist_properties( this ); + mlt_properties properties = MLT_PLAYLIST_PROPERTIES( this ); int length = mlt_producer_get_playtime( producer ); int clip = mlt_playlist_get_clip_index_at( this, position ); mlt_playlist_clip_info info; @@ -1239,11 +1291,18 @@ int mlt_playlist_insert_at( mlt_playlist this, int position, mlt_producer produc mlt_events_block( properties, this ); if ( clip < this->count && mlt_playlist_is_blank( this, clip ) ) { - mlt_playlist_split( this, clip, position - info.start ); - mlt_playlist_get_clip_info( this, &info, ++ clip ); + // Split and move to new clip if need be + if ( position != info.start && mlt_playlist_split( this, clip, position - info.start ) == 0 ) + mlt_playlist_get_clip_info( this, &info, ++ clip ); + + // Split again if need be if ( length < info.frame_count ) - mlt_playlist_split( this, clip, length ); + mlt_playlist_split( this, clip, length - 1 ); + + // Remove mlt_playlist_remove( this, clip ); + + // Insert mlt_playlist_insert( this, producer, clip, -1, -1 ); ret = clip; } @@ -1283,7 +1342,7 @@ int mlt_playlist_clip_start( mlt_playlist this, int clip ) mlt_playlist_clip_info info; if ( mlt_playlist_get_clip_info( this, &info, clip ) == 0 ) return info.start; - return 0; + return clip < 0 ? 0 : mlt_producer_get_playtime( MLT_PLAYLIST_PRODUCER( this ) ); } int mlt_playlist_clip_length( mlt_playlist this, int clip ) @@ -1317,15 +1376,15 @@ int mlt_playlist_blanks_from( mlt_playlist this, int clip, int bounded ) return count; } -int mlt_playlist_remove_region( mlt_playlist this, int position, int length ) +int mlt_playlist_remove_region( mlt_playlist this, mlt_position position, int length ) { int index = mlt_playlist_get_clip_index_at( this, position ); if ( index >= 0 && index < this->count ) { - mlt_properties properties = mlt_playlist_properties( this ); + mlt_properties properties = MLT_PLAYLIST_PROPERTIES( this ); int clip_start = mlt_playlist_clip_start( this, index ); int clip_length = mlt_playlist_clip_length( this, index ); - int list_length = mlt_producer_get_playtime( mlt_playlist_producer( this ) ); + int list_length = mlt_producer_get_playtime( MLT_PLAYLIST_PRODUCER( this ) ); mlt_events_block( properties, this ); if ( position + length > list_length ) @@ -1355,13 +1414,10 @@ int mlt_playlist_remove_region( mlt_playlist this, int position, int length ) return index; } -int mlt_playlist_move_region( mlt_playlist this, int position, int length, int new_position ) +int mlt_playlist_move_region( mlt_playlist this, mlt_position position, int length, int new_position ) { if ( this != NULL ) { - mlt_playlist temp = mlt_playlist_init( ); - int original_size = mlt_producer_get_playtime( mlt_playlist_producer( temp ) ); - mlt_playlist_close( temp ); } return 0; } @@ -1395,10 +1451,25 @@ static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int i } // Get the frame - mlt_service_get_frame( real, frame, index ); + if ( !mlt_properties_get_int( MLT_SERVICE_PROPERTIES( real ), "meta.fx_cut" ) ) + { + mlt_service_get_frame( real, frame, index ); + } + else + { + mlt_producer parent = mlt_producer_cut_parent( ( mlt_producer )real ); + *frame = mlt_frame_init( ); + mlt_properties_set_int( MLT_FRAME_PROPERTIES( *frame ), "fx_cut", 1 ); + mlt_frame_push_service( *frame, NULL ); + mlt_frame_push_audio( *frame, NULL ); + mlt_service_apply_filters( MLT_PRODUCER_SERVICE( parent ), *frame, 0 ); + mlt_service_apply_filters( real, *frame, 0 ); + mlt_deque_pop_front( MLT_FRAME_IMAGE_STACK( *frame ) ); + mlt_deque_pop_front( MLT_FRAME_AUDIO_STACK( *frame ) ); + } // Check if we're at the end of the clip - mlt_properties properties = mlt_frame_properties( *frame ); + mlt_properties properties = MLT_FRAME_PROPERTIES( *frame ); if ( mlt_properties_get_int( properties, "end_of_clip" ) ) mlt_playlist_virtual_set_out( this ); @@ -1410,7 +1481,7 @@ static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int i } // Check for notifier and call with appropriate argument - mlt_properties playlist_properties = mlt_producer_properties( producer ); + mlt_properties playlist_properties = MLT_PRODUCER_PROPERTIES( producer ); void ( *notifier )( void * ) = mlt_properties_get_data( playlist_properties, "notifier", NULL ); if ( notifier != NULL ) { @@ -1432,7 +1503,7 @@ static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int i void mlt_playlist_close( mlt_playlist this ) { - if ( this != NULL && mlt_properties_dec_ref( mlt_playlist_properties( this ) ) <= 0 ) + if ( this != NULL && mlt_properties_dec_ref( MLT_PLAYLIST_PROPERTIES( this ) ) <= 0 ) { int i = 0; this->parent.close = NULL;