X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fsdl%2Fconsumer_sdl_preview.c;h=fc04af9a48a10dfe87eb13ffe1efc9aa06b52ce5;hb=65e8ac86ee6e17a12892954ff4a8d46c4766fe0d;hp=1d8494374aaa124013de413b7f6812b8684386ce;hpb=b41fc3efd457b709d4f9867273f6d0da8921b904;p=melted

diff --git a/src/modules/sdl/consumer_sdl_preview.c b/src/modules/sdl/consumer_sdl_preview.c
index 1d84943..fc04af9 100644
--- a/src/modules/sdl/consumer_sdl_preview.c
+++ b/src/modules/sdl/consumer_sdl_preview.c
@@ -135,19 +135,32 @@ static int consumer_start( mlt_consumer parent )
 
 	if ( !this->running )
 	{
-		pthread_attr_t thread_attributes;
-		
+		mlt_properties properties = MLT_CONSUMER_PROPERTIES( parent );
+		char *window_id = mlt_properties_get( properties, "window_id" );
+		char *audio_driver = mlt_properties_get( properties, "audio_driver" );
+
 		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 );
+		if ( window_id != NULL )
+			setenv( "SDL_WINDOWID", window_id, 1 );
+
+		if ( audio_driver != NULL )
+			setenv( "SDL_AUDIODRIVER", audio_driver, 1 );
+
+		if ( SDL_Init( SDL_INIT_VIDEO | SDL_INIT_NOPARACHUTE ) < 0 )
+		{
+			fprintf( stderr, "Failed to initialize SDL: %s\n", SDL_GetError() );
+			return -1;
+		}
+
+		SDL_EnableKeyRepeat( SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL );
+		SDL_EnableUNICODE( 1 );
 
-		pthread_create( &this->thread, &thread_attributes, consumer_thread, this );
+		pthread_create( &this->thread, NULL, consumer_thread, this );
 	}
 
 	return 0;
@@ -174,13 +187,12 @@ 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;
 
 		if ( app_locked && lock ) lock( );
+
+		SDL_Quit( );
 	}
 
 	return 0;
@@ -210,14 +222,7 @@ static void *consumer_thread( void *arg )
 	mlt_properties play = MLT_CONSUMER_PROPERTIES( this->play );
 	mlt_properties still = MLT_CONSUMER_PROPERTIES( this->still );
 
-	if ( SDL_Init( SDL_INIT_VIDEO | SDL_INIT_NOPARACHUTE ) < 0 )
-	{
-		fprintf( stderr, "Failed to initialize SDL: %s\n", SDL_GetError() );
-		return NULL;
-	}
-
-	SDL_EnableKeyRepeat( SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL );
-	SDL_EnableUNICODE( 1 );
+	int progressive = mlt_properties_get_int( properties, "progressive" ) | mlt_properties_get_int( properties, "deinterlace" );
 
 	// Inform child consumers that we control the sdl
 	mlt_properties_set_int( play, "sdl_started", 1 );
@@ -236,9 +241,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 +262,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,7 +271,7 @@ 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" );
@@ -351,7 +364,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 );
@@ -362,14 +375,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 );
-
-	//SDL_Quit( );
+	if ( this->play ) mlt_consumer_stop( this->play );
+	if ( this->still ) mlt_consumer_stop( this->still );
 
 	return NULL;
 }