X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fsdl%2Fconsumer_sdl.c;h=660169be04de9d211eff3b3390bdfa465b1f2dfb;hb=2ff111fe322cfdea5b879dd7912a8a375af62aff;hp=23ff27c90d87ee6c66663bca2f5d005f6aef83ce;hpb=9f05ea86ef01cc51ed3c7b6a1d3495255e571d67;p=melted

diff --git a/src/modules/sdl/consumer_sdl.c b/src/modules/sdl/consumer_sdl.c
index 23ff27c..660169b 100644
--- a/src/modules/sdl/consumer_sdl.c
+++ b/src/modules/sdl/consumer_sdl.c
@@ -131,7 +131,7 @@ mlt_consumer consumer_sdl_init( char *arg )
 			this->height = mlt_properties_get_int( this->properties, "height" );
 			
 			// Default window size
-			this->window_width = ( float )this->height * this->display_aspect + 0.5;
+			this->window_width = ( float )this->height * this->display_aspect;
 			this->window_height = this->height;
 		}
 		else
@@ -447,7 +447,7 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame )
 					if ( this->rect.w > this->window_width )
 					{
 						this->rect.w = this->window_width;
-						this->rect.h = this_aspect / frame_aspect * this->window_height + 0.5;
+						this->rect.h = this_aspect / frame_aspect * this->window_height;
 					}
 				}
 			}
@@ -462,11 +462,11 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame )
 			else if ( this->window_height * this->display_aspect > this->window_width )
 			{
 				this->rect.w = this->window_width;
-				this->rect.h = this->window_width / this->display_aspect + 0.5;
+				this->rect.h = this->window_width / this->display_aspect;
 			}
 			else
 			{
-				this->rect.w = this->window_height * this->display_aspect + 0.5;
+				this->rect.w = this->window_height * this->display_aspect;
 				this->rect.h = this->window_height;
 			}
 			
@@ -533,6 +533,9 @@ static void *video_thread( void *arg )
 	mlt_properties properties = NULL;
 	double speed = 0;
 
+	// Get real time flag
+	int real_time = mlt_properties_get_int( this->properties, "real_time" );
+
 	// Get the current time
 	gettimeofday( &now, NULL );
 
@@ -569,7 +572,7 @@ static void *video_thread( void *arg )
 			mlt_position difference = scheduled - elapsed;
 
 			// Smooth playback a bit
-			if ( difference > 20000 && speed == 1.0 )
+			if ( real_time && ( difference > 20000 && speed == 1.0 ) )
 			{
 				tm.tv_sec = difference / 1000000;
 				tm.tv_nsec = ( difference % 1000000 ) * 500;
@@ -577,11 +580,11 @@ static void *video_thread( void *arg )
 			}
 
 			// Show current frame if not too old
-			if ( difference > -10000 || speed != 1.0 || mlt_deque_count( this->queue ) < 2 )
+			if ( !real_time || ( difference > -10000 || speed != 1.0 || mlt_deque_count( this->queue ) < 2 ) )
 				consumer_play_video( this, next );
 
 			// If the queue is empty, recalculate start to allow build up again
-			if ( mlt_deque_count( this->queue ) == 0 && speed == 1.0 )
+			if ( real_time && ( mlt_deque_count( this->queue ) == 0 && speed == 1.0 ) )
 			{
 				gettimeofday( &now, NULL );
 				start = ( ( int64_t )now.tv_sec * 1000000 + now.tv_usec ) - scheduled + 20000;