// Default read ahead buffer size
mlt_properties_set_int( properties, "buffer", 25 );
+ // Default audio frequency and channels
+ mlt_properties_set_int( properties, "frequency", 48000 );
+ mlt_properties_set_int( properties, "channels", 2 );
+
+ // Default of all consumers is real time
+ mlt_properties_set_int( properties, "real_time", 1 );
+
+ // Default to environment test card
+ mlt_properties_set( properties, "test_card", mlt_environment( "MLT_TEST_CARD" ) );
+
// Hmm - default all consumers to yuv422 :-/
this->format = mlt_image_yuv422;
}
return error;
}
+/** Create a new consumer.
+*/
+
+mlt_consumer mlt_consumer_new( )
+{
+ // Create the memory for the structure
+ mlt_consumer this = malloc( sizeof( struct mlt_consumer_s ) );
+
+ // Initialise it
+ if ( this != NULL )
+ mlt_consumer_init( this, NULL );
+
+ // Return it
+ return this;
+}
+
/** Get the parent service object.
*/
if ( mlt_properties_get_data( properties, "test_card_producer", NULL ) == NULL )
{
// Create a test card producer
- // TODO: do we want to use fezzik here?
- mlt_producer producer = mlt_factory_producer( "fezzik", test_card );
+ mlt_producer producer = mlt_factory_producer( NULL, test_card );
// Do we have a producer
if ( producer != NULL )
mlt_properties_set_data( properties, "test_card_producer", NULL, 0, NULL, NULL );
}
+ // Set the real_time preference
+ this->real_time = mlt_properties_get_int( properties, "real_time" );
+
// Start the service
if ( this->start != NULL )
return this->start( this );
return 0;
}
-/** Protected method :-/ for consumer to get frames from connected service
+/** Protected method for consumer to get frames from connected service
*/
mlt_frame mlt_consumer_get_frame( mlt_consumer this )
// Get the properties of the consumer
mlt_properties properties = mlt_consumer_properties( this );
+ char *service = mlt_properties_get( properties, "mlt_service" );
+
// Get the width and height
int width = mlt_properties_get_int( properties, "width" );
int height = mlt_properties_get_int( properties, "height" );
// Average time for get_frame and get_image
int count = 1;
+ int skipped = 0;
int64_t time_wait = 0;
int64_t time_frame = 0;
int64_t time_image = 0;
while ( this->ahead )
{
// Put the current frame into the queue
+ time_difference( &ante );
pthread_mutex_lock( &this->mutex );
while( this->ahead && mlt_deque_count( this->queue ) >= buffer )
pthread_cond_wait( &this->cond, &this->mutex );
mlt_deque_push_back( this->queue, frame );
pthread_cond_broadcast( &this->cond );
pthread_mutex_unlock( &this->mutex );
- time_wait += time_difference( &ante );
+ time_wait = time_difference( &ante );
// Get the next frame
frame = mlt_consumer_get_frame( this );
// Increment the count
count ++;
+ // All non normal playback frames should be shown
+ if ( mlt_properties_get_int( mlt_frame_properties( frame ), "_speed" ) != 1 )
+ {
+ skipped = 0;
+ time_frame = 0;
+ time_image = 0;
+ time_wait = 0;
+ count = 1;
+ }
+
+ //fprintf( stderr, "%s: %d %d %lld %lld\n", service, mlt_deque_count( this->queue ), buffer, ( time_frame + time_image ) / count, ( time_wait / count ) );
+
// Get the image
- if ( ( time_frame + time_image ) / count < ( 40000 - ( time_wait / count ) ) )
+ if ( ( time_frame + time_image ) / count < 40000 )
{
// Get the image, mark as rendered and time it
mlt_frame_get_image( frame, &image, &this->format, &width, &height, 0 );
mlt_properties_set_int( mlt_frame_properties( frame ), "rendered", 1 );
time_image += time_difference( &ante );
+
+ // Reset the skipped count
+ skipped = 0;
+ }
+ else
+ {
+ fprintf( stderr, "Dropped a frame for %s\n", service );
+
+ // Increment the number of sequentially skipped frames
+ skipped ++;
+
+ time_wait = 0;
+
+ // If we've reached an unacceptable level, reset everything
+ if ( skipped > 10 )
+ {
+ skipped = 0;
+ time_frame = 0;
+ time_image = 0;
+ count = 0;
+ }
}
}
static void consumer_read_ahead_start( mlt_consumer this )
{
+ pthread_attr_t thread_attributes;
+
// We're running now
this->ahead = 1;
// Create the condition
pthread_cond_init( &this->cond, NULL );
+ // Inherit the scheduling priority
+ pthread_attr_init( &thread_attributes );
+ pthread_attr_setinheritsched( &thread_attributes, PTHREAD_INHERIT_SCHED );
+
// Create the read ahead
- pthread_create( &this->ahead_thread, NULL, consumer_read_ahead_thread, this );
-
+ pthread_create( &this->ahead_thread, &thread_attributes, consumer_read_ahead_thread, this );
}
static void consumer_read_ahead_stop( mlt_consumer this )
// Wipe the queue
while ( mlt_deque_count( this->queue ) )
mlt_frame_close( mlt_deque_pop_back( this->queue ) );
+
+ // Close the queue
+ mlt_deque_close( this->queue );
}
}
{
// Frame to return
mlt_frame frame = NULL;
- int size = 1;
- // Is the read ahead running?
- if ( this->ahead == 0 )
+ // Get the properties
+ mlt_properties properties = mlt_consumer_properties( this );
+
+ // Check if the user has requested real time or not
+ if ( this->real_time )
{
- int buffer = mlt_properties_get_int( mlt_consumer_properties( this ), "buffer" );
- consumer_read_ahead_start( this );
- if ( buffer > 1 )
- size = buffer / 2;
+ int size = 1;
+
+ // Is the read ahead running?
+ if ( this->ahead == 0 )
+ {
+ int buffer = mlt_properties_get_int( properties, "buffer" );
+ consumer_read_ahead_start( this );
+ if ( buffer > 1 )
+ size = buffer;
+ }
+
+ // Get frame from queue
+ pthread_mutex_lock( &this->mutex );
+ while( this->ahead && mlt_deque_count( this->queue ) < size )
+ pthread_cond_wait( &this->cond, &this->mutex );
+ frame = mlt_deque_pop_front( this->queue );
+ pthread_cond_broadcast( &this->cond );
+ pthread_mutex_unlock( &this->mutex );
}
+ else
+ {
+ // Get the frame in non real time
+ frame = mlt_consumer_get_frame( this );
- // Get frame from queue
- pthread_mutex_lock( &this->mutex );
- while( this->ahead && mlt_deque_count( this->queue ) < size )
- pthread_cond_wait( &this->cond, &this->mutex );
- frame = mlt_deque_pop_front( this->queue );
- pthread_cond_broadcast( &this->cond );
- pthread_mutex_unlock( &this->mutex );
+ // This isn't true, but from the consumers perspective it is
+ mlt_properties_set_int( mlt_frame_properties( frame ), "rendered", 1 );
+ }
return frame;
}
if ( this->stop != NULL )
this->stop( this );
- // Kill the read ahead
- consumer_read_ahead_stop( this );
+ // Check if the user has requested real time or not and stop if necessary
+ if ( mlt_properties_get_int( properties, "real_time" ) )
+ consumer_read_ahead_stop( this );
// Kill the test card
mlt_properties_set_data( properties, "test_card_producer", NULL, 0, NULL, NULL );
projects / melted / blobdiff