X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fsdl%2Fconsumer_sdl.c;h=5879187205342eeeff77f9f88f256d2bda7d4afd;hb=ca2cd08a27aef250b116f3ea2d3b6729f9713933;hp=378a78b560e2c58727b6a6f0c46a0db5cf4beab4;hpb=65e8ac86ee6e17a12892954ff4a8d46c4766fe0d;p=melted

diff --git a/src/modules/sdl/consumer_sdl.c b/src/modules/sdl/consumer_sdl.c
index 378a78b..5879187 100644
--- a/src/modules/sdl/consumer_sdl.c
+++ b/src/modules/sdl/consumer_sdl.c
@@ -21,6 +21,8 @@
 #include "consumer_sdl.h"
 #include <framework/mlt_frame.h>
 #include <framework/mlt_deque.h>
+#include <framework/mlt_factory.h>
+#include <framework/mlt_filter.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -61,6 +63,7 @@ struct consumer_sdl_s
 	SDL_Rect rect;
 	uint8_t *buffer;
 	int bpp;
+	int filtered;
 };
 
 /** Forward references to static functions.
@@ -171,6 +174,12 @@ int consumer_start( mlt_consumer parent )
 
 	if ( !this->running )
 	{
+		int video_off = mlt_properties_get_int( MLT_CONSUMER_PROPERTIES( parent ), "video_off" );
+		int preview_off = mlt_properties_get_int( MLT_CONSUMER_PROPERTIES( parent ), "preview_off" );
+		int display_off = video_off | preview_off;
+		int audio_off = mlt_properties_get_int( MLT_CONSUMER_PROPERTIES( parent ), "audio_off" );
+		int sdl_started = mlt_properties_get_int( MLT_CONSUMER_PROPERTIES( parent ), "sdl_started" );
+
 		consumer_stop( parent );
 
 		this->running = 1;
@@ -181,7 +190,17 @@ int consumer_start( mlt_consumer parent )
 
 		this->bpp = mlt_properties_get_int( this->properties, "bpp" );
 
-		if ( mlt_properties_get_int( MLT_CONSUMER_PROPERTIES( parent ), "sdl_started" ) == 0 )
+		// Attach a colour space converter
+		if ( preview_off && !this->filtered )
+		{
+			mlt_filter filter = mlt_factory_filter( "avcolour_space", NULL );
+			mlt_properties_set_int( MLT_FILTER_PROPERTIES( filter ), "forced", mlt_image_yuv422 );
+			mlt_service_attach( MLT_CONSUMER_SERVICE( parent ), filter );
+			mlt_filter_close( filter );
+			this->filtered = 1;
+		}
+	
+		if ( sdl_started == 0 && display_off == 0 )
 		{
 			if ( SDL_Init( SDL_INIT_VIDEO | SDL_INIT_NOPARACHUTE ) < 0 )
 			{
@@ -192,19 +211,17 @@ int consumer_start( mlt_consumer parent )
 			SDL_EnableKeyRepeat( SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL );
 			SDL_EnableUNICODE( 1 );
 		}
-		else
+		else if ( display_off == 0 )
 		{
-			if ( SDL_GetVideoSurface( ) != NULL )
-			{
-				this->sdl_screen = SDL_GetVideoSurface( );
-				consumer_get_dimensions( &this->window_width, &this->window_height );
-				mlt_properties_set_int( this->properties, "changed", 0 );
-			}
+			this->sdl_screen = SDL_GetVideoSurface( );
 		}
 
-		if ( !mlt_properties_get_int( MLT_CONSUMER_PROPERTIES( parent ), "audio_off" ) )
+		if ( audio_off == 0 )
 			SDL_InitSubSystem( SDL_INIT_AUDIO );
 
+		if ( this->sdl_screen == NULL && display_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 );
 	}
 
@@ -229,7 +246,12 @@ int consumer_stop( mlt_consumer parent )
 		this->sdl_overlay = NULL;
 
 		if ( !mlt_properties_get_int( MLT_CONSUMER_PROPERTIES( parent ), "audio_off" ) )
+		{
+			pthread_mutex_lock( &this->audio_mutex );
+			pthread_cond_broadcast( &this->audio_cond );
+			pthread_mutex_unlock( &this->audio_mutex );
 			SDL_QuitSubSystem( SDL_INIT_AUDIO );
+		}
 
 		if ( mlt_properties_get_int( MLT_CONSUMER_PROPERTIES( parent ), "sdl_started" ) == 0 )
 			SDL_Quit( );
@@ -291,9 +313,6 @@ static void sdl_fill_audio( void *udata, uint8_t *stream, int len )
 		// Just to be safe, wipe the stream first
 		memset( stream, 0, len );
 
-		// Copy what we have into the stream
-		memcpy( stream, this->audio_buffer, this->audio_avail );
-
 		// Mix the audio 
 		SDL_MixAudio( stream, this->audio_buffer, len, ( int )( ( float )SDL_MIX_MAXVOLUME * volume ) );
 
@@ -345,7 +364,7 @@ static int consumer_play_audio( consumer_sdl this, mlt_frame frame, int init_aud
 		memset( &request, 0, sizeof( SDL_AudioSpec ) );
 		this->playing = 0;
 		request.freq = frequency;
-		request.format = AUDIO_S16;
+		request.format = AUDIO_S16SYS;
 		request.channels = channels;
 		request.samples = audio_buffer;
 		request.callback = sdl_fill_audio;
@@ -398,18 +417,26 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame )
 	uint8_t *image;
 	int changed = 0;
 
-	if ( this->running && mlt_properties_get_int( properties, "video_off" ) == 0 )
+	int video_off = mlt_properties_get_int( properties, "video_off" );
+	int preview_off = mlt_properties_get_int( properties, "preview_off" );
+	mlt_image_format preview_format = mlt_properties_get_int( properties, "preview_format" );
+	int display_off = video_off | preview_off;
+
+	if ( this->running && display_off == 0 )
 	{
 		// 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_properties_set_int( MLT_FRAME_PROPERTIES( frame ), "format", vfmt );
+		mlt_events_fire( properties, "consumer-frame-show", frame, NULL );
 		
 		// Handle events
 		if ( this->sdl_screen != NULL )
 		{
 			SDL_Event event;
 	
+			sdl_lock_display( );
 			changed = consumer_get_dimensions( &this->window_width, &this->window_height );
+			sdl_unlock_display( );
 
 			while ( SDL_PollEvent( &event ) )
 			{
@@ -441,6 +468,8 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame )
 			}
 		}
 	
+		sdl_lock_display();
+
 		if ( width != this->width || height != this->height )
 		{
 			if ( this->sdl_overlay != NULL )
@@ -456,21 +485,9 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame )
 			this->sdl_overlay = NULL;
 
 			// open SDL window with video overlay, if possible
-			sdl_lock_display();
 			this->sdl_screen = SDL_SetVideoMode( this->window_width, this->window_height, this->bpp, this->sdl_flags );
-			sdl_unlock_display();
 			if ( consumer_get_dimensions( &this->window_width, &this->window_height ) )
 				this->sdl_screen = SDL_SetVideoMode( this->window_width, this->window_height, this->bpp, this->sdl_flags );
-			//SDL_Flip( this->sdl_screen );
-			mlt_properties_set_int( properties, "changed", 0 );
-		}
-		else if ( mlt_properties_get_int( properties, "changed" ) )
-		{
-			sdl_lock_display();
-			this->sdl_screen = SDL_SetVideoMode( this->window_width, this->window_height, this->bpp, this->sdl_flags );
-			SDL_SetClipRect( this->sdl_screen, &this->rect );
-			sdl_unlock_display();
-			mlt_properties_set_int( properties, "changed", 0 );
 		}
 
 		if ( this->running )
@@ -522,6 +539,7 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame )
 			
 			this->rect.x = ( this->window_width - this->rect.w ) / 2;
 			this->rect.y = ( this->window_height - this->rect.h ) / 2;
+			this->rect.x -= this->rect.x % 2;
 
 			mlt_properties_set_int( this->properties, "rect_x", this->rect.x );
 			mlt_properties_set_int( this->properties, "rect_y", this->rect.y );
@@ -534,16 +552,12 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame )
 		if ( this->running && this->sdl_screen != NULL && this->sdl_overlay == NULL )
 		{
 			SDL_SetClipRect( this->sdl_screen, &this->rect );
-			SDL_Flip( this->sdl_screen );
-			sdl_lock_display();
 			this->sdl_overlay = SDL_CreateYUVOverlay( width, height, SDL_YUY2_OVERLAY, this->sdl_screen );
-			sdl_unlock_display();
 		}
 
 		if ( this->running && this->sdl_screen != NULL && this->sdl_overlay != NULL )
 		{
 			this->buffer = this->sdl_overlay->pixels[ 0 ];
-			sdl_lock_display();
 			if ( SDL_LockYUVOverlay( this->sdl_overlay ) >= 0 )
 			{
 				if ( image != NULL )
@@ -551,8 +565,17 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame )
 				SDL_UnlockYUVOverlay( this->sdl_overlay );
 				SDL_DisplayYUVOverlay( this->sdl_overlay, &this->sdl_screen->clip_rect );
 			}
-			sdl_unlock_display();
 		}
+
+		sdl_unlock_display();
+	}
+	else if ( this->running )
+	{
+		vfmt = preview_format == mlt_image_none ? mlt_image_rgb24a : preview_format;
+		if ( !video_off )
+			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 );
 	}
 
 	return 0;
@@ -660,6 +683,10 @@ static void *consumer_thread( void *arg )
 	// Get the consumer
 	mlt_consumer consumer = &this->parent;
 
+	// Convenience functionality
+	int terminate_on_pause = mlt_properties_get_int( MLT_CONSUMER_PROPERTIES( consumer ), "terminate_on_pause" );
+	int terminated = 0;
+
 	// Video thread
 	pthread_t thread;
 
@@ -673,11 +700,15 @@ static void *consumer_thread( void *arg )
 	struct timespec tm = { 0, 100000 };
 
 	// Loop until told not to
-	while( this->running )
+	while( !terminated && this->running )
 	{
 		// Get a frame from the attached producer
 		frame = mlt_consumer_rt_frame( consumer );
 
+		// Check for termination
+		if ( terminate_on_pause && frame != NULL )
+			terminated = mlt_properties_get_double( MLT_FRAME_PROPERTIES( frame ), "_speed" ) == 0.0;
+
 		// Ensure that we have a frame
 		if ( frame != NULL )
 		{
@@ -714,6 +745,8 @@ static void *consumer_thread( void *arg )
 		}
 	}
 
+	this->running = 0;
+
 	// Kill the video thread
 	if ( init_video == 0 )
 	{
@@ -727,7 +760,6 @@ static void *consumer_thread( void *arg )
 		mlt_frame_close( mlt_deque_pop_back( this->queue ) );
 
 	this->sdl_screen = NULL;
-	this->sdl_overlay = NULL;
 	this->audio_avail = 0;
 
 	return NULL;
@@ -744,7 +776,7 @@ static int consumer_get_dimensions( int *width, int *height )
 	SDL_VERSION( &wm.version );
 
 	// Lock the display
-	sdl_lock_display();
+	//sdl_lock_display();
 
 #ifndef __DARWIN__
 	// Get the wm structure
@@ -774,7 +806,7 @@ static int consumer_get_dimensions( int *width, int *height )
 #endif
 
 	// Unlock the display
-	sdl_unlock_display();
+	//sdl_unlock_display();
 
 	return changed;
 }