X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fsdl%2Fconsumer_sdl_still.c;h=6ee1e94bb400e5805caf8566146d951f41f0e730;hb=eccf04749681f70957f34fdd6742224774e72d15;hp=ad83aa4567a8dd100cbec7545f9d8e0168140059;hpb=65e8ac86ee6e17a12892954ff4a8d46c4766fe0d;p=melted

diff --git a/src/modules/sdl/consumer_sdl_still.c b/src/modules/sdl/consumer_sdl_still.c
index ad83aa4..6ee1e94 100644
--- a/src/modules/sdl/consumer_sdl_still.c
+++ b/src/modules/sdl/consumer_sdl_still.c
@@ -111,15 +111,18 @@ mlt_consumer consumer_sdl_still_init( char *arg )
 			this->width = mlt_properties_get_int( this->properties, "width" );
 			this->height = mlt_properties_get_int( this->properties, "height" );
 		}
+		else
+		{
+			mlt_properties_set_int( this->properties, "width", this->width );
+			mlt_properties_set_int( this->properties, "height", this->height );
+		}
 
 		// Default window size
 		this->window_width = ( double )this->height * display_ratio;
 		this->window_height = this->height;
 
 		// Set the sdl flags
-		//this->sdl_flags = SDL_HWSURFACE | SDL_ASYNCBLIT | SDL_HWACCEL | SDL_RESIZABLE | SDL_DOUBLEBUF;
-		// Experimental settings
-		this->sdl_flags = SDL_RESIZABLE | SDL_DOUBLEBUF;
+		this->sdl_flags = SDL_HWSURFACE | SDL_ASYNCBLIT | SDL_HWACCEL | SDL_RESIZABLE | SDL_DOUBLEBUF;
 
 		// Allow thread to be started/stopped
 		parent->start = consumer_start;
@@ -152,6 +155,9 @@ static int consumer_start( mlt_consumer parent )
 
 	if ( !this->running )
 	{
+		int preview_off = mlt_properties_get_int( MLT_CONSUMER_PROPERTIES( parent ), "preview_off" );
+		int sdl_started = mlt_properties_get_int( MLT_CONSUMER_PROPERTIES( parent ), "sdl_started" );
+
 		// Attach a colour space converter
 		if ( !this->filtered )
 		{
@@ -169,13 +175,10 @@ static int consumer_start( mlt_consumer parent )
 		this->joined = 0;
 
 		// Allow the user to force resizing to window size
-		if ( mlt_properties_get_int( this->properties, "resize" ) )
-		{
-			mlt_properties_set_int( this->properties, "width", this->width );
-			mlt_properties_set_int( this->properties, "height", this->height );
-		}
+		this->width = mlt_properties_get_int( this->properties, "width" );
+		this->height = mlt_properties_get_int( this->properties, "height" );
 
-		if ( mlt_properties_get_int( MLT_CONSUMER_PROPERTIES( parent ), "sdl_started" ) == 0 )
+		if ( sdl_started == 0 && preview_off == 0 )
 		{
 			if ( SDL_Init( SDL_INIT_VIDEO | SDL_INIT_NOPARACHUTE ) < 0 )
 			{
@@ -186,17 +189,18 @@ static int consumer_start( mlt_consumer parent )
 			SDL_EnableKeyRepeat( SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL );
 			SDL_EnableUNICODE( 1 );
 		}
-		else
+		else if ( preview_off == 0 )
 		{
-			mlt_properties_set_int( MLT_CONSUMER_PROPERTIES( parent ), "changed", 2 );
 			if ( SDL_GetVideoSurface( ) != NULL )
 			{
 				this->sdl_screen = SDL_GetVideoSurface( );
 				consumer_get_dimensions( &this->window_width, &this->window_height );
-				mlt_properties_set_int( MLT_CONSUMER_PROPERTIES( parent ), "changed", 0 );
 			}
 		}
 
+		if ( this->sdl_screen == NULL && preview_off == 0 )
+			this->sdl_screen = SDL_SetVideoMode( this->window_width, this->window_height, 0, this->sdl_flags );
+
 		pthread_create( &this->thread, NULL, consumer_thread, this );
 	}
 
@@ -210,13 +214,16 @@ static int consumer_stop( mlt_consumer parent )
 
 	if ( this->joined == 0 )
 	{
+		int preview_off = mlt_properties_get_int( MLT_CONSUMER_PROPERTIES( parent ), "preview_off" );
+		int sdl_started = mlt_properties_get_int( MLT_CONSUMER_PROPERTIES( parent ), "sdl_started" );
+
 		// Kill the thread and clean up
 		this->running = 0;
 
 		pthread_join( this->thread, NULL );
 		this->joined = 1;
 
-		if ( mlt_properties_get_int( MLT_CONSUMER_PROPERTIES( parent ), "sdl_started" ) == 0 )
+		if ( sdl_started == 0 && preview_off == 0 )
 			SDL_Quit( );
 
 		this->sdl_screen = NULL;
@@ -420,20 +427,17 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame )
 		}
 	}
 
