X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fsdl%2Fconsumer_sdl.c;h=3e5d28e51d13149827952bb952db638ba6b4af8b;hb=904efc28172abbb254d488735c83480c40c1b3b5;hp=3d4f53146de07a12156e911e9f3177ad8ac16e8e;hpb=abc466844ef298c20f1530c1f287de40445762a4;p=melted

diff --git a/src/modules/sdl/consumer_sdl.c b/src/modules/sdl/consumer_sdl.c
index 3d4f531..3e5d28e 100644
--- a/src/modules/sdl/consumer_sdl.c
+++ b/src/modules/sdl/consumer_sdl.c
@@ -98,35 +98,23 @@ mlt_consumer consumer_sdl_init( char *arg )
 		pthread_mutex_init( &this->audio_mutex, NULL );
 		pthread_cond_init( &this->audio_cond, NULL);
 		
-		// Default fps
-		mlt_properties_set_double( this->properties, "fps", 25 );
-
 		// Default scaler (for now we'll use nearest)
 		mlt_properties_set( this->properties, "rescale", "nearest" );
 
+		// Get aspect ratio
+		this->aspect_ratio = mlt_properties_get_double( this->properties, "aspect_ratio" );
+		
 		// process actual param
-		if ( arg == NULL || !strcmp( arg, "PAL" ) )
-		{
-			this->width = 720;
-			this->height = 576;
-		}
-		else if ( !strcmp( arg, "NTSC" ) )
+		if ( arg == NULL || sscanf( arg, "%dx%d", &this->width, &this->height ) != 2 )
 		{
-			this->width = 720;
-			this->height = 480;
-			mlt_properties_set_double( this->properties, "fps", 29.97 );
-		}
-		else if ( sscanf( arg, "%dx%d", &this->width, &this->height ) != 2 )
-		{
-			this->width = 720;
-			this->height = 576;
+			this->width = mlt_properties_get_int( this->properties, "width" );
+			this->height = mlt_properties_get_int( this->properties, "height" );
 		}
 
-		// Default window size and aspect ratio
-		this->aspect_ratio = 4.0 / 3.0;
+		// 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_DOUBLEBUF | SDL_HWACCEL | SDL_RESIZABLE;
 
@@ -345,9 +333,6 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame )
 	}
 	this->queue[ this->count ++ ] = frame;
 
-	if ( mlt_properties_get( properties, "rescale" ) != NULL )
-		mlt_properties_set( mlt_frame_properties( frame ), "rescale.interp", mlt_properties_get( properties, "rescale" ) );
-
 	if ( this->playing )
 	{
 		// We're working on the oldest frame now
@@ -475,7 +460,12 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame )
 		mlt_frame_close( frame );
 
 	if ( this->count )
+	{
+		// Tell the producers about our scale relative to the normalisation
+		mlt_properties_set_double( mlt_frame_properties( this->queue[ this->count - 1 ] ), "consumer_scale",
+			( double )height / mlt_properties_get_double( properties, "height" ) );
 		mlt_frame_get_image( this->queue[ this->count - 1 ], &image, &vfmt, &width, &height, 0 );
+	}
 
 	return 0;
 }
@@ -491,12 +481,6 @@ static void *consumer_thread( void *arg )
 	// Get the consumer
 	mlt_consumer consumer = &this->parent;
 
-	// Get the service assoicated to the consumer
-	mlt_service service = mlt_consumer_service( consumer );
-
-	// Define a frame pointer
-	mlt_frame frame;
-
 	// internal intialization
 	int init_audio = 1;
 
@@ -509,9 +493,16 @@ static void *consumer_thread( void *arg )
 	// Loop until told not to
 	while( this->running )
 	{
-		// Get a frame from the service (should never return anything other than 0)
-		if ( mlt_service_get_frame( service, &frame, 0 ) == 0 )
+		// Get a frame from the attached producer
+		mlt_frame frame = mlt_consumer_get_frame( consumer );
+
+		// Ensure that we have a frame
+		if ( frame != NULL )
 		{
+			// SDL adapts display aspect, but set this so pixel aspect can be normalised
+//			mlt_properties_set_double( mlt_frame_properties( frame ), "consumer_aspect_ratio",
+//				mlt_frame_get_aspect_ratio( frame ) );
+			
 			init_audio = consumer_play_audio( this, frame, init_audio );
 			consumer_play_video( this, frame );
 		}