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;
// 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;
/** Append to the virtual playlist.
*/
-static int mlt_playlist_virtual_append( mlt_playlist this, mlt_producer producer, mlt_timecode in, mlt_timecode playtime )
+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 )
{
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 ]->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 ++;
return mlt_playlist_virtual_refresh( this );
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( producer, 0 );
+ }
+ else
+ {
+ mlt_producer_seek( mlt_playlist_producer( this ), 0 );
+ producer = &this->blank;
+ }
return producer;
}
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;
}
}
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 );
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;
else
{
// Decrement position by length of this entry
- position -= this->list[ i ]->playtime;
+ position -= this->list[ i ]->frame_count;
}
}
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;
// 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 )
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 );
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.
{
// 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, 0, fout - fin );
+ }
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.
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.
out = t;
}
- entry->in = in;
+ 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 );
}
projects / melted / blobdiff