X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_consumer.c;h=86bed309025fe804f53021d5bf4e8b92bb93a520;hb=1171e98b787df5cbbba737df820d9c9611f81723;hp=2fb7dd33c597f09f3cfbc6800d6f247ea38e8373;hpb=c1c8b798d6215f20b3a3f87cd1fa2954f31d6031;p=melted

diff --git a/src/framework/mlt_consumer.c b/src/framework/mlt_consumer.c
index 2fb7dd3..86bed30 100644
--- a/src/framework/mlt_consumer.c
+++ b/src/framework/mlt_consumer.c
@@ -78,6 +78,9 @@ int mlt_consumer_init( mlt_consumer this, void *child )
 		// Default of all consumers is real time
 		mlt_properties_set_int( properties, "real_time", 1 );
 
+		// Default to environment test card
+		mlt_properties_set( properties, "test_card", mlt_environment( "MLT_TEST_CARD" ) );
+
 		// Hmm - default all consumers to yuv422 :-/
 		this->format = mlt_image_yuv422;
 	}
@@ -141,8 +144,7 @@ int mlt_consumer_start( mlt_consumer this )
 		if ( mlt_properties_get_data( properties, "test_card_producer", NULL ) == NULL )
 		{
 			// Create a test card producer
-			// TODO: do we want to use fezzik here?
-			mlt_producer producer = mlt_factory_producer( "fezzik", test_card );
+			mlt_producer producer = mlt_factory_producer( NULL, test_card );
 
 			// Do we have a producer
 			if ( producer != NULL )
@@ -165,6 +167,9 @@ int mlt_consumer_start( mlt_consumer this )
 		mlt_properties_set_data( properties, "test_card_producer", NULL, 0, NULL, NULL );
 	}
 
+	// Set the real_time preference
+	this->real_time = mlt_properties_get_int( properties, "real_time" );
+
 	// Start the service
 	if ( this->start != NULL )
 		return this->start( this );
@@ -172,7 +177,7 @@ int mlt_consumer_start( mlt_consumer this )
 	return 0;
 }
 
-/** Protected method :-/ for consumer to get frames from connected service
+/** Protected method for consumer to get frames from connected service
 */
 
 mlt_frame mlt_consumer_get_frame( mlt_consumer this )
@@ -233,8 +238,23 @@ static void *consumer_read_ahead_thread( void *arg )
 	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;
@@ -264,13 +284,14 @@ 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 );
@@ -279,13 +300,22 @@ static void *consumer_read_ahead_thread( void *arg )
 		// Increment the count
 		count ++;
 
+		// All non normal playback frames should be shown
+		if ( mlt_properties_get_int( mlt_frame_properties( frame ), "_speed" ) != 1 )
+		{
+			skipped = 0;
+			time_frame = 0;
+			time_image = 0;
+			count = 1;
+		}
+
 		// Get the image
-		if ( ( time_frame + time_image ) / count < ( 40000 - ( time_wait / count ) ) )
+		if ( ( time_frame + time_image ) / count < 40000 )
 		{
 			// 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;
@@ -301,10 +331,20 @@ static void *consumer_read_ahead_thread( void *arg )
 				skipped = 0;
 				time_frame = 0;
 				time_image = 0;
-				time_wait = 0;
 				count = 0;
 			}
 		}
+
+		// 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_image += time_difference( &ante );
 	}
 
 	// Remove the last frame
@@ -335,7 +375,6 @@ static void consumer_read_ahead_start( mlt_consumer this )
 	
 	// Create the read ahead 
 	pthread_create( &this->ahead_thread, &thread_attributes, consumer_read_ahead_thread, this );
-
 }
 
 static void consumer_read_ahead_stop( mlt_consumer this )
@@ -363,6 +402,9 @@ static void consumer_read_ahead_stop( mlt_consumer this )
 		// Wipe the queue
 		while ( mlt_deque_count( this->queue ) )
 			mlt_frame_close( mlt_deque_pop_back( this->queue ) );
+
+		// Close the queue
+		mlt_deque_close( this->queue );
 	}
 }
 
@@ -375,7 +417,7 @@ mlt_frame mlt_consumer_rt_frame( mlt_consumer this )
 	mlt_properties properties = mlt_consumer_properties( this );
 
 	// Check if the user has requested real time or not
-	if ( mlt_properties_get_int( properties, "real_time" ) )
+	if ( this->real_time )
 	{
 		int size = 1;
 
@@ -385,7 +427,7 @@ mlt_frame mlt_consumer_rt_frame( mlt_consumer this )
 			int buffer = mlt_properties_get_int( properties, "buffer" );
 			consumer_read_ahead_start( this );
 			if ( buffer > 1 )
-				size = buffer / 2;
+				size = buffer;
 		}
 	
 		// Get frame from queue