-	if ( this->sdl_screen == NULL || changed || mlt_properties_get_int( properties, "changed" ) == 2 )
+	if ( this->sdl_screen == NULL || changed )
 	{
 		// open SDL window 
 		this->sdl_screen = SDL_SetVideoMode( this->window_width, this->window_height, 0, this->sdl_flags );
 		if ( consumer_get_dimensions( &this->window_width, &this->window_height ) )
 			this->sdl_screen = SDL_SetVideoMode( this->window_width, this->window_height, 0, this->sdl_flags );
-
 		changed = 1;
-		mlt_properties_set_int( properties, "changed", 0 );
 	}
 	else
 	{
 		changed = 1;
-		mlt_properties_set_int( properties, "changed", 0 );
 	}
 
 	if ( changed == 0 &&
@@ -441,8 +445,7 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame )
 		 this->last_producer == mlt_properties_get_data( MLT_FRAME_PROPERTIES( frame ), "_producer", NULL ) )
 	{
 		sdl_unlock_display( );
-		if ( unlock != NULL )
-			unlock( );
+		if ( unlock != NULL ) unlock( );
 		return 0;
 	}
 
@@ -451,8 +454,8 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame )
 	this->last_producer = mlt_properties_get_data( MLT_FRAME_PROPERTIES( frame ), "_producer", NULL );
 
 	// Get the image, width and height
-	mlt_events_fire( properties, "consumer-frame-show", frame, NULL );
 	mlt_frame_get_image( frame, &image, &vfmt, &width, &height, 0 );
+	mlt_events_fire( properties, "consumer-frame-show", frame, NULL );
 
 	if ( image != NULL )
 	{
@@ -533,9 +536,22 @@ static void *consumer_thread( void *arg )
 
 	// Get the consumer
 	mlt_consumer consumer = &this->parent;
+	mlt_properties properties = MLT_CONSUMER_PROPERTIES( consumer );
 
 	// internal intialization
 	mlt_frame frame = NULL;
+	mlt_image_format vfmt = mlt_image_rgb24a;
+	int height = this->height;
+	int width = this->width;
+	uint8_t *image = NULL;
+
+	// Allow the hosting app to provide the preview
+	int preview_off = mlt_properties_get_int( properties, "preview_off" );
+	mlt_image_format preview_format = mlt_properties_get_int( properties, "preview_format" );
+
+	// Check if a specific colour space has been requested
+	if ( preview_off && preview_format != mlt_image_none )
+		vfmt = preview_format;
 
 	// Loop until told not to
 	while( this->running )
@@ -546,7 +562,16 @@ static void *consumer_thread( void *arg )
 		// Ensure that we have a frame
 		if ( this->running && frame != NULL )
 		{
-			consumer_play_video( this, frame );
+			if ( preview_off == 0 )
+			{
+				consumer_play_video( this, frame );
+			}
+			else
+			{
+				mlt_frame_get_image( frame, &image, &vfmt, &width, &height, 0 );
+				mlt_properties_set_int( MLT_FRAME_PROPERTIES( frame ), "format", vfmt );
+				mlt_events_fire( properties, "consumer-frame-show", frame, NULL );
+			}
 			mlt_frame_close( frame );
 		}
 		else