mlt_properties_set_int( properties, "width", 720 );
mlt_properties_set_int( properties, "height", 576 );
mlt_properties_set_int( properties, "progressive", 0 );
+ mlt_properties_set_double( properties, "aspect_ratio", 128.0 / 117.0 );
}
else
{
mlt_properties_set_int( properties, "width", 720 );
mlt_properties_set_int( properties, "height", 480 );
mlt_properties_set_int( properties, "progressive", 0 );
+ mlt_properties_set_double( properties, "aspect_ratio", 72.0 / 79.0 );
}
- mlt_properties_set_double( properties, "aspect_ratio", 4.0 / 3.0 );
// Default rescaler for all consumers
mlt_properties_set( properties, "rescale", "bilinear" );
+
+ // 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 );
+
+ // 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.
*/
int width = mlt_properties_get_int( properties, "width" );
int height = mlt_properties_get_int( properties, "height" );
+ // Get the maximum size of the buffer
+ int buffer = mlt_properties_get_int( properties, "buffer" );
+
// General frame variable
mlt_frame frame = NULL;
uint8_t *image = NULL;
// 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;
// Get the first frame
- gettimeofday( &ante, NULL );
frame = mlt_consumer_get_frame( this );
- time_frame = time_difference( &ante );
// Get the image of the first frame
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 );
+
+ // Get the starting time (can ignore the times above)
+ gettimeofday( &ante, NULL );
// Continue to read ahead
while ( this->ahead )
{
// Put the current frame into the queue
pthread_mutex_lock( &this->mutex );
- while( this->ahead && mlt_deque_count( this->queue ) >= 25 )
+ 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 );
count ++;
// Get the image
- if ( ( time_frame + time_image + time_wait ) / count < 40000 )
+ if ( ( time_frame + time_image ) / count < ( 40000 - ( time_wait / count ) ) )
{
// 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
{
- // This is wrong, but it avoids slower machines getting starved
- // It is, after all, impossible to go back in time :-/
- time_image -= ( time_image / count / 8 );
+ // Increment the number of sequentially skipped frames
+ skipped ++;
+
+ // If we've reached an unacceptable level, reset everything
+ if ( skipped > 10 )
+ {
+ skipped = 0;
+ time_frame = 0;
+ time_image = 0;
+ time_wait = 0;
+ count = 0;
+ }
}
}
}
}
-mlt_frame mlt_consumer_rt_frame( mlt_consumer this, mlt_image_format format )
+mlt_frame mlt_consumer_rt_frame( mlt_consumer this )
{
// Frame to return
mlt_frame frame = NULL;
- int size = 1;
+ // Get the properties
+ mlt_properties properties = mlt_consumer_properties( this );
- // Is the read ahead running?
- if ( this->ahead == 0 )
+ // Check if the user has requested real time or not
+ if ( mlt_properties_get_int( properties, "real_time" ) )
{
- this->format = format;
- consumer_read_ahead_start( this );
- size = 12;
+ 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 / 2;
+ }
+
+ // 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 );
else
mlt_service_close( &this->parent );
}
-
projects / mlt / blobdiff