X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_consumer.c;h=1b67b7414516d048c1b4ea9fcc1d153e14616bd9;hb=b59235cf232be9d06a0eef478e0cd4a93a36cb58;hp=ef2760e95dd38bfa4d776d4ac93fe8316c8d549c;hpb=a038d8a6f14b30dd52242d2f69601e6393e44475;p=melted

diff --git a/src/framework/mlt_consumer.c b/src/framework/mlt_consumer.c
index ef2760e..1b67b74 100644
--- a/src/framework/mlt_consumer.c
+++ b/src/framework/mlt_consumer.c
@@ -108,7 +108,7 @@ mlt_consumer mlt_consumer_new( )
 
 mlt_service mlt_consumer_service( mlt_consumer this )
 {
-	return &this->parent;
+	return this != NULL ? &this->parent : NULL;
 }
 
 /** Get the consumer properties.
@@ -116,7 +116,7 @@ mlt_service mlt_consumer_service( mlt_consumer this )
 
 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.
@@ -155,10 +155,6 @@ int mlt_consumer_start( mlt_consumer this )
 				// 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
@@ -167,6 +163,10 @@ int mlt_consumer_start( mlt_consumer this )
 		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" );
 
@@ -234,14 +234,27 @@ static void *consumer_read_ahead_thread( void *arg )
 	// 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" );
 
+	// 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;
@@ -255,13 +268,23 @@ static void *consumer_read_ahead_thread( void *arg )
 	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)
@@ -271,14 +294,13 @@ static void *consumer_read_ahead_thread( void *arg )
 	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 );
@@ -292,42 +314,51 @@ static void *consumer_read_ahead_thread( void *arg )
 		{
 			skipped = 0;
 			time_frame = 0;
-			time_image = 0;
+			time_process = 0;
 			time_wait = 0;
 			count = 1;
+			skip_next = 0;
 		}
 
-		//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 )
+		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
 		{
-			fprintf( stderr, "Dropped a frame for %s\n", service );
-
 			// Increment the number of sequentially skipped frames
 			skipped ++;
-
-			time_wait = 0;
+			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;
-				count = 0;
+				time_process = 0;
+				time_wait = 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
@@ -408,9 +439,10 @@ mlt_frame mlt_consumer_rt_frame( mlt_consumer this )
 		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;
+				size = prefill > 0 && prefill < buffer ? prefill : buffer;
 		}
 	
 		// Get frame from queue