// Default read ahead buffer size
mlt_properties_set_int( properties, "buffer", 25 );
+ mlt_properties_set_int( properties, "drop_max", 5 );
// Default audio frequency and channels
mlt_properties_set_int( properties, "frequency", 48000 );
// Hmm - default all consumers to yuv422 :-/
self->format = mlt_image_yuv422;
+ mlt_properties_set( properties, "mlt_image_format", mlt_image_format_name( self->format ) );
+ mlt_properties_set( properties, "mlt_audio_format", mlt_audio_format_name( mlt_audio_s16 ) );
mlt_events_register( properties, "consumer-frame-show", ( mlt_transmitter )mlt_consumer_frame_show );
mlt_events_register( properties, "consumer-frame-render", ( mlt_transmitter )mlt_consumer_frame_render );
+ mlt_events_register( properties, "consumer-thread-started", NULL );
+ mlt_events_register( properties, "consumer-thread-stopped", NULL );
mlt_events_register( properties, "consumer-stopped", NULL );
mlt_events_listen( properties, self, "consumer-frame-show", ( mlt_listener )on_consumer_frame_show );
static void mlt_consumer_property_changed( mlt_properties owner, mlt_consumer self, char *name )
{
- if ( !strcmp( name, "profile" ) )
+ if ( !strcmp( name, "mlt_profile" ) )
{
// Get the properies
mlt_properties properties = MLT_CONSUMER_PROPERTIES( self );
free( profile->description );
memcpy( profile, new_profile, sizeof( struct mlt_profile_s ) );
profile->description = strdup( new_profile->description );
- mlt_profile_close( new_profile );
}
else
{
// Apply to properties
apply_profile_properties( self, profile, properties );
+ mlt_profile_close( new_profile );
}
}
else if ( !strcmp( name, "frame_rate_num" ) )
{
mlt_properties properties = MLT_CONSUMER_PROPERTIES( self );
mlt_profile profile = mlt_service_profile( MLT_CONSUMER_SERVICE( self ) );
- profile->sample_aspect_num = mlt_properties_get_int( properties, "sample_aspect_num" );
if ( profile )
+ {
+ profile->sample_aspect_num = mlt_properties_get_int( properties, "sample_aspect_num" );
mlt_properties_set_double( properties, "aspect_ratio", mlt_profile_sar( profile ) );
+ }
}
else if ( !strcmp( name, "sample_aspect_den" ) )
{
mlt_properties properties = MLT_CONSUMER_PROPERTIES( self );
mlt_profile profile = mlt_service_profile( MLT_CONSUMER_SERVICE( self ) );
- profile->sample_aspect_den = mlt_properties_get_int( properties, "sample_aspect_den" );
if ( profile )
+ {
+ profile->sample_aspect_den = mlt_properties_get_int( properties, "sample_aspect_den" );
mlt_properties_set_double( properties, "aspect_ratio", mlt_profile_sar( profile ) );
+ }
}
else if ( !strcmp( name, "display_aspect_num" ) )
{
* \private \memberof mlt_consumer_s
* \param listener a function pointer that will be invoked
* \param owner the events object that will be passed to \p listener
- * \param self a service that will be passed to \p listener
- * \param args an array of pointers - the first entry is passed as a string to \p listener
+ * \param self a service that will be passed to \p listener
+ * \param args an array of pointers - the first entry is passed as a frame to \p listener
*/
static void mlt_consumer_frame_show( mlt_listener listener, mlt_properties owner, mlt_service self, void **args )
* \private \memberof mlt_consumer_s
* \param listener a function pointer that will be invoked
* \param owner the events object that will be passed to \p listener
- * \param self a service that will be passed to \p listener
- * \param args an array of pointers - the first entry is passed as a string to \p listener
+ * \param self a service that will be passed to \p listener
+ * \param args an array of pointers - the first entry is passed as a frame to \p listener
*/
static void mlt_consumer_frame_render( mlt_listener listener, mlt_properties owner, mlt_service self, void **args )
mlt_consumer self = malloc( sizeof( struct mlt_consumer_s ) );
// Initialise it
- if ( self != NULL )
- mlt_consumer_init( self, NULL, profile );
-
- // Return it
- return self;
+ if ( self != NULL && mlt_consumer_init( self, NULL, profile ) == 0 )
+ {
+ // Return it
+ return self;
+ }
+ else
+ {
+ free(self);
+ return NULL;
+ }
}
/** Get the parent service object.
int mlt_consumer_start( mlt_consumer self )
{
+ if ( !mlt_consumer_is_stopped( self ) )
+ return 0;
+
// Stop listening to the property-changed event
mlt_event_block( self->event_listener );
char *test_card = mlt_properties_get( properties, "test_card" );
// Just to make sure nothing is hanging around...
+ pthread_mutex_lock( &self->put_mutex );
self->put = NULL;
self->put_active = 1;
+ pthread_mutex_unlock( &self->put_mutex );
// Deal with it now.
if ( test_card != NULL )
mlt_properties_set_data( properties, "test_card_producer", NULL, 0, NULL, NULL );
}
+ // The profile could have changed between a stop and a restart.
+ apply_profile_properties( self, mlt_service_profile( MLT_CONSUMER_SERVICE(self) ), properties );
+
// Set the frame duration in microseconds for the frame-dropping heuristic
- int frame_duration = 1000000 / mlt_properties_get_int( properties, "frame_rate_num" ) *
- mlt_properties_get_int( properties, "frame_rate_den" );
+ int frame_rate_num = mlt_properties_get_int( properties, "frame_rate_num" );
+ int frame_rate_den = mlt_properties_get_int( properties, "frame_rate_den" );
+ int frame_duration = 0;
+
+ if ( frame_rate_num && frame_rate_den )
+ {
+ frame_duration = 1000000 / frame_rate_num * frame_rate_den;
+ }
+
mlt_properties_set_int( properties, "frame_duration", frame_duration );
// Check and run an ante command
// For worker threads implementation, buffer must be at least # threads
if ( abs( self->real_time ) > 1 && mlt_properties_get_int( properties, "buffer" ) <= abs( self->real_time ) )
- mlt_properties_set_int( properties, "buffer", abs( self->real_time ) + 1 );
+ mlt_properties_set_int( properties, "_buffer", abs( self->real_time ) + 1 );
+
+ // Get the image format to use for rendering threads
+ const char* format = mlt_properties_get( properties, "mlt_image_format" );
+ if ( format )
+ {
+ if ( !strcmp( format, "rgb24" ) )
+ self->format = mlt_image_rgb24;
+ else if ( !strcmp( format, "rgb24a" ) )
+ self->format = mlt_image_rgb24a;
+ else if ( !strcmp( format, "yuv420p" ) )
+ self->format = mlt_image_yuv420p;
+ else if ( !strcmp( format, "none" ) )
+ self->format = mlt_image_none;
+ else if ( !strcmp( format, "glsl" ) )
+ self->format = mlt_image_glsl_texture;
+ else
+ self->format = mlt_image_yuv422;
+ }
// Start the service
if ( self->start != NULL )
if ( test_card != NULL )
mlt_properties_set_data( frame_properties, "test_card_producer", test_card, 0, NULL, NULL );
- // Attach the rescale property
+ // Pass along the interpolation and deinterlace options
+ // TODO: get rid of consumer_deinterlace and use profile.progressive
mlt_properties_set( frame_properties, "rescale.interp", mlt_properties_get( properties, "rescale" ) );
-
- // Aspect ratio and other jiggery pokery
- mlt_properties_set_double( frame_properties, "consumer_aspect_ratio", mlt_properties_get_double( properties, "aspect_ratio" ) );
mlt_properties_set_int( frame_properties, "consumer_deinterlace", mlt_properties_get_int( properties, "progressive" ) | mlt_properties_get_int( properties, "deinterlace" ) );
mlt_properties_set( frame_properties, "deinterlace_method", mlt_properties_get( properties, "deinterlace_method" ) );
+ mlt_properties_set_int( frame_properties, "consumer_tff", mlt_properties_get_int( properties, "top_field_first" ) );
}
// Return the frame
// Get the audio settings
mlt_audio_format afmt = mlt_audio_s16;
+ const char *format = mlt_properties_get( properties, "mlt_audio_format" );
+ if ( format )
+ {
+ if ( !strcmp( format, "none" ) )
+ afmt = mlt_audio_none;
+ else if ( !strcmp( format, "s32" ) )
+ afmt = mlt_audio_s32;
+ else if ( !strcmp( format, "s32le" ) )
+ afmt = mlt_audio_s32le;
+ else if ( !strcmp( format, "float" ) )
+ afmt = mlt_audio_float;
+ else if ( !strcmp( format, "f32le" ) )
+ afmt = mlt_audio_f32le;
+ else if ( !strcmp( format, "u8" ) )
+ afmt = mlt_audio_u8;
+ }
int counter = 0;
double fps = mlt_properties_get_double( properties, "fps" );
int channels = mlt_properties_get_int( properties, "channels" );
struct timeval ante;
// Average time for get_frame and get_image
- int count = 1;
+ int count = 0;
int skipped = 0;
- int64_t time_wait = 0;
- int64_t time_frame = 0;
int64_t time_process = 0;
int skip_next = 0;
+ mlt_position pos = 0;
+ mlt_position start_pos = 0;
+ mlt_position last_pos = 0;
+ int frame_duration = mlt_properties_get_int( properties, "frame_duration" );
+ int drop_max = mlt_properties_get_int( properties, "drop_max" );
if ( preview_off && preview_format != 0 )
self->format = preview_format;
+ mlt_events_fire( properties, "consumer-thread-started", NULL );
+
// Get the first frame
frame = mlt_consumer_get_frame( self );
// Mark as rendered
mlt_properties_set_int( MLT_FRAME_PROPERTIES( frame ), "rendered", 1 );
+ last_pos = start_pos = pos = mlt_frame_get_position( frame );
}
// Get the starting time (can ignore the times above)
// Continue to read ahead
while ( self->ahead )
{
- // Fetch width/height again
- width = mlt_properties_get_int( properties, "width" );
- height = mlt_properties_get_int( properties, "height" );
-
// Put the current frame into the queue
pthread_mutex_lock( &self->queue_mutex );
while( self->ahead && mlt_deque_count( self->queue ) >= buffer )
pthread_cond_wait( &self->queue_cond, &self->queue_mutex );
- mlt_deque_push_back( self->queue, frame );
+ if ( self->is_purge )
+ {
+ mlt_frame_close( frame );
+ self->is_purge = 0;
+ }
+ else
+ {
+ mlt_deque_push_back( self->queue, frame );
+ }
pthread_cond_broadcast( &self->queue_cond );
pthread_mutex_unlock( &self->queue_mutex );
- time_wait += time_difference( &ante );
-
// Get the next frame
frame = mlt_consumer_get_frame( self );
- time_frame += time_difference( &ante );
// If there's no frame, we're probably stopped...
if ( frame == NULL )
continue;
+ pos = mlt_frame_get_position( frame );
- // Increment the count
+ // Increment the counter used for averaging processing cost
count ++;
- // All non normal playback frames should be shown
+ // All non-normal playback frames should be shown
if ( mlt_properties_get_int( MLT_FRAME_PROPERTIES( frame ), "_speed" ) != 1 )
{
#ifdef DEINTERLACE_ON_NOT_NORMAL_SPEED
mlt_properties_set_int( MLT_FRAME_PROPERTIES( frame ), "consumer_deinterlace", 1 );
#endif
- skipped = 0;
- time_frame = 0;
- time_process = 0;
- time_wait = 0;
- count = 1;
- skip_next = 0;
+ // Indicate seeking or trick-play
+ start_pos = pos;
}
- // Get the image
+ // If skip flag not set or frame-dropping disabled
if ( !skip_next || self->real_time == -1 )
{
- // Get the image, mark as rendered and time it
if ( !video_off )
{
+ // Reset width/height - could have been changed by previous mlt_frame_get_image
+ width = mlt_properties_get_int( properties, "width" );
+ height = mlt_properties_get_int( properties, "height" );
+
+ // Get the image
mlt_events_fire( MLT_CONSUMER_PROPERTIES( self ), "consumer-frame-render", frame, NULL );
mlt_frame_get_image( frame, &image, &self->format, &width, &height, 0 );
}
+
+ // Indicate the rendered image is available.
mlt_properties_set_int( MLT_FRAME_PROPERTIES( frame ), "rendered", 1 );
+
+ // Reset consecutively-skipped counter
+ skipped = 0;
}
- else
+ else // Skip image processing
{
- // Increment the number of sequentially skipped frames
- skipped ++;
- skip_next = 0;
+ // Increment the number of consecutively-skipped frames
+ skipped++;
- // If we've reached an unacceptable level, reset everything
- if ( skipped > fps * 2 )
+ // If too many (1 sec) consecutively-skipped frames
+ if ( skipped > drop_max )
{
- skipped = 0;
- time_frame = 0;
+ // Reset cost tracker
time_process = 0;
- time_wait = 0;
count = 1;
+ mlt_log_verbose( self, "too many frames dropped - forcing next frame\n" );
}
}
mlt_frame_get_audio( frame, &audio, &afmt, &frequency, &channels, &samples );
}
- // Increment the time take for self frame
- time_process += time_difference( &ante );
+ // Get the time to process this frame
+ int64_t time_current = time_difference( &ante );
+
+ // If the current time is not suddenly some large amount
+ if ( time_current < time_process / count * 20 || !time_process || count < 5 )
+ {
+ // Accumulate the cost for processing this frame
+ time_process += time_current;
+ }
+ else
+ {
+ mlt_log_debug( self, "current %"PRId64" threshold %"PRId64" count %d\n",
+ time_current, (int64_t) (time_process / count * 20), count );
+ // Ignore the cost of this frame's time
+ count--;
+ }
+
+ // Determine if we started, resumed, or seeked
+ if ( pos != last_pos + 1 )
+ start_pos = pos;
+ last_pos = pos;
- // Determine if the next frame should be skipped
- if ( mlt_deque_count( self->queue ) <= 5 )
+ // Do not skip the first 20% of buffer at start, resume, or seek
+ if ( pos - start_pos <= buffer / 5 + 1 )
{
- int frame_duration = mlt_properties_get_int( properties, "frame_duration" );
- if ( ( ( time_wait + time_frame + time_process ) / count ) > frame_duration )
+ // Reset cost tracker
+ time_process = 0;
+ count = 1;
+ }
+
+ // Reset skip flag
+ skip_next = 0;
+
+ // Only consider skipping if the buffer level is low (or really small)
+ if ( mlt_deque_count( self->queue ) <= buffer / 5 + 1 )
+ {
+ // Skip next frame if average cost exceeds frame duration.
+ if ( time_process / count > frame_duration )
skip_next = 1;
+ if ( skip_next )
+ mlt_log_debug( self, "avg usec %"PRId64" (%"PRId64"/%d) duration %d\n",
+ time_process/count, time_process, count, frame_duration);
}
}
// Remove the last frame
mlt_frame_close( frame );
+ mlt_events_fire( properties, "consumer-thread-stopped", NULL );
return NULL;
}
if ( preview_off && preview_format != 0 )
format = preview_format;
+ mlt_events_fire( properties, "consumer-thread-started", NULL );
+
// Continue to read ahead
while ( self->ahead )
{
pthread_cond_broadcast( &self->done_cond );
pthread_mutex_unlock( &self->done_mutex );
}
+ mlt_events_fire( properties, "consumer-thread-stopped", NULL );
return NULL;
}
// We're running now
self->ahead = 1;
+ self->threads = thread;
// These keep track of the accelleration of frame dropping or recovery.
self->consecutive_dropped = 0;
pthread_join( *thread, NULL );
// Deallocate the array of threads
- if ( thread )
- free( thread );
+ if ( self->threads )
+ free( self->threads );
// Indicate that worker threads no longer running
self->started = 0;
void mlt_consumer_purge( mlt_consumer self )
{
- if ( self->ahead )
+ if ( self )
{
- pthread_mutex_lock( &self->queue_mutex );
- while ( mlt_deque_count( self->queue ) )
+ pthread_mutex_lock( &self->put_mutex );
+ if ( self->put ) {
+ mlt_frame_close( self->put );
+ self->put = NULL;
+ }
+ pthread_cond_broadcast( &self->put_cond );
+ pthread_mutex_unlock( &self->put_mutex );
+
+ if ( self->ahead && self->real_time )
+ pthread_mutex_lock( &self->queue_mutex );
+
+ if ( self->purge )
+ self->purge( self );
+
+ while ( self->ahead && mlt_deque_count( self->queue ) )
mlt_frame_close( mlt_deque_pop_back( self->queue ) );
- pthread_cond_broadcast( &self->queue_cond );
- pthread_mutex_unlock( &self->queue_mutex );
+ if ( self->ahead && self->real_time )
+ {
+ self->is_purge = 1;
+ pthread_cond_broadcast( &self->queue_cond );
+ pthread_mutex_unlock( &self->queue_mutex );
+ if ( abs( self->real_time ) > 1 )
+ {
+ pthread_mutex_lock( &self->done_mutex );
+ pthread_cond_broadcast( &self->done_cond );
+ pthread_mutex_unlock( &self->done_mutex );
+ }
+ }
+
+ pthread_mutex_lock( &self->put_mutex );
+ if ( self->put ) {
+ mlt_frame_close( self->put );
+ self->put = NULL;
+ }
+ pthread_cond_broadcast( &self->put_cond );
+ pthread_mutex_unlock( &self->put_mutex );
}
}
// Frame to return
mlt_frame frame = NULL;
- int size = abs( self->real_time );
- int buffer = mlt_properties_get_int( properties, "buffer" );
+ double fps = mlt_properties_get_double( properties, "fps" );
+ int threads = abs( self->real_time );
+ int buffer = mlt_properties_get_int( properties, "_buffer" );
+ buffer = buffer > 0 ? buffer : mlt_properties_get_int( properties, "buffer" );
// This is a heuristic to determine a suitable minimum buffer size for the number of threads.
- int headroom = 2 + size * size;
+ int headroom = 2 + threads * threads;
buffer = buffer < headroom ? headroom : buffer;
// Start worker threads if not already started.
pthread_cond_wait( &self->done_cond, &self->done_mutex );
pthread_mutex_unlock( &self->done_mutex );
}
- self->process_head = size;
+ self->process_head = threads;
}
// mlt_log_verbose( MLT_CONSUMER_SERVICE(self), "size %d done count %d work count %d process_head %d\n",
-// size, first_unprocessed_frame( self ), mlt_deque_count( self->queue ), self->process_head );
+// threads, first_unprocessed_frame( self ), mlt_deque_count( self->queue ), self->process_head );
// Feed the work queue
while ( self->ahead && mlt_deque_count( self->queue ) < buffer )
{
frame = mlt_consumer_get_frame( self );
- if ( ! frame )
- return frame;
- pthread_mutex_lock( &self->queue_mutex );
- mlt_deque_push_back( self->queue, frame );
- pthread_cond_signal( &self->queue_cond );
- pthread_mutex_unlock( &self->queue_mutex );
+ if ( frame )
+ {
+ pthread_mutex_lock( &self->queue_mutex );
+ mlt_deque_push_back( self->queue, frame );
+ pthread_cond_signal( &self->queue_cond );
+ pthread_mutex_unlock( &self->queue_mutex );
+ }
}
// Wait if not realtime.
- while( self->ahead && self->real_time < 0 &&
- ! mlt_properties_get_int( MLT_FRAME_PROPERTIES( MLT_FRAME( mlt_deque_peek_front( self->queue ) ) ), "rendered" ) )
+ while ( self->ahead && self->real_time < 0 && !self->is_purge &&
+ !( mlt_properties_get_int( MLT_FRAME_PROPERTIES( MLT_FRAME( mlt_deque_peek_front( self->queue ) ) ), "rendered" ) ) )
{
pthread_mutex_lock( &self->done_mutex );
pthread_cond_wait( &self->done_cond, &self->done_mutex );
pthread_mutex_unlock( &self->done_mutex );
}
-
+
// Get the frame from the queue.
pthread_mutex_lock( &self->queue_mutex );
frame = mlt_deque_pop_front( self->queue );
pthread_mutex_unlock( &self->queue_mutex );
+ if ( ! frame ) {
+ self->is_purge = 0;
+ return frame;
+ }
// Adapt the worker process head to the runtime conditions.
if ( self->real_time > 0 )
{
- if ( frame && mlt_properties_get_int( MLT_FRAME_PROPERTIES( frame ), "rendered" ) )
+ if ( mlt_properties_get_int( MLT_FRAME_PROPERTIES( frame ), "rendered" ) )
{
self->consecutive_dropped = 0;
- if ( self->process_head > size && self->consecutive_rendered >= self->process_head )
+ if ( self->process_head > threads && self->consecutive_rendered >= self->process_head )
self->process_head--;
else
self->consecutive_rendered++;
else
{
self->consecutive_rendered = 0;
- if ( self->process_head < buffer - size && self->consecutive_dropped > size )
+ if ( self->process_head < buffer - threads && self->consecutive_dropped > threads )
self->process_head++;
else
self->consecutive_dropped++;
}
// mlt_log_verbose( MLT_CONSUMER_SERVICE(self), "dropped %d rendered %d process_head %d\n",
// self->consecutive_dropped, self->consecutive_rendered, self->process_head );
+
+ // Check for too many consecutively dropped frames
+ if ( self->consecutive_dropped > mlt_properties_get_int( properties, "drop_max" ) )
+ {
+ int orig_buffer = mlt_properties_get_int( properties, "buffer" );
+ int prefill = mlt_properties_get_int( properties, "prefill" );
+ mlt_log_verbose( self, "too many frames dropped - " );
+
+ // If using a default low-latency buffer level (SDL) and below the limit
+ if ( ( orig_buffer == 1 || prefill == 1 ) && buffer < (threads + 1) * 10 )
+ {
+ // Auto-scale the buffer to compensate
+ mlt_log_verbose( self, "increasing buffer to %d\n", buffer + threads );
+ mlt_properties_set_int( properties, "_buffer", buffer + threads );
+ self->consecutive_dropped = fps / 2;
+ }
+ else
+ {
+ // Tell the consumer to render it
+ mlt_log_verbose( self, "forcing next frame\n" );
+ mlt_properties_set_int( MLT_FRAME_PROPERTIES( frame ), "rendered", 1 );
+ self->consecutive_dropped = 0;
+ }
+ }
+ }
+ if ( self->is_purge ) {
+ self->is_purge = 0;
+ mlt_frame_close( frame );
+ frame = NULL;
}
-
return frame;
}
}
else // real_time == 0
{
+ if ( !self->ahead )
+ {
+ self->ahead = 1;
+ mlt_events_fire( properties, "consumer-thread-started", NULL );
+ }
// Get the frame in non real time
frame = mlt_consumer_get_frame( self );
int mlt_consumer_is_stopped( mlt_consumer self )
{
// Check if the consumer is stopped
- if ( self->is_stopped != NULL )
+ if ( self && self->is_stopped )
return self->is_stopped( self );
return 0;
projects / mlt / blobdiff