#include <stdlib.h>
#include <sys/time.h>
+static void mlt_consumer_frame_show( mlt_listener listener, mlt_properties owner, mlt_service this, void **args );
+
/** Public final methods
*/
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
// Hmm - default all consumers to yuv422 :-/
this->format = mlt_image_yuv422;
+
+ 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;
}
+static void mlt_consumer_frame_show( mlt_listener listener, mlt_properties owner, mlt_service this, void **args )
+{
+ if ( listener != NULL )
+ listener( owner, this, ( mlt_frame )args[ 0 ] );
+}
+
/** Create a new consumer.
*/
mlt_service mlt_consumer_service( mlt_consumer this )
{
- return &this->parent;
+ return this != NULL ? &this->parent : NULL;
}
/** Get the consumer properties.
mlt_properties mlt_consumer_properties( mlt_consumer this )
{
- return mlt_service_properties( &this->parent );
+ return this != NULL ? mlt_service_properties( &this->parent ) : NULL;
}
/** Connect the consumer to the producer.
// Set the test card on the consumer
mlt_properties_set_data( properties, "test_card_producer", producer, 0, ( mlt_destructor )mlt_producer_close, NULL );
}
-
- // Check and run an ante command
- if ( mlt_properties_get( properties, "ante" ) )
- system( mlt_properties_get( properties, "ante" ) );
}
}
else
mlt_properties_set_data( properties, "test_card_producer", NULL, 0, NULL, NULL );
}
+ // Check and run an ante command
+ if ( mlt_properties_get( properties, "ante" ) )
+ system( mlt_properties_get( properties, "ante" ) );
+
// Set the real_time preference
this->real_time = mlt_properties_get_int( properties, "real_time" );
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 );
// 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_progressive", mlt_properties_get_int( properties, "progressive" ) );
- mlt_properties_set_int( frame_properties, "consumer_deinterlace", mlt_properties_get_int( properties, "deinterlace" ) );
+ if ( mlt_properties_get_int( properties, "progressive" ) || mlt_properties_get_int( properties, "deinterlace" ) )
+ mlt_properties_set_int( frame_properties, "consumer_deinterlace", 1 );
}
// Return the frame
int width = mlt_properties_get_int( properties, "width" );
int height = mlt_properties_get_int( properties, "height" );
+ // See if video is turned off
+ int video_off = mlt_properties_get_int( properties, "video_off" );
+
+ // Get the audio settings
+ mlt_audio_format afmt = mlt_audio_pcm;
+ int counter = 0;
+ double fps = mlt_properties_get_double( properties, "fps" );
+ int channels = mlt_properties_get_int( properties, "channels" );
+ int frequency = mlt_properties_get_int( properties, "frequency" );
+ int samples = 0;
+ int16_t *pcm = NULL;
+
+ // See if audio is turned off
+ int audio_off = mlt_properties_get_int( properties, "audio_off" );
+
// Get the maximum size of the buffer
- int buffer = mlt_properties_get_int( properties, "buffer" );
+ int buffer = mlt_properties_get_int( properties, "buffer" ) + 1;
// General frame variable
mlt_frame frame = NULL;
int skipped = 0;
int64_t time_wait = 0;
int64_t time_frame = 0;
- int64_t time_image = 0;
+ int64_t time_process = 0;
+ int skip_next = 0;
// Get the first frame
frame = mlt_consumer_get_frame( this );
// Get the image of the first frame
- mlt_frame_get_image( frame, &image, &this->format, &width, &height, 0 );
+ if ( !video_off )
+ mlt_frame_get_image( frame, &image, &this->format, &width, &height, 0 );
+
+ if ( !audio_off )
+ {
+ 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 );
// Get the starting time (can ignore the times above)
{
skipped = 0;
time_frame = 0;
- time_image = 0;
+ time_process = 0;
time_wait = 0;
count = 1;
+ skip_next = 0;
}
// Get the image
- if ( ( time_frame + time_image ) / count < ( 40000 - ( time_wait / count ) ) )
+ if ( !skip_next )
{
// Get the image, mark as rendered and time it
- mlt_frame_get_image( frame, &image, &this->format, &width, &height, 0 );
+ if ( !video_off )
+ 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
{
// Increment the number of sequentially skipped frames
skipped ++;
+ skip_next = 0;
// If we've reached an unacceptable level, reset everything
- if ( skipped > 10 )
+ if ( skipped > 5 )
{
skipped = 0;
time_frame = 0;
- time_image = 0;
+ time_process = 0;
time_wait = 0;
- count = 0;
+ count = 1;
}
}
+
+ // Always process audio
+ if ( !audio_off )
+ {
+ 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
+ time_process += time_difference( &ante );
+
+ // Determine if the next frame should be skipped
+ if ( mlt_deque_count( this->queue ) <= 5 && ( ( time_wait + time_frame + time_process ) / count ) > 40000 )
+ skip_next = 1;
}
// Remove the last 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 );
}
}
+void mlt_consumer_purge( mlt_consumer this )
+{
+ if ( this->ahead )
+ {
+ pthread_mutex_lock( &this->mutex );
+ while ( mlt_deque_count( this->queue ) )
+ mlt_frame_close( mlt_deque_pop_back( this->queue ) );
+ pthread_cond_broadcast( &this->cond );
+ pthread_mutex_unlock( &this->mutex );
+ }
+}
+
mlt_frame mlt_consumer_rt_frame( mlt_consumer this )
{
// Frame to return
if ( this->ahead == 0 )
{
int buffer = mlt_properties_get_int( properties, "buffer" );
+ int prefill = mlt_properties_get_int( properties, "prefill" );
consumer_read_ahead_start( this );
if ( buffer > 1 )
- size = buffer / 2;
+ size = prefill > 0 && prefill < buffer ? prefill : buffer;
}
// Get frame from queue
return frame;
}
+/** Callback for the implementation to indicate a stopped condition.
+*/
+
+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 );
+}
+
/** Stop the consumer.
*/
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;
}
void mlt_consumer_close( mlt_consumer this )
{
- // Get the childs close function
- void ( *consumer_close )( ) = this->close;
+ 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;
+ // Make sure it only gets called once
+ this->close = NULL;
+ this->parent.close = NULL;
- // Call the childs close if available
- if ( consumer_close != NULL )
- consumer_close( this );
- else
- mlt_service_close( &this->parent );
+ // 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 );
+ else
+ mlt_service_close( &this->parent );
+ }
}
projects / mlt / blobdiff