X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_consumer.c;h=99ca1516d8fcf40240aaaff62355b1cddc7bdfa8;hb=da46016cc4e9c751ab346b9b8f451a59cd276b03;hp=4422b111389c7ac95f5120ff5d7c9b9d7005934c;hpb=4a39b72c5ac8fd2dd6db81a95eab08adde0491b9;p=melted

diff --git a/src/framework/mlt_consumer.c b/src/framework/mlt_consumer.c
index 4422b11..99ca151 100644
--- a/src/framework/mlt_consumer.c
+++ b/src/framework/mlt_consumer.c
@@ -42,7 +42,7 @@ int mlt_consumer_init( mlt_consumer this, void *child )
 	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" );
@@ -55,7 +55,7 @@ int mlt_consumer_init( mlt_consumer this, void *child )
 			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
 		{
@@ -64,7 +64,7 @@ int mlt_consumer_init( mlt_consumer this, void *child )
 			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
@@ -88,6 +88,11 @@ int mlt_consumer_init( mlt_consumer this, void *child )
 
 		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;
 }
@@ -127,7 +132,7 @@ mlt_service mlt_consumer_service( mlt_consumer this )
 
 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.
@@ -144,11 +149,15 @@ int mlt_consumer_connect( mlt_consumer this, mlt_service 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 )
 	{
@@ -161,7 +170,9 @@ int mlt_consumer_start( mlt_consumer this )
 			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 );
@@ -188,6 +199,44 @@ int mlt_consumer_start( mlt_consumer this )
 	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 )
+	{
+		struct timeval now;
+		struct timespec tm;
+		pthread_mutex_lock( &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 );
+		}
+		if ( !mlt_consumer_is_stopped( this ) && 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
 */
 
@@ -197,16 +246,40 @@ mlt_frame mlt_consumer_get_frame( mlt_consumer this )
 	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_get_frame( service, &frame, 0 ) == 0 )
+	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 );
+		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 );
+		pthread_mutex_unlock( &this->put_mutex );
+		if ( frame != NULL )
+			mlt_service_apply_filters( service, frame, 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 );
@@ -221,7 +294,7 @@ mlt_frame mlt_consumer_get_frame( mlt_consumer this )
 		// Aspect ratio and other jiggery pokery
 		mlt_properties_set_double( frame_properties, "consumer_aspect_ratio", mlt_properties_get_double( properties, "aspect_ratio" ) );
 		if ( mlt_properties_get_int( properties, "progressive" ) || mlt_properties_get_int( properties, "deinterlace" ) )
-			mlt_properties_set_int( properties, "consumer_deinterlace", 1 );
+			mlt_properties_set_int( frame_properties, "consumer_deinterlace", 1 );
 	}
 
 	// Return the frame
@@ -243,7 +316,7 @@ static void *consumer_read_ahead_thread( void *arg )
 	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" );
@@ -293,10 +366,9 @@ static void *consumer_read_ahead_thread( void *arg )
 	{
 		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 );
@@ -311,17 +383,22 @@ static void *consumer_read_ahead_thread( void *arg )
 		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;
@@ -337,7 +414,7 @@ static void *consumer_read_ahead_thread( void *arg )
 			// 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
 		{
@@ -361,7 +438,6 @@ static void *consumer_read_ahead_thread( void *arg )
 		{
 			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
@@ -415,6 +491,11 @@ static void consumer_read_ahead_stop( mlt_consumer this )
 		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 );
 
@@ -451,7 +532,7 @@ mlt_frame mlt_consumer_rt_frame( mlt_consumer this )
 	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 )
@@ -482,7 +563,8 @@ mlt_frame mlt_consumer_rt_frame( mlt_consumer this )
 		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;
@@ -493,8 +575,8 @@ mlt_frame mlt_consumer_rt_frame( mlt_consumer this )
 
 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.
@@ -503,7 +585,7 @@ void mlt_consumer_stopped( mlt_consumer this )
 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 )
@@ -513,6 +595,16 @@ int mlt_consumer_stop( mlt_consumer this )
 	if ( mlt_properties_get_int( properties, "real_time" ) )
 		consumer_read_ahead_stop( this );
 
+	// 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 );
+
 	// Kill the test card
 	mlt_properties_set_data( properties, "test_card_producer", NULL, 0, NULL, NULL );
 
@@ -540,19 +632,31 @@ int mlt_consumer_is_stopped( mlt_consumer this )
 
 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;
+		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 );
+		}
 	}
 }