X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_playlist.c;h=519585ce3b8e9664ae046546ffae26dad08967ac;hb=ec62d085ab0d1a28856e272514eec564a3e47687;hp=d11f9562ddbab8a55443ece34d4ebddeccb32a9c;hpb=9390e8b584f3f717f0a326893c0e37cf187a0a51;p=melted diff --git a/src/framework/mlt_playlist.c b/src/framework/mlt_playlist.c index d11f956..519585c 100644 --- a/src/framework/mlt_playlist.c +++ b/src/framework/mlt_playlist.c @@ -25,6 +25,7 @@ #include #include +#include /** Virtual playlist entry. */ @@ -32,7 +33,9 @@ typedef struct { mlt_producer producer; - mlt_timecode in; + int64_t frame_in; + int64_t frame_out; + int64_t frame_count; mlt_timecode playtime; } playlist_entry; @@ -76,6 +79,9 @@ mlt_playlist mlt_playlist_init( ) // Indicate that this producer is a playlist 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" ); } return this; @@ -139,7 +145,7 @@ static int mlt_playlist_virtual_refresh( mlt_playlist this ) // Refresh all properties mlt_properties_set_double( mlt_playlist_properties( this ), "first_fps", fps ); - mlt_properties_set_double( mlt_playlist_properties( this ), "fps", fps ); + mlt_properties_set_double( mlt_playlist_properties( this ), "fps", fps == 0 ? 25 : fps ); mlt_properties_set_timecode( mlt_playlist_properties( this ), "length", playtime ); mlt_properties_set_timecode( mlt_playlist_properties( this ), "out", playtime ); @@ -149,8 +155,11 @@ static int mlt_playlist_virtual_refresh( mlt_playlist this ) /** Append to the virtual playlist. */ -static int mlt_playlist_virtual_append( mlt_playlist this, mlt_producer producer, mlt_timecode in, mlt_timecode out ) +static int mlt_playlist_virtual_append( mlt_playlist this, mlt_producer producer, int64_t in, int64_t out ) { + double fps = mlt_properties_get_double( mlt_playlist_properties( this ), "fps" ); + double playtime = ( double )( out - in + 1 ) / fps; + // Check that we have room if ( this->count >= this->size ) { @@ -163,8 +172,12 @@ static int mlt_playlist_virtual_append( mlt_playlist this, mlt_producer 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->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 ]->playtime = playtime; + + mlt_producer_set_speed( producer, 0 ); this->count ++; @@ -177,32 +190,70 @@ static int mlt_playlist_virtual_append( mlt_playlist this, mlt_producer producer static mlt_producer mlt_playlist_virtual_seek( mlt_playlist this ) { // Default producer to blank - mlt_producer producer = &this->blank; + mlt_producer producer = NULL; // Map playlist position to real producer in virtual playlist - mlt_timecode position = mlt_producer_position( &this->parent ); + mlt_timecode pos = mlt_producer_position( &this->parent ); + int64_t position = mlt_producer_frame_position( &this->parent, pos ); + int64_t total = 0; + + mlt_properties properties = mlt_playlist_properties( this ); + char *eof = mlt_properties_get( properties, "eof" ); // Loop through the virtual playlist int i = 0; for ( i = 0; i < this->count; i ++ ) { - if ( position < this->list[ i ]->playtime ) + // Increment the total + total += this->list[ i ]->frame_count; + + if ( position < this->list[ i ]->frame_count ) { // 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; + position -= this->list[ i ]->frame_count; } } // Seek in real producer to relative position - mlt_producer_seek( producer, position ); + if ( producer != NULL ) + { + position += this->list[ i ]->frame_in; + position += mlt_producer_frame_position( producer, mlt_producer_get_in( producer ) ); + mlt_producer_seek_frame( producer, position ); + } + else if ( !strcmp( eof, "pause" ) && total > 0 ) + { + playlist_entry *entry = this->list[ this->count - 1 ]; + mlt_producer this_producer = mlt_playlist_producer( this ); + mlt_producer_seek_frame( this_producer, total - 1 ); + producer = entry->producer; + position = mlt_producer_frame_position( producer, mlt_producer_get_in( producer ) ); + mlt_producer_seek_frame( producer, position + entry->frame_out ); + mlt_producer_set_speed( this_producer, 0 ); + mlt_producer_set_speed( producer, 0 ); + } + else if ( !strcmp( eof, "loop" ) && total > 0 ) + { + playlist_entry *entry = this->list[ 0 ]; + mlt_producer this_producer = mlt_playlist_producer( this ); + mlt_producer_seek_frame( this_producer, 0 ); + producer = entry->producer; + position = entry->frame_in; + position += mlt_producer_frame_position( producer, mlt_producer_get_in( producer ) ); + mlt_producer_seek_frame( producer, position ); + } + else + { + mlt_producer_seek( mlt_playlist_producer( this ), 0 ); + producer = &this->blank; + } return producer; } @@ -213,24 +264,24 @@ static mlt_producer mlt_playlist_virtual_set_out( mlt_playlist this ) mlt_producer producer = &this->blank; // Map playlist position to real producer in virtual playlist - mlt_timecode position = mlt_producer_position( &this->parent ); + mlt_timecode pos = mlt_producer_position( &this->parent ); + int64_t position = mlt_producer_frame_position( &this->parent, pos ); // Loop through the virtual playlist int i = 0; for ( i = 0; i < this->count; i ++ ) { - if ( position < this->list[ i ]->playtime ) + if ( position < this->list[ i ]->frame_count ) { // 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; + position -= this->list[ i ]->frame_count; } } @@ -238,7 +289,8 @@ static mlt_producer mlt_playlist_virtual_set_out( mlt_playlist this ) if ( i < this->count ) { // Update the playtime for the changed clip (hmmm) - this->list[ i ]->playtime = position - this->list[ i ]->in; + this->list[ i ]->frame_count = position + 1; + this->list[ i ]->frame_out = position - this->list[ i ]->frame_in; // Refresh the playlist mlt_playlist_virtual_refresh( this ); @@ -250,14 +302,15 @@ static mlt_producer mlt_playlist_virtual_set_out( mlt_playlist this ) 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 ); + mlt_timecode pos = mlt_producer_position( &this->parent ); + int64_t position = mlt_producer_frame_position( &this->parent, pos ); // Loop through the virtual playlist int i = 0; for ( i = 0; i < this->count; i ++ ) { - if ( position < this->list[ i ]->playtime ) + if ( position < this->list[ i ]->frame_count ) { // Found it, now break break; @@ -265,7 +318,7 @@ int mlt_playlist_current_clip( mlt_playlist this ) else { // Decrement position by length of this entry - position -= this->list[ i ]->playtime; + position -= this->list[ i ]->frame_count; } } @@ -286,7 +339,7 @@ mlt_producer mlt_playlist_current( mlt_playlist this ) mlt_timecode mlt_playlist_clip( mlt_playlist this, mlt_whence whence, int index ) { - mlt_timecode position = 0; + int64_t position = 0; int absolute_clip = index; int i = 0; @@ -314,21 +367,26 @@ mlt_timecode mlt_playlist_clip( mlt_playlist this, mlt_whence whence, int index // Now determine the timecode for ( i = 0; i < absolute_clip; i ++ ) - position += this->list[ i ]->playtime; + position += this->list[ i ]->frame_count; - return position; + return mlt_producer_time( &this->parent, position ); } int mlt_playlist_get_clip_info( mlt_playlist this, mlt_playlist_clip_info *info, int index ) { int error = index < 0 || index >= this->count; + memset( info, 0, sizeof( mlt_playlist_clip_info ) ); if ( !error ) { mlt_producer producer = this->list[ index ]->producer; mlt_properties properties = mlt_producer_properties( producer ); + info->producer = producer; + info->start = mlt_playlist_clip( this, mlt_whence_relative_start, index ); info->resource = mlt_properties_get( properties, "resource" ); - info->in = this->list[ index ]->in; - info->out = this->list[ index ]->in + this->list[ index ]->playtime; + info->frame_in = this->list[ index ]->frame_in; + info->in = mlt_producer_time( producer, info->frame_in ); + info->frame_out = this->list[ index ]->frame_out; + info->out = mlt_producer_time( producer, info->frame_out ); info->playtime = this->list[ index ]->playtime; info->length = mlt_producer_get_length( producer ); info->fps = mlt_producer_get_fps( producer ); @@ -350,6 +408,7 @@ int mlt_playlist_count( mlt_playlist this ) int mlt_playlist_clear( mlt_playlist this ) { this->count = 0; + mlt_properties_set_double( mlt_playlist_properties( this ), "first_fps", 0 ); return mlt_playlist_virtual_refresh( this ); } @@ -359,7 +418,9 @@ int mlt_playlist_clear( mlt_playlist this ) int mlt_playlist_append( mlt_playlist this, mlt_producer producer ) { // Append to virtual list - return mlt_playlist_virtual_append( this, producer, 0, mlt_producer_get_playtime( producer ) ); + int64_t in = mlt_producer_frame_position( producer, mlt_producer_get_in( producer ) ); + int64_t out = mlt_producer_frame_position( producer, mlt_producer_get_out( producer ) ); + return mlt_playlist_virtual_append( this, producer, 0, out - in ); } /** Append a producer to the playlist with in/out points. @@ -369,9 +430,15 @@ int mlt_playlist_append_io( mlt_playlist this, mlt_producer producer, double in, { // Append to virtual list if ( in != -1 && out != -1 ) - return mlt_playlist_virtual_append( this, producer, in, out - in ); + { + int64_t fin = mlt_producer_frame_position( producer, in ); + int64_t fout = mlt_producer_frame_position( producer, out ); + return mlt_playlist_virtual_append( this, producer, fin, fout ); + } else - return mlt_playlist_virtual_append( this, producer, 0, mlt_producer_get_playtime( producer ) ); + { + return mlt_playlist_append( this, producer ); + } } /** Append a blank to the playlist of a given length. @@ -380,7 +447,58 @@ int mlt_playlist_append_io( mlt_playlist this, mlt_producer producer, double in, int mlt_playlist_blank( mlt_playlist this, mlt_timecode length ) { // Append to the virtual list - return mlt_playlist_virtual_append( this, &this->blank, 0, length ); + int64_t fout = mlt_producer_frame_position( &this->blank, length ); + return mlt_playlist_virtual_append( this, &this->blank, 0, fout ); +} + +/** Insert a producer into the playlist. +*/ + +int mlt_playlist_insert( mlt_playlist this, mlt_producer producer, int where, mlt_timecode in, mlt_timecode out ) +{ + return 0; +} + +int mlt_playlist_remove( mlt_playlist this, int where ) +{ + return 0; +} + +int mlt_playlist_move( mlt_playlist this, int from, int to ) +{ + return 0; +} + +int mlt_playlist_resize_clip( mlt_playlist this, int clip, mlt_timecode in, mlt_timecode out ) +{ + int error = clip < 0 || clip >= this->count; + if ( error == 0 ) + { + playlist_entry *entry = this->list[ clip ]; + mlt_producer producer = entry->producer; + + if ( in <= -1 ) + in = 0; + if ( out <= -1 || out >= mlt_producer_get_out( producer ) ) + out = mlt_producer_get_out( producer ); + + if ( out < in ) + { + mlt_timecode t = in; + in = out; + out = t; + } + + int64_t fin = mlt_producer_frame_position( producer, in ); + int64_t fout = mlt_producer_frame_position( producer, out ); + + entry->frame_in = fin; + entry->frame_out = fout; + entry->frame_count = fout - fin + 1; + entry->playtime = out - in; + mlt_playlist_virtual_refresh( this ); + } + return error; } /** Get the current frame.