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_events_register( properties, "consumer-frame-show", ( mlt_transmitter )mlt_consumer_frame_show );
mlt_events_register( properties, "consumer-stopped", NULL );
+
+ // Create the push mutex and condition
+ pthread_mutex_init( &this->put_mutex, NULL );
+ pthread_cond_init( &this->put_cond, NULL );
+
}
return error;
}
return 0;
}
+/** An alternative method to feed frames into the consumer - only valid if
+ the consumer itself is not connected.
+*/
+
+int mlt_consumer_put_frame( mlt_consumer this, mlt_frame frame )
+{
+ int error = 1;
+
+ // Get the service assoicated to the consumer
+ mlt_service service = mlt_consumer_service( this );
+
+ if ( mlt_service_producer( service ) == NULL )
+ {
+ pthread_mutex_lock( &this->put_mutex );
+ if ( this->put != NULL )
+ pthread_cond_wait( &this->put_cond, &this->put_mutex );
+ if ( this->put == NULL )
+ this->put = frame;
+ else
+ mlt_frame_close( frame );
+ pthread_cond_broadcast( &this->put_cond );
+ pthread_mutex_unlock( &this->put_mutex );
+ }
+ else
+ {
+ mlt_frame_close( frame );
+ }
+
+ return error;
+}
+
/** Protected method for consumer to get frames from connected service
*/
// Get the service assoicated to the consumer
mlt_service service = mlt_consumer_service( this );
+ // Get the consumer properties
+ mlt_properties properties = mlt_consumer_properties( this );
+
// Get the frame
- if ( mlt_service_get_frame( service, &frame, 0 ) == 0 )
+ if ( mlt_service_producer( service ) == NULL && mlt_properties_get_int( properties, "put_mode" ) )
{
- // Get the consumer properties
- mlt_properties properties = mlt_consumer_properties( this );
+ pthread_mutex_lock( &this->put_mutex );
+ if ( this->put == NULL )
+ pthread_cond_wait( &this->put_cond, &this->put_mutex );
+ frame = this->put;
+ this->put = NULL;
+ pthread_cond_broadcast( &this->put_cond );
+ pthread_mutex_unlock( &this->put_mutex );
+ if ( frame != NULL )
+ mlt_service_apply_filters( service, frame, 0 );
+ }
+ if ( frame != NULL || mlt_service_get_frame( service, &frame, 0 ) == 0 )
+ {
// Get the frame properties
mlt_properties frame_properties = mlt_frame_properties( frame );
pthread_cond_broadcast( &this->cond );
pthread_mutex_unlock( &this->mutex );
+ // Broadcast to the put condition in case it's waiting
+ pthread_mutex_lock( &this->put_mutex );
+ pthread_cond_broadcast( &this->put_cond );
+ pthread_mutex_unlock( &this->put_mutex );
+
// Join the thread
pthread_join( this->ahead_thread, NULL );
if ( mlt_properties_get_int( properties, "real_time" ) )
consumer_read_ahead_stop( this );
+ // Just in case...
+ pthread_mutex_lock( &this->put_mutex );
+ pthread_cond_broadcast( &this->put_cond );
+ pthread_mutex_unlock( &this->put_mutex );
+
// Kill the test card
mlt_properties_set_data( properties, "test_card_producer", NULL, 0, NULL, NULL );
if ( mlt_properties_get( properties, "post" ) )
system( mlt_properties_get( properties, "post" ) );
+ if ( this->put != NULL )
+ {
+ mlt_frame_close( this->put );
+ this->put = NULL;
+ }
+
return 0;
}
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 );
+
// Call the childs close if available
if ( consumer_close != NULL )
consumer_close( this );