X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=mlt%2Fsrc%2Fframework%2Fmlt_playlist.c;h=ed33da96c00e7925bb5501d9531d1fc91c2f9a05;hb=163b1bf05b39b9d2f226b63a370badd233612656;hp=f786d31d0c10e45296af3feb593fefe1bcef0708;hpb=fdff32bbd09ff13df3a3a12896690a4950b7d0d0;p=melted diff --git a/mlt/src/framework/mlt_playlist.c b/mlt/src/framework/mlt_playlist.c index f786d31..ed33da9 100644 --- a/mlt/src/framework/mlt_playlist.c +++ b/mlt/src/framework/mlt_playlist.c @@ -23,6 +23,7 @@ #include "mlt_playlist.h" #include "mlt_frame.h" +#include #include /** Virtual playlist entry. @@ -42,14 +43,11 @@ playlist_entry; struct mlt_playlist_s { struct mlt_producer_s parent; + struct mlt_producer_s blank; + int size; int count; - mlt_producer *list; - mlt_producer blank; - - int virtual_size; - int virtual_count; - playlist_entry **virtual_list; + playlist_entry **list; }; /** Forward declarations @@ -73,11 +71,11 @@ mlt_playlist mlt_playlist_init( ) // Override the producer get_frame producer->get_frame = producer_get_frame; - // Create a producer - this->blank = calloc( sizeof( struct mlt_producer_s ), 1 ); + // Initialise blank + mlt_producer_init( &this->blank, NULL ); - // Initialise it - mlt_producer_init( this->blank, NULL ); + // Indicate that this producer is a playlist + mlt_properties_set_data( mlt_playlist_properties( this ), "playlist", this, 0, NULL, NULL ); } return this; @@ -99,67 +97,100 @@ mlt_service mlt_playlist_service( mlt_playlist this ) return mlt_producer_service( &this->parent ); } -/** Store a producer in the playlist. +/** Get the propertues associated to this playlist. */ -static int mlt_playlist_store( mlt_playlist this, mlt_producer producer ) +mlt_properties mlt_playlist_properties( mlt_playlist this ) { - int i; + return mlt_producer_properties( &this->parent ); +} - // If it's already added, return the index - for ( i = 0; i < this->count; i ++ ) +/** Append to the virtual playlist. +*/ + +static int mlt_playlist_virtual_append( mlt_playlist this, mlt_producer producer, mlt_timecode in, mlt_timecode out ) +{ + // Get the fps of the first producer + double fps = mlt_properties_get_double( mlt_playlist_properties( this ), "first_fps" ); + + // If fps is 0 + if ( fps == 0 ) { - if ( producer == this->list[ i ] ) - return i; + // Inherit it from the producer + fps = mlt_producer_get_fps( producer ); + } + 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 ); } // Check that we have room if ( this->count >= this->size ) { - this->list = realloc( this->list, ( this->size + 10 ) * sizeof( mlt_producer ) ); + int i; + this->list = realloc( this->list, ( this->size + 10 ) * sizeof( playlist_entry * ) ); for ( i = this->size; i < this->size + 10; i ++ ) this->list[ i ] = NULL; this->size += 10; } - // Add this producer to the list - this->list[ this->count ] = producer; + this->list[ this->count ] = calloc( sizeof( playlist_entry ), 1 ); + this->list[ this->count ]->producer = producer; + this->list[ this->count ]->in = in; + this->list[ this->count ]->playtime = out - in; + + this->count ++; + + mlt_properties_set_double( mlt_playlist_properties( this ), "first_fps", fps ); + mlt_properties_set_double( mlt_playlist_properties( this ), "fps", fps ); - return this->count ++; + return 0; } -/** Append to the virtual playlist. +/** Seek in the virtual playlist. */ -static int mlt_playlist_virtual_append( mlt_playlist this, int position, mlt_timecode in, mlt_timecode out ) +static mlt_producer mlt_playlist_virtual_seek( mlt_playlist this ) { - // Check that we have room - if ( this->virtual_count >= this->virtual_size ) + // Default producer to blank + mlt_producer producer = &this->blank; + + // Map playlist position to real producer in virtual playlist + mlt_timecode position = mlt_producer_position( &this->parent ); + + // Loop through the virtual playlist + int i = 0; + + for ( i = 0; i < this->count; i ++ ) { - int i; - this->virtual_list = realloc( this->virtual_list, ( this->virtual_size + 10 ) * sizeof( playlist_entry * ) ); - for ( i = this->virtual_size; i < this->virtual_size + 10; i ++ ) - this->virtual_list[ i ] = NULL; - this->virtual_size += 10; + if ( position < this->list[ i ]->playtime ) + { + // Found it, now break + producer = this->list[ i ]->producer; + position += this->list[ i ]->in; + break; + } + else + { + // Decrement position by length of this entry + position -= this->list[ i ]->playtime; + } } - this->virtual_list[ this->virtual_count ] = malloc( sizeof( playlist_entry ) ); - this->virtual_list[ this->virtual_count ]->producer = this->list[ position ]; - this->virtual_list[ this->virtual_count ]->in = in; - this->virtual_list[ this->virtual_count ]->playtime = out - in; - - this->virtual_count ++; + // Seek in real producer to relative position + mlt_producer_seek( producer, position ); - return 0; + return producer; } -/** Seek in the virtual playlist. -*/ - -static mlt_producer mlt_playlist_virtual_seek( mlt_playlist this ) +static mlt_producer mlt_playlist_virtual_set_out( mlt_playlist this ) { // Default producer to blank - mlt_producer producer = this->blank; + mlt_producer producer = &this->blank; // Map playlist position to real producer in virtual playlist mlt_timecode position = mlt_producer_position( &this->parent ); @@ -167,40 +198,102 @@ static mlt_producer mlt_playlist_virtual_seek( mlt_playlist this ) // Loop through the virtual playlist int i = 0; - for ( i = 0; i < this->virtual_count; i ++ ) + for ( i = 0; i < this->count; i ++ ) { - if ( position < this->virtual_list[ i ]->playtime ) + if ( position < this->list[ i ]->playtime ) { // Found it, now break - producer = this->virtual_list[ i ]->producer; - position += this->virtual_list[ i ]->in; + producer = this->list[ i ]->producer; + position += this->list[ i ]->in; break; } else { // Decrement position by length of this entry - position -= this->virtual_list[ i ]->playtime; + position -= this->list[ i ]->playtime; } } // Seek in real producer to relative position - mlt_producer_seek( producer, position ); + if ( i < this->count ) + { + fprintf( stderr, "END OF CLIP %d AT %e\n", i, position ); + this->list[ i ]->playtime = position - this->list[ i ]->in; + } return producer; } +static int mlt_playlist_current_clip( mlt_playlist this ) +{ + // Map playlist position to real producer in virtual playlist + mlt_timecode position = mlt_producer_position( &this->parent ); + + // Loop through the virtual playlist + int i = 0; + + for ( i = 0; i < this->count; i ++ ) + { + if ( position < this->list[ i ]->playtime ) + { + // Found it, now break + break; + } + else + { + // Decrement position by length of this entry + position -= this->list[ i ]->playtime; + } + } + + return i; +} + +/** Get the timecode which corresponds to the start of the next clip. +*/ + +mlt_timecode mlt_playlist_clip( mlt_playlist this, mlt_whence whence, int index ) +{ + mlt_timecode position = 0; + int absolute_clip = index; + int i = 0; + + // Determine the absolute clip + switch ( whence ) + { + case mlt_whence_relative_start: + absolute_clip = index; + break; + + case mlt_whence_relative_current: + absolute_clip = mlt_playlist_current_clip( this ) + index; + break; + + case mlt_whence_relative_end: + absolute_clip = this->count - index; + break; + } + + // Check that we're in a valid range + if ( absolute_clip < 0 ) + absolute_clip = 0; + else if ( absolute_clip > this->count ) + absolute_clip = this->count; + + // Now determine the timecode + for ( i = 0; i < absolute_clip; i ++ ) + position += this->list[ i ]->playtime; + + return position; +} + /** Append a producer to the playlist. */ int mlt_playlist_append( mlt_playlist this, mlt_producer producer ) { - // Get the position of the producer in the list - int position = mlt_playlist_store( this, producer ); - // Append to virtual list - mlt_playlist_virtual_append( this, position, 0, mlt_producer_get_playtime( producer ) ); - - return 0; + return mlt_playlist_virtual_append( this, producer, 0, mlt_producer_get_playtime( producer ) ); } /** Append a blank to the playlist of a given length. @@ -208,13 +301,8 @@ int mlt_playlist_append( mlt_playlist this, mlt_producer producer ) int mlt_playlist_blank( mlt_playlist this, mlt_timecode length ) { - // Get the position of the producer in the list - int position = mlt_playlist_store( this, this->blank ); - // Append to the virtual list - mlt_playlist_virtual_append( this, position, 0, length ); - - return 0; + return mlt_playlist_virtual_append( this, &this->blank, 0, length ); } /** Get the current frame. @@ -231,6 +319,11 @@ static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int i // Get the frame mlt_service_get_frame( mlt_producer_service( real ), frame, index ); + // Check if we're at the end of the clip + mlt_properties properties = mlt_frame_properties( *frame ); + if ( mlt_properties_get_int( properties, "end_of_clip" ) ) + mlt_playlist_virtual_set_out( this ); + // Update timecode on the frame we're creating mlt_frame_set_timecode( *frame, mlt_producer_position( producer ) ); @@ -246,7 +339,6 @@ static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int i void mlt_playlist_close( mlt_playlist this ) { mlt_producer_close( &this->parent ); - mlt_producer_close( this->blank ); - free( this->blank ); + mlt_producer_close( &this->blank ); free( this ); }