if ( error == 0 )
{
// Get the properties from the service
- mlt_properties properties = mlt_service_properties( &this->parent );
+ mlt_properties properties = MLT_SERVICE_PROPERTIES( &this->parent );
// Get the normalisation preference
char *normalisation = mlt_environment( "MLT_NORMALISATION" );
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 );
+ mlt_properties_set_double( properties, "aspect_ratio", 59.0 / 54.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", 10.0 / 11.0 );
}
// Default rescaler for all consumers
mlt_properties mlt_consumer_properties( mlt_consumer this )
{
- return this != NULL ? mlt_service_properties( &this->parent ) : NULL;
+ return this != NULL ? MLT_SERVICE_PROPERTIES( &this->parent ) : NULL;
}
/** Connect the consumer to the producer.
int mlt_consumer_start( mlt_consumer this )
{
// Get the properies
- mlt_properties properties = mlt_consumer_properties( this );
+ mlt_properties properties = MLT_CONSUMER_PROPERTIES( this );
// Determine if there's a test card producer
char *test_card = mlt_properties_get( properties, "test_card" );
+ // Just to make sure nothing is hanging around...
+ mlt_frame_close( this->put );
+ this->put = NULL;
+
// Deal with it now.
if ( test_card != NULL )
{
if ( producer != NULL )
{
// Test card should loop I guess...
- mlt_properties_set( mlt_producer_properties( producer ), "eof", "loop" );
+ mlt_properties_set( MLT_PRODUCER_PROPERTIES( producer ), "eof", "pause" );
+ mlt_producer_set_speed( producer, 0 );
+ mlt_producer_set_in_and_out( producer, 0, 0 );
// Set the test card on the consumer
mlt_properties_set_data( properties, "test_card_producer", producer, 0, ( mlt_destructor )mlt_producer_close, NULL );
int error = 1;
// Get the service assoicated to the consumer
- mlt_service service = mlt_consumer_service( this );
+ mlt_service service = MLT_CONSUMER_SERVICE( this );
if ( mlt_service_producer( service ) == NULL )
{
+ struct timeval now;
+ struct timespec tm;
pthread_mutex_lock( &this->put_mutex );
- if ( this->put != NULL )
- pthread_cond_wait( &this->put_cond, &this->put_mutex );
- if ( this->put == NULL )
+ while ( !mlt_consumer_is_stopped( this ) && this->put != NULL )
+ {
+ gettimeofday( &now, NULL );
+ tm.tv_sec = now.tv_sec + 1;
+ tm.tv_nsec = now.tv_usec * 1000;
+ pthread_cond_timedwait( &this->put_cond, &this->put_mutex, &tm );
+ }
+ if ( !mlt_consumer_is_stopped( this ) && this->put == NULL )
this->put = frame;
else
mlt_frame_close( frame );
mlt_frame frame = NULL;
// Get the service assoicated to the consumer
- mlt_service service = mlt_consumer_service( this );
+ mlt_service service = MLT_CONSUMER_SERVICE( this );
+
+ // Get the consumer properties
+ mlt_properties properties = MLT_CONSUMER_PROPERTIES( this );
// Get the frame
- if ( mlt_service_producer( service ) == NULL )
+ if ( mlt_service_producer( service ) == NULL && mlt_properties_get_int( properties, "put_mode" ) )
{
+ struct timeval now;
+ struct timespec tm;
pthread_mutex_lock( &this->put_mutex );
- if ( this->put == NULL )
- pthread_cond_wait( &this->put_cond, &this->put_mutex );
+ while ( !mlt_consumer_is_stopped( this ) && this->put == NULL )
+ {
+ gettimeofday( &now, NULL );
+ tm.tv_sec = now.tv_sec + 1;
+ tm.tv_nsec = now.tv_usec * 1000;
+ pthread_cond_timedwait( &this->put_cond, &this->put_mutex, &tm );
+ }
frame = this->put;
this->put = NULL;
pthread_cond_broadcast( &this->put_cond );
if ( frame != NULL )
mlt_service_apply_filters( service, frame, 0 );
}
-
- if ( frame != NULL || mlt_service_get_frame( service, &frame, 0 ) == 0 )
+ else if ( mlt_service_producer( service ) != NULL )
{
- // Get the consumer properties
- mlt_properties properties = mlt_consumer_properties( this );
+ mlt_service_get_frame( service, &frame, 0 );
+ }
+ if ( frame != NULL )
+ {
// Get the frame properties
- mlt_properties frame_properties = mlt_frame_properties( frame );
+ mlt_properties frame_properties = MLT_FRAME_PROPERTIES( frame );
// Get the test card producer
mlt_producer test_card = mlt_properties_get_data( properties, "test_card_producer", NULL );
mlt_consumer this = arg;
// Get the properties of the consumer
- mlt_properties properties = mlt_consumer_properties( this );
+ mlt_properties properties = MLT_CONSUMER_PROPERTIES( this );
// Get the width and height
int width = mlt_properties_get_int( properties, "width" );
{
samples = mlt_sample_calculator( fps, frequency, counter++ );
mlt_frame_get_audio( frame, &pcm, &afmt, &frequency, &channels, &samples );
- frame->get_audio = NULL;
}
- mlt_properties_set_int( mlt_frame_properties( frame ), "rendered", 1 );
+ mlt_properties_set_int( MLT_FRAME_PROPERTIES( frame ), "rendered", 1 );
// Get the starting time (can ignore the times above)
gettimeofday( &ante, NULL );
mlt_deque_push_back( this->queue, frame );
pthread_cond_broadcast( &this->cond );
pthread_mutex_unlock( &this->mutex );
+
time_wait += time_difference( &ante );
// Get the next frame
frame = mlt_consumer_get_frame( this );
time_frame += time_difference( &ante );
+ // If there's no frame, we're probably stopped...
+ if ( frame == NULL )
+ continue;
+
// Increment the count
count ++;
// All non normal playback frames should be shown
- if ( mlt_properties_get_int( mlt_frame_properties( frame ), "_speed" ) != 1 )
+ if ( mlt_properties_get_int( MLT_FRAME_PROPERTIES( frame ), "_speed" ) != 1 )
{
skipped = 0;
time_frame = 0;
// Get the image, mark as rendered and time it
if ( !video_off )
mlt_frame_get_image( frame, &image, &this->format, &width, &height, 0 );
- mlt_properties_set_int( mlt_frame_properties( frame ), "rendered", 1 );
+ mlt_properties_set_int( MLT_FRAME_PROPERTIES( frame ), "rendered", 1 );
}
else
{
{
samples = mlt_sample_calculator( fps, frequency, counter++ );
mlt_frame_get_audio( frame, &pcm, &afmt, &frequency, &channels, &samples );
- frame->get_audio = NULL;
}
// Increment the time take for this frame
mlt_frame frame = NULL;
// Get the properties
- mlt_properties properties = mlt_consumer_properties( this );
+ mlt_properties properties = MLT_CONSUMER_PROPERTIES( this );
// Check if the user has requested real time or not
if ( this->real_time )
frame = mlt_consumer_get_frame( this );
// This isn't true, but from the consumers perspective it is
- mlt_properties_set_int( mlt_frame_properties( frame ), "rendered", 1 );
+ if ( frame != NULL )
+ mlt_properties_set_int( MLT_FRAME_PROPERTIES( frame ), "rendered", 1 );
}
return frame;
void mlt_consumer_stopped( mlt_consumer this )
{
- mlt_properties_set_int( mlt_consumer_properties( this ), "running", 0 );
- mlt_events_fire( mlt_consumer_properties( this ), "consumer-stopped", NULL );
+ mlt_properties_set_int( MLT_CONSUMER_PROPERTIES( this ), "running", 0 );
+ mlt_events_fire( MLT_CONSUMER_PROPERTIES( this ), "consumer-stopped", NULL );
}
/** Stop the consumer.
int mlt_consumer_stop( mlt_consumer this )
{
// Get the properies
- mlt_properties properties = mlt_consumer_properties( this );
+ mlt_properties properties = MLT_CONSUMER_PROPERTIES( this );
// Stop the consumer
if ( this->stop != NULL )
// Just in case...
pthread_mutex_lock( &this->put_mutex );
+ if ( this->put != NULL )
+ {
+ mlt_frame_close( this->put );
+ this->put = NULL;
+ }
pthread_cond_broadcast( &this->put_cond );
pthread_mutex_unlock( &this->put_mutex );
void mlt_consumer_close( mlt_consumer this )
{
- if ( this != NULL && mlt_properties_dec_ref( mlt_consumer_properties( this ) ) <= 0 )
+ if ( this != NULL && mlt_properties_dec_ref( MLT_CONSUMER_PROPERTIES( this ) ) <= 0 )
{
// Get the childs close function
void ( *consumer_close )( ) = this->close;
- // Make sure it only gets called once
- this->close = NULL;
- this->parent.close = NULL;
-
- // Destroy the push mutex and condition
- pthread_cond_broadcast( &this->put_cond );
- pthread_mutex_destroy( &this->put_mutex );
- pthread_cond_destroy( &this->put_cond );
+ if ( consumer_close )
+ {
+ // Just in case...
+ mlt_consumer_stop( this );
- // Call the childs close if available
- if ( consumer_close != NULL )
+ this->close = NULL;
consumer_close( this );
+ }
else
+ {
+
+ // Make sure it only gets called once
+ this->parent.close = NULL;
+
+ // Destroy the push mutex and condition
+ pthread_cond_broadcast( &this->put_cond );
+ pthread_mutex_destroy( &this->put_mutex );
+ pthread_cond_destroy( &this->put_cond );
+
mlt_service_close( &this->parent );
+ }
}
}
projects / melted / blobdiff