X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fsdl%2Fconsumer_sdl.c;h=50e08d85611741f911b59ade2bf14d9ad3698c39;hb=cab7cd53c3a4d9c4355751088fec61860dcabbce;hp=06171b9cfaab2f092e0573a38c428a68e6a7bafc;hpb=245af2ef6564488632b77c6e9018519ba134a320;p=melted

diff --git a/src/modules/sdl/consumer_sdl.c b/src/modules/sdl/consumer_sdl.c
index 06171b9..50e08d8 100644
--- a/src/modules/sdl/consumer_sdl.c
+++ b/src/modules/sdl/consumer_sdl.c
@@ -61,6 +61,7 @@ struct consumer_sdl_s
 	SDL_Overlay *sdl_overlay;
 	SDL_Rect rect;
 	uint8_t *buffer;
+	int bpp;
 };
 
 /** Forward references to static functions.
@@ -72,6 +73,7 @@ static int consumer_is_stopped( mlt_consumer parent );
 static void consumer_close( mlt_consumer parent );
 static void *consumer_thread( void * );
 static int consumer_get_dimensions( int *width, int *height );
+static void consumer_sdl_event( mlt_listener listener, mlt_properties owner, mlt_service this, void **args );
 
 /** This is what will be called by the factory - anything can be passed in
 	via the argument, but keep it simple.
@@ -95,8 +97,8 @@ mlt_consumer consumer_sdl_init( char *arg )
 		parent->close = consumer_close;
 
 		// get a handle on properties
-		mlt_service service = mlt_consumer_service( parent );
-		this->properties = mlt_service_properties( service );
+		mlt_service service = MLT_CONSUMER_SERVICE( parent );
+		this->properties = MLT_SERVICE_PROPERTIES( service );
 
 		// Set the default volume
 		mlt_properties_set_double( this->properties, "volume", 1.0 );
@@ -117,10 +119,13 @@ mlt_consumer consumer_sdl_init( char *arg )
 		mlt_properties_set_int( this->properties, "progressive", 0 );
 
 		// Default audio buffer
-		mlt_properties_set_int( this->properties, "audio_buffer", 1024 );
+		mlt_properties_set_int( this->properties, "audio_buffer", 512 );
 
 		// Get sample aspect ratio
 		this->aspect_ratio = mlt_properties_get_double( this->properties, "aspect_ratio" );
+
+		// Ensure we don't join on a non-running object
+		this->joined = 1;
 		
 		// Default display aspect ratio
 		this->display_aspect = 4.0 / 3.0;
@@ -130,27 +135,12 @@ mlt_consumer consumer_sdl_init( char *arg )
 		{
 			this->width = mlt_properties_get_int( this->properties, "width" );
 			this->height = mlt_properties_get_int( this->properties, "height" );
-			
-			// Default window size
-			this->window_width = ( float )this->height * this->display_aspect;
-			this->window_height = this->height;
-		}
-		else
-		{
-			if ( (int)( ( float )this->width / this->height * 1000 ) != 
-				 (int)( this->display_aspect * 1000 ) ) 
-			{
-				// Override these
-				this->display_aspect = ( float )this->width / this->height;
-				this->aspect_ratio = 1.0;
-				mlt_properties_set_double( this->properties, "aspect_ratio", this->aspect_ratio );
-			}
-			
-			// Set window size
-			this->window_width = this->width;
-			this->window_height = this->height;
 		}
 
+		// Default window size
+		this->window_width = ( float )this->height * this->display_aspect;
+		this->window_height = this->height;
+
 		// Set the sdl flags
 		this->sdl_flags = SDL_HWSURFACE | SDL_ASYNCBLIT | SDL_HWACCEL | SDL_RESIZABLE | SDL_DOUBLEBUF;
 
@@ -159,6 +149,9 @@ mlt_consumer consumer_sdl_init( char *arg )
 		parent->stop = consumer_stop;
 		parent->is_stopped = consumer_is_stopped;
 
+		// Register specific events
+		mlt_events_register( this->properties, "consumer-sdl-event", ( mlt_transmitter )consumer_sdl_event );
+
 		// Return the consumer produced
 		return parent;
 	}
@@ -170,6 +163,12 @@ mlt_consumer consumer_sdl_init( char *arg )
 	return NULL;
 }
 
+static void consumer_sdl_event( mlt_listener listener, mlt_properties owner, mlt_service this, void **args )
+{
+	if ( listener != NULL )
+		listener( owner, this, ( SDL_Event * )args[ 0 ] );
+}
+
 int consumer_start( mlt_consumer parent )
 {
 	consumer_sdl this = parent->child;
@@ -178,6 +177,8 @@ int consumer_start( mlt_consumer parent )
 	{
 		pthread_attr_t thread_attributes;
 		
+		consumer_stop( parent );
+
 		this->running = 1;
 		this->joined = 0;
 
@@ -206,14 +207,9 @@ int consumer_stop( mlt_consumer parent )
 	if ( this->joined == 0 )
 	{
 		// Kill the thread and clean up
+		this->joined = 1;
 		this->running = 0;
-
-		pthread_mutex_lock( &this->audio_mutex );
-		pthread_cond_broadcast( &this->audio_cond );
-		pthread_mutex_unlock( &this->audio_mutex );
-
 		pthread_join( this->thread, NULL );
-		this->joined = 1;
 	}
 
 	return 0;
@@ -340,7 +336,7 @@ static int consumer_play_audio( consumer_sdl this, mlt_frame frame, int init_aud
 
 	if ( init_audio == 0 )
 	{
-		mlt_properties properties = mlt_frame_properties( frame );
+		mlt_properties properties = MLT_FRAME_PROPERTIES( frame );
 		bytes = ( samples * channels * 2 );
 		pthread_mutex_lock( &this->audio_mutex );
 		while ( this->running && bytes > ( sizeof( this->audio_buffer) - this->audio_avail ) )
@@ -374,9 +370,10 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame )
 	uint8_t *image;
 	int changed = 0;
 
-	if ( mlt_properties_get_int( properties, "video_off" ) == 0 )
+	if ( this->running && mlt_properties_get_int( properties, "video_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 );
 		
 		// Handle events
@@ -385,9 +382,11 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame )
 			SDL_Event event;
 	
 			changed = consumer_get_dimensions( &this->window_width, &this->window_height );
-	
+
 			while ( SDL_PollEvent( &event ) )
 			{
+				mlt_events_fire( this->properties, "consumer-sdl-event", &event, NULL );
+
 				switch( event.type )
 				{
 					case SDL_VIDEORESIZE:
@@ -414,22 +413,48 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame )
 			}
 		}
 	
-		if ( width != this->width || height != this->height || this->last_frame_aspect != mlt_frame_get_aspect_ratio( frame ) )
+		if ( width != this->width || height != this->height )
 		{
-			this->width = width;
-			this->height = height;
-			this->last_frame_aspect = mlt_frame_get_aspect_ratio( frame );
-			changed = 1;
+			if ( this->sdl_overlay != NULL )
+				SDL_FreeYUVOverlay( this->sdl_overlay );
+			this->sdl_overlay = NULL;
 		}
 
-		if ( this->sdl_screen == NULL || changed )
+		if ( this->running && ( this->sdl_screen == NULL || changed ) )
+		{
+			// Force an overlay recreation
+			if ( this->sdl_overlay != NULL )
+				SDL_FreeYUVOverlay( this->sdl_overlay );
+			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 )
 		{
-			// Determine frame's display aspect ratio
-			float frame_aspect = mlt_frame_get_aspect_ratio( frame ) * this->width / this->height;
-			
 			// Determine window's new display aspect ratio
 			float this_aspect = ( float )this->window_width / this->window_height;
 
+			// Determine frame's display aspect ratio
+			float frame_aspect = mlt_frame_get_aspect_ratio( frame ) * width / height;
+			this->width = width;
+			this->height = height;
+
 			// If using hardware scaler
 			if ( mlt_properties_get( properties, "rescale" ) != NULL &&
 				!strcmp( mlt_properties_get( properties, "rescale" ), "none" ) )
@@ -480,36 +505,20 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame )
 			mlt_properties_set_int( this->properties, "rect_y", this->rect.y );
 			mlt_properties_set_int( this->properties, "rect_w", this->rect.w );
 			mlt_properties_set_int( this->properties, "rect_h", this->rect.h );
-			
-			// Force an overlay recreation
-			if ( this->sdl_overlay != NULL )
-				SDL_FreeYUVOverlay( this->sdl_overlay );
 
-			// open SDL window with video overlay, if possible
-			sdl_lock_display();
-			this->sdl_screen = SDL_SetVideoMode( this->window_width, this->window_height, 0, this->sdl_flags );
-			sdl_unlock_display();
-
-			if ( this->sdl_screen != NULL )
-			{
-				SDL_SetClipRect( this->sdl_screen, &this->rect );
-				sdl_lock_display();
-				this->sdl_overlay = SDL_CreateYUVOverlay( this->width, this->height, SDL_YUY2_OVERLAY, this->sdl_screen );
-				sdl_unlock_display();
-			}
+			SDL_SetClipRect( this->sdl_screen, &this->rect );
 		}
-			
-		if ( mlt_properties_get_int( properties, "changed" ) )
+
+		if ( this->running && this->sdl_screen != NULL && this->sdl_overlay == NULL )
 		{
-			sdl_lock_display();
-			this->sdl_screen = SDL_SetVideoMode( this->window_width, this->window_height, 0, this->sdl_flags );
 			SDL_SetClipRect( this->sdl_screen, &this->rect );
 			SDL_Flip( this->sdl_screen );
+			sdl_lock_display();
+			this->sdl_overlay = SDL_CreateYUVOverlay( this->width, this->height, SDL_YUY2_OVERLAY, this->sdl_screen );
 			sdl_unlock_display();
-			mlt_properties_set_int( properties, "changed", 0 );
 		}
 
-		if ( this->sdl_screen != NULL && this->sdl_overlay != NULL )
+		if ( this->running && this->sdl_screen != NULL && this->sdl_overlay != NULL )
 		{
 			this->buffer = this->sdl_overlay->pixels[ 0 ];
 			sdl_lock_display();
@@ -554,12 +563,18 @@ static void *video_thread( void *arg )
 	{
 		// Pop the next frame
 		pthread_mutex_lock( &this->video_mutex );
-		while ( ( next = mlt_deque_pop_front( this->queue ) ) == NULL && this->running )
+		next = mlt_deque_pop_front( this->queue );
+		while ( next == NULL && this->running )
+		{
 			pthread_cond_wait( &this->video_cond, &this->video_mutex );
+			next = mlt_deque_pop_front( this->queue );
+		}
 		pthread_mutex_unlock( &this->video_mutex );
 
+		if ( !this->running || next == NULL ) break;
+
 		// Get the properties
-		properties =  mlt_frame_properties( next );
+		properties =  MLT_FRAME_PROPERTIES( next );
 
 		// Get the speed of the frame
 		speed = mlt_properties_get_double( properties, "_speed" );
@@ -601,8 +616,12 @@ static void *video_thread( void *arg )
 
 		// This frame can now be closed
 		mlt_frame_close( next );
+		next = NULL;
 	}
 
+	if ( next != NULL )
+		mlt_frame_close( next );
+
 	mlt_consumer_stopped( &this->parent );
 
 	return NULL;
@@ -631,14 +650,31 @@ static void *consumer_thread( void *arg )
 	int64_t playtime = 0;
 	struct timespec tm = { 0, 100000 };
 
-	if ( SDL_Init( SDL_INIT_VIDEO | SDL_INIT_AUDIO | SDL_INIT_NOPARACHUTE ) < 0 )
+	this->bpp = mlt_properties_get_int( this->properties, "bpp" );
+
+	if ( mlt_properties_get_int( MLT_CONSUMER_PROPERTIES( consumer ), "sdl_started" ) == 0 )
+	{
+		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 );
+	}
+	else
 	{
-		fprintf( stderr, "Failed to initialize SDL: %s\n", SDL_GetError() );
-		return NULL;
+		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 );
+		}
 	}
 
-	SDL_EnableKeyRepeat( SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL );
-	SDL_EnableUNICODE( 1 );
+	if ( !mlt_properties_get_int( MLT_CONSUMER_PROPERTIES( consumer ), "audio_off" ) )
+		SDL_InitSubSystem( SDL_INIT_AUDIO );
 
 	// Loop until told not to
 	while( this->running )
@@ -650,7 +686,7 @@ static void *consumer_thread( void *arg )
 		if ( frame != NULL )
 		{
 			// Get the frame properties
-			properties =  mlt_frame_properties( frame );
+			properties =  MLT_FRAME_PROPERTIES( frame );
 
 			// Play audio
 			init_audio = consumer_play_audio( this, frame, init_audio, &duration );
@@ -694,7 +730,12 @@ static void *consumer_thread( void *arg )
 	// internal cleanup
 	if ( this->sdl_overlay != NULL )
 		SDL_FreeYUVOverlay( this->sdl_overlay );
-	SDL_Quit( );
+
+	if ( !mlt_properties_get_int( MLT_CONSUMER_PROPERTIES( consumer ), "audio_off" ) )
+		SDL_QuitSubSystem( SDL_INIT_AUDIO );
+
+	//if ( mlt_properties_get_int( MLT_CONSUMER_PROPERTIES( consumer ), "sdl_started" ) == 0 )
+		//SDL_Quit( );
 
 	while( mlt_deque_count( this->queue ) )
 		mlt_frame_close( mlt_deque_pop_back( this->queue ) );
@@ -759,7 +800,10 @@ static void consumer_close( mlt_consumer parent )
 	consumer_sdl this = parent->child;
 
 	// Stop the consumer
-	mlt_consumer_stop( parent );
+	///mlt_consumer_stop( parent );
+
+	// Now clean up the rest
+	mlt_consumer_close( parent );
 
 	// Close the queue
 	mlt_deque_close( this->queue );
@@ -768,9 +812,6 @@ static void consumer_close( mlt_consumer parent )
 	pthread_mutex_destroy( &this->audio_mutex );
 	pthread_cond_destroy( &this->audio_cond );
 		
-	// Now clean up the rest
-	mlt_consumer_close( parent );
-
 	// Finally clean up this
 	free( this );
 }