X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fsdl%2Fconsumer_sdl_preview.c;h=295a2cd559f80b76e18a912f4acf06732915b454;hb=5941e41209b87a8ed26f273f170abbd484113938;hp=db2cc40206ec5c897eb953af587b48264aa6662d;hpb=8b9aa0d55d7a04ee7f98fa6f1c6209a6522ea28e;p=melted

diff --git a/src/modules/sdl/consumer_sdl_preview.c b/src/modules/sdl/consumer_sdl_preview.c
index db2cc40..295a2cd 100644
--- a/src/modules/sdl/consumer_sdl_preview.c
+++ b/src/modules/sdl/consumer_sdl_preview.c
@@ -135,19 +135,13 @@ static int consumer_start( mlt_consumer parent )
 
 	if ( !this->running )
 	{
-		pthread_attr_t thread_attributes;
-		
 		consumer_stop( parent );
 
 		this->running = 1;
 		this->joined = 0;
 		this->last_speed = 1;
 
-		// 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 );
+		pthread_create( &this->thread, NULL, consumer_thread, this );
 	}
 
 	return 0;
@@ -174,9 +168,6 @@ static int consumer_stop( mlt_consumer parent )
 		pthread_cond_broadcast( &this->refresh_cond );
 		pthread_mutex_unlock( &this->refresh_mutex );
 
-		if ( this->play ) mlt_consumer_stop( this->play );
-		if ( this->still ) mlt_consumer_stop( this->still );
-
 		pthread_join( this->thread, NULL );
 		this->joined = 1;
 
@@ -210,6 +201,8 @@ static void *consumer_thread( void *arg )
 	mlt_properties play = MLT_CONSUMER_PROPERTIES( this->play );
 	mlt_properties still = MLT_CONSUMER_PROPERTIES( this->still );
 
+	int progressive = mlt_properties_get_int( properties, "progressive" ) | mlt_properties_get_int( properties, "deinterlace" );
+
 	if ( SDL_Init( SDL_INIT_VIDEO | SDL_INIT_NOPARACHUTE ) < 0 )
 	{
 		fprintf( stderr, "Failed to initialize SDL: %s\n", SDL_GetError() );
@@ -236,9 +229,15 @@ static void *consumer_thread( void *arg )
 	mlt_properties_set_int( still, "width", mlt_properties_get_int( properties, "width" ) );
 	mlt_properties_set_int( play, "height", mlt_properties_get_int( properties, "height" ) );
 	mlt_properties_set_int( still, "height", mlt_properties_get_int( properties, "height" ) );
+	mlt_properties_set_double( play, "aspect_ratio", mlt_properties_get_double( properties, "aspect_ratio" ) );
+	mlt_properties_set_double( still, "aspect_ratio", mlt_properties_get_double( properties, "aspect_ratio" ) );
+	mlt_properties_set_double( play, "display_ratio", mlt_properties_get_double( properties, "display_ratio" ) );
+	mlt_properties_set_double( still, "display_ratio", mlt_properties_get_double( properties, "display_ratio" ) );
 
-	mlt_properties_set_int( play, "progressive", 1 );
-	mlt_properties_set_int( still, "progressive", 1 );
+	mlt_properties_set_int( play, "progressive", progressive );
+	mlt_properties_set_int( still, "progressive", progressive );
+	mlt_properties_set( play, "deinterlace_method", mlt_properties_get( properties, "deinterlace_method" ) );
+	mlt_properties_set( still, "deinterlace_method", mlt_properties_get( properties, "deinterlace_method" ) );
 
 	mlt_properties_pass( play, MLT_CONSUMER_PROPERTIES( consumer ), "play." );
 	mlt_properties_pass( still, MLT_CONSUMER_PROPERTIES( consumer ), "still." );
@@ -251,6 +250,8 @@ static void *consumer_thread( void *arg )
 	mlt_properties_set_int( play, "put_mode", 1 );
 	mlt_properties_set_int( still, "put_mode", 1 );
 
+	this->refresh_count = 0;
+
 	// Loop until told not to
 	while( this->running )
 	{
@@ -258,14 +259,11 @@ static void *consumer_thread( void *arg )
 		frame = mlt_consumer_get_frame( consumer );
 
 		// Ensure that we have a frame
-		if ( frame != NULL )
+		if ( this->running && frame != NULL )
 		{
 			// Get the speed of the frame
 			double speed = mlt_properties_get_double( MLT_FRAME_PROPERTIES( frame ), "_speed" );
 
-			// Determine which speed to use
-			double use_speed = speed;
-
 			// Lock during the operation
 			mlt_service_lock( MLT_CONSUMER_SERVICE( consumer ) );
 
@@ -311,13 +309,13 @@ static void *consumer_thread( void *arg )
 				mlt_consumer_put_frame( this->active, frame );
 			}
 			// If we aren't playing normally, then use the still
-			else if ( use_speed != 1 )
+			else if ( speed != 1 )
 			{
 				if ( !mlt_consumer_is_stopped( this->play ) )
 					mlt_consumer_stop( this->play );
 				if ( mlt_consumer_is_stopped( this->still ) )
 				{
-					this->last_speed = use_speed;
+					this->last_speed = speed;
 					this->active = this->still;
 					this->ignore_change = 0;
 					mlt_consumer_start( this->still );
@@ -331,7 +329,7 @@ static void *consumer_thread( void *arg )
 					mlt_consumer_stop( this->still );
 				if ( mlt_consumer_is_stopped( this->play ) )
 				{
-					this->last_speed = use_speed;
+					this->last_speed = speed;
 					this->active = this->play;
 					this->ignore_change = 25;
 					mlt_consumer_start( this->play );
@@ -354,7 +352,7 @@ static void *consumer_thread( void *arg )
 			if ( this->active == this->still )
 			{
 				pthread_mutex_lock( &this->refresh_mutex );
-				if ( speed == 0 && this->refresh_count <= 0 )
+				if ( this->running && speed == 0 && this->refresh_count <= 0 )
 					pthread_cond_wait( &this->refresh_cond, &this->refresh_mutex );
 				this->refresh_count --;
 				pthread_mutex_unlock( &this->refresh_mutex );
@@ -365,12 +363,14 @@ static void *consumer_thread( void *arg )
 		}
 		else
 		{
+			if ( frame ) mlt_frame_close( frame );
+			mlt_consumer_put_frame( this->active, NULL );
 			this->running = 0;
 		}
 	}
 
-	//mlt_consumer_stop( this->play );
-	//mlt_consumer_stop( this->still );
+	if ( this->play ) mlt_consumer_stop( this->play );
+	if ( this->still ) mlt_consumer_stop( this->still );
 
 	//SDL_Quit( );