X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fsdl%2Fconsumer_sdl.c;h=41eea141ed2208dc5e9f56c5f469740213605637;hb=788b48cb6c5163a522e0f51c80ad640cf7caed31;hp=b06ca484fc9fdc459c59bd935dac949f2f340a0d;hpb=5c299d1ae6f3535df35b3f30bae0476a1ca50aa6;p=melted

diff --git a/src/modules/sdl/consumer_sdl.c b/src/modules/sdl/consumer_sdl.c
index b06ca48..41eea14 100644
--- a/src/modules/sdl/consumer_sdl.c
+++ b/src/modules/sdl/consumer_sdl.c
@@ -48,6 +48,7 @@ struct consumer_sdl_s
 	int window_width;
 	int window_height;
 	float aspect_ratio;
+	float display_aspect;
 	int width;
 	int height;
 	int playing;
@@ -55,7 +56,6 @@ struct consumer_sdl_s
 	SDL_Surface *sdl_screen;
 	SDL_Overlay *sdl_overlay;
 	uint8_t *buffer;
-	int time_taken;
 };
 
 /** Forward references to static functions.
@@ -103,23 +103,44 @@ mlt_consumer consumer_sdl_init( char *arg )
 		// Default scaler (for now we'll use nearest)
 		mlt_properties_set( this->properties, "rescale", "nearest" );
 
+		// Default buffer for low latency
+		mlt_properties_set_int( this->properties, "buffer", 1 );
+
 		// Default progressive true
-		mlt_properties_set_int( this->properties, "progressive", 1 );
+		mlt_properties_set_int( this->properties, "progressive", 0 );
 
-		// Get aspect ratio
+		// Get sample aspect ratio
 		this->aspect_ratio = mlt_properties_get_double( this->properties, "aspect_ratio" );
 		
+		// Default display aspect ratio
+		this->display_aspect = 4.0 / 3.0;
+		
 		// process actual param
 		if ( arg == NULL || sscanf( arg, "%dx%d", &this->width, &this->height ) != 2 )
 		{
 			this->width = mlt_properties_get_int( this->properties, "width" );
 			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_height = this->height;
+		}
+		else
+		{
+			if ( (int)( ( float )this->width / this->height * 1000 ) != 
+				 (int)( this->display_aspect * 1000 ) ) 
+			{
+				// Override these
+				this->display_aspect = ( float )this->width / this->height;
+				this->aspect_ratio = 1.0;
+				mlt_properties_set_double( this->properties, "aspect_ratio", this->aspect_ratio );
+			}
+			
+			// Set window size
+			this->window_width = this->width;
+			this->window_height = this->height;
 		}
 
-		// Default window size
-		this->window_width = (int)( (float)this->height * this->aspect_ratio ) + 1;
-		this->window_height = this->height;
-		
 		// Set the sdl flags
 		this->sdl_flags = SDL_HWSURFACE | SDL_ASYNCBLIT | SDL_HWACCEL | SDL_RESIZABLE;
 
@@ -145,8 +166,15 @@ int consumer_start( mlt_consumer parent )
 
 	if ( !this->running )
 	{
+		pthread_attr_t thread_attributes;
+		
 		this->running = 1;
-		pthread_create( &this->thread, NULL, consumer_thread, this );
+		
+		// Inherit the scheduling priority
+		pthread_attr_init( &thread_attributes );
+		pthread_attr_setinheritsched( &thread_attributes, PTHREAD_INHERIT_SCHED );
+	
+		pthread_create( &this->thread, &thread_attributes, consumer_thread, this );
 	}
 
 	return 0;
@@ -244,11 +272,9 @@ static int consumer_play_audio( consumer_sdl this, mlt_frame frame, int init_aud
 	mlt_audio_format afmt = mlt_audio_pcm;
 
 	// Set the preferred params of the test card signal
-	int channels = 2;
-	int frequency = 48000;
+	int channels = mlt_properties_get_int( properties, "channels" );
+	int frequency = mlt_properties_get_int( properties, "frequency" );
 	static int counter = 0;
-	if ( mlt_properties_get_int( properties, "frequency" ) != 0 )
-		frequency =  mlt_properties_get_int( properties, "frequency" );
 
 	int samples = mlt_sample_calculator( mlt_properties_get_double( this->properties, "fps" ), frequency, counter++ );
 	
@@ -261,6 +287,7 @@ static int consumer_play_audio( consumer_sdl this, mlt_frame frame, int init_aud
 	if ( mlt_properties_get_int( properties, "audio_off" ) )
 	{
 		this->playing = 1;
+		init_audio = 1;
 		return init_audio;
 	}
 
@@ -275,7 +302,7 @@ static int consumer_play_audio( consumer_sdl this, mlt_frame frame, int init_aud
 		request.freq = frequency;
 		request.format = AUDIO_S16;
 		request.channels = channels;
-		request.samples = 4096;
+		request.samples = 1024;
 		request.callback = sdl_fill_audio;
 		request.userdata = (void *)this;
 		if ( SDL_OpenAudio( &request, &got ) != 0 )
@@ -292,11 +319,11 @@ static int consumer_play_audio( consumer_sdl this, mlt_frame frame, int init_aud
 
 	if ( init_audio == 0 )
 	{
+		mlt_properties properties = mlt_frame_properties( frame );
 		bytes = ( samples * channels * 2 );
 		pthread_mutex_lock( &this->audio_mutex );
 		while ( bytes > ( sizeof( this->audio_buffer) - this->audio_avail ) )
 			pthread_cond_wait( &this->audio_cond, &this->audio_mutex );
-		mlt_properties properties = mlt_frame_properties( frame );
 		if ( mlt_properties_get_double( properties, "_speed" ) == 1 )
 			memcpy( &this->audio_buffer[ this->audio_avail ], pcm, bytes );
 		else
@@ -313,7 +340,7 @@ static int consumer_play_audio( consumer_sdl this, mlt_frame frame, int init_aud
 	return init_audio;
 }
 
-static int consumer_play_video( consumer_sdl this, mlt_frame frame, int64_t elapsed, int64_t playtime )
+static int consumer_play_video( consumer_sdl this, mlt_frame frame )
 {
 	// Get the properties of this consumer
 	mlt_properties properties = this->properties;
@@ -323,36 +350,11 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame, int64_t elap
 	uint8_t *image;
 	int changed = 0;
 
-	if ( mlt_properties_get_int( properties, "video_off" ) )
+	if ( mlt_properties_get_int( properties, "video_off" ) == 0 )
 	{
-		mlt_frame_close( frame );
-		return 0;
-	}
-
-	// Set skip
-	mlt_properties_set_position( mlt_frame_properties( frame ), "playtime", playtime );
-	mlt_properties_set_double( mlt_frame_properties( frame ), "consumer_scale", ( double )height / mlt_properties_get_double( properties, "height" ) );
-
-	// Push this frame to the back of the queue
-	mlt_deque_push_back( this->queue, frame );
-	frame = NULL;
-
-	if ( this->playing )
-		frame = mlt_deque_pop_front( this->queue );
-
-	if ( this->playing && frame != NULL && mlt_properties_get_int( mlt_frame_properties( frame ), "rendered" ) == 1 )
-	{
-		playtime = mlt_properties_get_position( mlt_frame_properties( frame ), "playtime" );
-
 		// Get the image, width and height
 		mlt_frame_get_image( frame, &image, &vfmt, &width, &height, 0 );
-
-		if ( playtime > elapsed + 20000 )
-		{
-			struct timespec tm = { ( playtime - elapsed ) / 1000000, ( ( playtime - elapsed ) % 1000000 ) * 1000 };
-			nanosleep( &tm, NULL );
-		}
-
+		
 		// Handle events
 		if ( this->sdl_screen != NULL )
 		{
@@ -369,6 +371,9 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame, int64_t elap
 						this->window_height = event.resize.h;
 						changed = 1;
 						break;
+					case SDL_QUIT:
+						this->running = 0;
+						break;
 					case SDL_KEYDOWN:
 						{
 							mlt_producer producer = mlt_properties_get_data( properties, "transport_producer", NULL );
@@ -394,40 +399,60 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame, int64_t elap
 
 		if ( this->sdl_screen == NULL || changed )
 		{
-			double aspect_ratio = mlt_frame_get_aspect_ratio( frame );
-			float display_aspect_ratio = (float)width / (float)height;
 			SDL_Rect rect;
+			
+			// Determine frame's display aspect ratio
+			float frame_aspect = mlt_frame_get_aspect_ratio( frame ) * this->width / this->height;
+			
+			// Determine window's new display aspect ratio
+			float this_aspect = ( float )this->window_width / this->window_height;
 
-			if ( mlt_properties_get_double( properties, "aspect_ratio" ) )
-				aspect_ratio = mlt_properties_get_double( properties, "aspect_ratio" );
-
-			if ( aspect_ratio == 1 )
+			// If using hardware scaler
+			if ( mlt_properties_get( properties, "rescale" ) != NULL &&
+				!strcmp( mlt_properties_get( properties, "rescale" ), "none" ) )
+			{
+				// Special case optimisation to negate odd effect of sample aspect ratio
+				// not corresponding exactly with image resolution.
+				if ( ( (int)( this_aspect * 1000 ) == (int)( this->display_aspect * 1000 ) ) && 
+					 ( (int)( mlt_frame_get_aspect_ratio( frame ) * 1000 ) == (int)( this->aspect_ratio * 1000 ) ) )
+				{
+					rect.w = this->window_width;
+					rect.h = this->window_height;
+				}
+				else
+				{
+					// Use hardware scaler to normalise display aspect ratio
+					rect.w = frame_aspect / this_aspect * this->window_width + 0.5;
+					rect.h = this->window_height;
+					if ( rect.w > this->window_width )
+					{
+						rect.w = this->window_width;
+						rect.h = this_aspect / frame_aspect * this->window_height + 0.5;
+					}
+				}
+			}
+			// Special case optimisation to negate odd effect of sample aspect ratio
+			// not corresponding exactly with image resolution.
+			else if ( (int)( this_aspect * 1000 ) == (int)( this->display_aspect * 1000 ) ) 
 			{
 				rect.w = this->window_width;
 				rect.h = this->window_height;
 			}
-			else if ( this->window_width < this->window_height * aspect_ratio )
+			// Use hardware scaler to normalise sample aspect ratio
+			else if ( this->window_height * frame_aspect > this->window_width )
 			{
 				rect.w = this->window_width;
-				rect.h = this->window_width / aspect_ratio;
+				rect.h = this->window_width / frame_aspect + 0.5;
 			}
 			else
 			{
-				rect.w = this->window_height * aspect_ratio;
+				rect.w = this->window_height * frame_aspect + 0.5;
 				rect.h = this->window_height;
 			}
-
-			if ( mlt_properties_get_int( properties, "scale_overlay" ) )
-			{
-				if ( ( float )rect.w * display_aspect_ratio < this->window_width )
-					rect.w = ( int )( ( float )rect.w * display_aspect_ratio );
-				else if ( ( float )rect.h * display_aspect_ratio < this->window_height )
-					rect.h = ( int )( ( float )rect.h * display_aspect_ratio );
-			}
-
+			
 			rect.x = ( this->window_width - rect.w ) / 2;
 			rect.y = ( this->window_height - rect.h ) / 2;
-
+			
 			// Force an overlay recreation
 			if ( this->sdl_overlay != NULL )
 				SDL_FreeYUVOverlay( this->sdl_overlay );
@@ -440,7 +465,7 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame, int64_t elap
 				SDL_SetClipRect( this->sdl_screen, &rect );
 			
 				sdl_lock_display();
-				this->sdl_overlay = SDL_CreateYUVOverlay( this->width - (this->width % 4), this->height- (this->height % 2 ), SDL_YUY2_OVERLAY, this->sdl_screen );
+				this->sdl_overlay = SDL_CreateYUVOverlay( this->width - (this->width % 4), this->height - (this->height % 2 ), SDL_YUY2_OVERLAY, this->sdl_screen );
 				sdl_unlock_display();
 			}
 		}
@@ -458,8 +483,7 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame, int64_t elap
 	}
 
 	// Close the frame
-	if ( frame != NULL )
-		mlt_frame_close( frame );
+	mlt_frame_close( frame );
 
 	return 0;
 }
@@ -484,6 +508,9 @@ static void *consumer_thread( void *arg )
 	int64_t elapsed = 0;
 	int duration = 0;
 	int64_t playtime = 0;
+	struct timespec tm;
+	mlt_frame next = NULL;
+	mlt_frame frame = NULL;
 
 	if ( SDL_Init( SDL_INIT_VIDEO | SDL_INIT_AUDIO | SDL_INIT_NOPARACHUTE ) < 0 )
 	{
@@ -498,7 +525,7 @@ static void *consumer_thread( void *arg )
 	while( this->running )
 	{
 		// Get a frame from the attached producer
-		mlt_frame frame = mlt_consumer_rt_frame( consumer, mlt_image_yuv422 );
+		frame = mlt_consumer_rt_frame( consumer );
 
 		// Ensure that we have a frame
 		if ( frame != NULL )
@@ -516,13 +543,53 @@ static void *consumer_thread( void *arg )
 					start = ( int64_t )now.tv_sec * 1000000 + now.tv_usec;
 				else
 					elapsed = ( ( int64_t )now.tv_sec * 1000000 + now.tv_usec) - start;
-
 			}
 
-			consumer_play_video( this, frame, elapsed, playtime );
+			// Set playtime for this frame
+			mlt_properties_set_position( mlt_frame_properties( frame ), "playtime", playtime );
+
+			// Push this frame to the back of the queue
+			mlt_deque_push_back( this->queue, frame );
 
+			// Calculate the next playtime
 			playtime += ( duration * 1000 );
 		}
+
+		if ( this->playing )
+		{
+			// Pop the next frame
+			next = mlt_deque_pop_front( this->queue );
+
+			// See if we have to delay the display of the current frame
+			if ( next != NULL && mlt_properties_get_int( mlt_frame_properties( next ), "rendered" ) == 1 )
+			{
+				mlt_position scheduled = mlt_properties_get_position( mlt_frame_properties( next ), "playtime" ) + 5000;
+				if ( scheduled > elapsed && mlt_deque_count( this->queue ) > 25 )
+				{
+					tm.tv_sec = ( scheduled - elapsed ) / 1000000;
+					tm.tv_nsec = ( ( scheduled - elapsed ) % 1000000 ) * 1000;
+					nanosleep( &tm, NULL );
+
+					// Show current frame
+					consumer_play_video( this, next );
+				}
+				else if ( scheduled > elapsed )
+				{
+					// More time to kill
+					mlt_deque_push_front( this->queue, next );
+				}
+				else
+				{
+					// Show current frame
+					consumer_play_video( this, next );
+				}
+			}
+			else
+			{
+				// This is an unrendered frame - just close it
+				mlt_frame_close( next );
+			}
+		}
 	}
 
 	// internal cleanup
@@ -601,4 +668,3 @@ static void consumer_close( mlt_consumer parent )
 	// Finally clean up this
 	free( this );
 }
-