X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fsdl%2Fconsumer_sdl.c;h=07f483fd7e903f5f68b8566077f8df512053d20d;hb=a59ccd047ab1fafc417e4f577e6c858442c348b8;hp=2d70b903d17be032987defdae4e240fd4da9f4e6;hpb=bbc63e064f2874ea16a4c8cf0e6331fb73f3ffb5;p=melted diff --git a/src/modules/sdl/consumer_sdl.c b/src/modules/sdl/consumer_sdl.c index 2d70b90..07f483f 100644 --- a/src/modules/sdl/consumer_sdl.c +++ b/src/modules/sdl/consumer_sdl.c @@ -20,12 +20,14 @@ #include "consumer_sdl.h" #include +#include #include #include #include #include #include #include +#include /** This classes definition. */ @@ -36,21 +38,36 @@ struct consumer_sdl_s { struct mlt_consumer_s parent; mlt_properties properties; - int format; - int video; + mlt_deque queue; pthread_t thread; int running; - uint8_t audio_buffer[ 4096 * 6 ]; + uint8_t audio_buffer[ 4096 * 10 ]; int audio_avail; pthread_mutex_t audio_mutex; pthread_cond_t audio_cond; + pthread_mutex_t video_mutex; + pthread_cond_t video_cond; int window_width; int window_height; + float aspect_ratio; + float display_aspect; + double last_frame_aspect; + int width; + int height; + int playing; + int sdl_flags; + SDL_Surface *sdl_screen; + SDL_Overlay *sdl_overlay; + SDL_Rect rect; + uint8_t *buffer; }; /** Forward references to static functions. */ +static int consumer_start( mlt_consumer parent ); +static int consumer_stop( mlt_consumer parent ); +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 ); @@ -59,7 +76,7 @@ static int consumer_get_dimensions( int *width, int *height ); via the argument, but keep it simple. */ -mlt_consumer consumer_sdl_init( void *dummy ) +mlt_consumer consumer_sdl_init( char *arg ) { // Create the consumer object consumer_sdl this = calloc( sizeof( struct consumer_sdl_s ), 1 ); @@ -67,6 +84,9 @@ mlt_consumer consumer_sdl_init( void *dummy ) // If no malloc'd and consumer init ok if ( this != NULL && mlt_consumer_init( &this->parent, this ) == 0 ) { + // Create the queue + this->queue = mlt_deque_init( ); + // Get the parent consumer object mlt_consumer parent = &this->parent; @@ -81,14 +101,62 @@ mlt_consumer consumer_sdl_init( void *dummy ) mlt_properties_set_double( this->properties, "volume", 1.0 ); // This is the initialisation of the consumer - this->running = 1; pthread_mutex_init( &this->audio_mutex, NULL ); pthread_cond_init( &this->audio_cond, NULL); + pthread_mutex_init( &this->video_mutex, NULL ); + pthread_cond_init( &this->video_cond, NULL); + + // Default scaler (for now we'll use nearest) + mlt_properties_set( this->properties, "rescale", "nearest" ); + + // Default buffer for low latency + mlt_properties_set_int( this->properties, "buffer", 1 ); + + // Default progressive true + mlt_properties_set_int( this->properties, "progressive", 0 ); + + // Default audio buffer + mlt_properties_set_int( this->properties, "audio_buffer", 1024 ); + + // Get sample aspect ratio + this->aspect_ratio = mlt_properties_get_double( this->properties, "aspect_ratio" ); - // TODO: process actual param + // Default display aspect ratio + this->display_aspect = 4.0 / 3.0; - // Create the the thread - pthread_create( &this->thread, NULL, consumer_thread, this ); + // process actual param + if ( arg == NULL || sscanf( arg, "%dx%d", &this->width, &this->height ) != 2 ) + { + 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 + 0.5; + 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; + } + + // Set the sdl flags + this->sdl_flags = SDL_HWSURFACE | SDL_ASYNCBLIT | SDL_HWACCEL | SDL_RESIZABLE | SDL_DOUBLEBUF; + + // Allow thread to be started/stopped + parent->start = consumer_start; + parent->stop = consumer_stop; + parent->is_stopped = consumer_is_stopped; // Return the consumer produced return parent; @@ -101,6 +169,59 @@ mlt_consumer consumer_sdl_init( void *dummy ) return NULL; } +int consumer_start( mlt_consumer parent ) +{ + consumer_sdl this = parent->child; + + if ( !this->running ) + { + pthread_attr_t thread_attributes; + + this->running = 1; + + // 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 ); + } + + // 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 ); + } + + return 0; +} + +int consumer_stop( mlt_consumer parent ) +{ + // Get the actual object + consumer_sdl this = parent->child; + + if ( this->running ) + { + // Kill the thread and clean up + 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 ); + } + + return 0; +} + +int consumer_is_stopped( mlt_consumer parent ) +{ + consumer_sdl this = parent->child; + return !this->running; +} + static int sdl_lock_display( ) { SDL_Surface *screen = SDL_GetVideoSurface( ); @@ -114,7 +235,7 @@ static void sdl_unlock_display( ) SDL_UnlockSurface( screen ); } -void sdl_fill_audio( void *udata, uint8_t *stream, int len ) +static void sdl_fill_audio( void *udata, uint8_t *stream, int len ) { consumer_sdl this = udata; @@ -123,14 +244,14 @@ void sdl_fill_audio( void *udata, uint8_t *stream, int len ) pthread_mutex_lock( &this->audio_mutex ); - // Experimental - block until audio received + // Block until audio received while ( this->running && len > this->audio_avail ) pthread_cond_wait( &this->audio_cond, &this->audio_mutex ); if ( this->audio_avail >= len ) { // Place in the audio buffer - SDL_MixAudio( stream, this->audio_buffer, len, ( int )( ( float )SDL_MIX_MAXVOLUME * volume ) ); + memcpy( stream, this->audio_buffer, len ); // Remove len from the audio available this->audio_avail -= len; @@ -152,185 +273,416 @@ void sdl_fill_audio( void *udata, uint8_t *stream, int len ) // No audio left this->audio_avail = 0; } + + // We're definitely playing now + this->playing = 1; + pthread_cond_broadcast( &this->audio_cond ); pthread_mutex_unlock( &this->audio_mutex ); } -/** Threaded wrapper for pipe. -*/ - -static void *consumer_thread( void *arg ) +static int consumer_play_audio( consumer_sdl this, mlt_frame frame, int init_audio, int *duration ) { - // Identify the arg - consumer_sdl this = arg; + // Get the properties of this consumer + mlt_properties properties = this->properties; + mlt_audio_format afmt = mlt_audio_pcm; - // Get the consumer - mlt_consumer consumer = &this->parent; + // Set the preferred params of the test card signal + int channels = mlt_properties_get_int( properties, "channels" ); + int frequency = mlt_properties_get_int( properties, "frequency" ); + static int counter = 0; - // Get the service assoicated to the consumer - mlt_service service = mlt_consumer_service( consumer ); - - // Define a frame pointer - mlt_frame frame; - - // internal intialization - int sdl_flags = SDL_HWSURFACE | SDL_DOUBLEBUF | SDL_HWACCEL | SDL_RESIZABLE; - SDL_Surface *sdl_screen = NULL; - SDL_Overlay *sdl_overlay = NULL; - uint8_t *buffer = NULL; - int init_audio = 1; + int samples = mlt_sample_calculator( mlt_properties_get_double( this->properties, "fps" ), frequency, counter++ ); + + int16_t *pcm; int bytes; - if ( SDL_Init( SDL_INIT_VIDEO | SDL_INIT_AUDIO | SDL_INIT_NOPARACHUTE ) < 0 ) + mlt_frame_get_audio( frame, &pcm, &afmt, &frequency, &channels, &samples ); + *duration = ( ( samples * 1000 ) / frequency ); + + if ( mlt_properties_get_int( properties, "audio_off" ) ) { - fprintf( stderr, "Failed to initialize SDL: %s\n", SDL_GetError() ); - return NULL; + this->playing = 1; + init_audio = 1; + return init_audio; } - - // Loop until told not to - while( this->running ) + + if ( init_audio == 1 ) { - // Get a frame from the service (should never return anything other than 0) - if ( mlt_service_get_frame( service, &frame, 0 ) == 0 ) + SDL_AudioSpec request; + SDL_AudioSpec got; + + int audio_buffer = mlt_properties_get_int( properties, "audio_buffer" ); + + // specify audio format + memset( &request, 0, sizeof( SDL_AudioSpec ) ); + this->playing = 0; + request.freq = frequency; + request.format = AUDIO_S16; + request.channels = channels; + request.samples = audio_buffer; + request.callback = sdl_fill_audio; + request.userdata = (void *)this; + if ( SDL_OpenAudio( &request, &got ) != 0 ) { - mlt_image_format vfmt = mlt_image_yuv422; - int width, height; - uint8_t *image; - - mlt_audio_format afmt = mlt_audio_pcm; - int channels; - int samples; - int frequency; - int16_t *pcm; - int changed = 0; - - mlt_frame_get_audio( frame, &pcm, &afmt, &frequency, &channels, &samples ); - if ( init_audio == 1 ) - { - SDL_AudioSpec request; - - // specify audio format - request.freq = frequency; - request.format = AUDIO_S16; - request.channels = channels; - request.samples = 1024; - request.callback = sdl_fill_audio; - request.userdata = (void *)this; - if ( SDL_OpenAudio( &request, NULL ) < 0 ) - { - fprintf( stderr, "SDL failed to open audio: %s\n", SDL_GetError() ); - break; - } - SDL_PauseAudio( 0 ); - init_audio = 0; - } - bytes = ( samples * channels * 2 ); - pthread_mutex_lock( &this->audio_mutex ); - while ( bytes > ( sizeof( this->audio_buffer) - this->audio_avail ) ) - pthread_cond_wait( &this->audio_cond, &this->audio_mutex ); + fprintf( stderr, "SDL failed to open audio: %s\n", SDL_GetError() ); + init_audio = 2; + } + else if ( got.size != 0 ) + { + SDL_PauseAudio( 0 ); + init_audio = 0; + } + } + + if ( init_audio == 0 ) + { + mlt_properties properties = mlt_frame_properties( frame ); + bytes = ( samples * channels * 2 ); + pthread_mutex_lock( &this->audio_mutex ); + while ( bytes > ( sizeof( this->audio_buffer) - this->audio_avail ) ) + pthread_cond_wait( &this->audio_cond, &this->audio_mutex ); + if ( mlt_properties_get_double( properties, "_speed" ) == 1 ) memcpy( &this->audio_buffer[ this->audio_avail ], pcm, bytes ); - this->audio_avail += bytes; - pthread_cond_broadcast( &this->audio_cond ); - pthread_mutex_unlock( &this->audio_mutex ); + else + memset( &this->audio_buffer[ this->audio_avail ], 0, bytes ); + this->audio_avail += bytes; + pthread_cond_broadcast( &this->audio_cond ); + pthread_mutex_unlock( &this->audio_mutex ); + } + else + { + this->playing = 1; + } - // Get the image, width and height - mlt_frame_get_image( frame, &image, &vfmt, &width, &height, 0 ); + return init_audio; +} - if ( sdl_screen != NULL ) - { - SDL_Event event; +static int consumer_play_video( consumer_sdl this, mlt_frame frame ) +{ + // Get the properties of this consumer + mlt_properties properties = this->properties; - changed = consumer_get_dimensions( &this->window_width, &this->window_height ); + mlt_image_format vfmt = mlt_image_yuv422; + int width = this->width, height = this->height; + uint8_t *image; + int changed = 0; - while ( SDL_PollEvent( &event ) ) + if ( mlt_properties_get_int( properties, "video_off" ) == 0 ) + { + // Get the image, width and height + mlt_frame_get_image( frame, &image, &vfmt, &width, &height, 0 ); + + // Handle events + if ( this->sdl_screen != NULL ) + { + SDL_Event event; + + changed = consumer_get_dimensions( &this->window_width, &this->window_height ); + + while ( SDL_PollEvent( &event ) ) + { + switch( event.type ) { - switch( event.type ) - { - case SDL_VIDEORESIZE: - this->window_width = event.resize.w; - this->window_height = event.resize.h; - changed = 1; - break; - } + case SDL_VIDEORESIZE: + this->window_width = event.resize.w; + this->window_height = event.resize.h; + changed = 1; + break; + case SDL_QUIT: + this->running = 0; + break; + case SDL_KEYDOWN: + { + mlt_producer producer = mlt_properties_get_data( properties, "transport_producer", NULL ); + char keyboard[ 2 ] = " "; + void (*callback)( mlt_producer, char * ) = mlt_properties_get_data( properties, "transport_callback", NULL ); + if ( callback != NULL && producer != NULL && event.key.keysym.unicode < 0x80 && event.key.keysym.unicode > 0 ) + { + keyboard[ 0 ] = ( char )event.key.keysym.unicode; + callback( producer, keyboard ); + } + } + break; } } + } + + if ( width != this->width || height != this->height || this->last_frame_aspect != mlt_frame_get_aspect_ratio( frame ) ) + { + this->width = width; + this->height = height; + this->last_frame_aspect = mlt_frame_get_aspect_ratio( frame ); + changed = 1; + } - if ( sdl_screen == NULL || changed ) - { - double aspect_ratio = mlt_frame_get_aspect_ratio( frame ); + if ( this->sdl_screen == NULL || changed ) + { + // 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; - if ( this->window_width == 0 || this->window_height == 0 ) + // If using hardware scaler + if ( mlt_properties_get( properties, "rescale" ) != NULL && + !strcmp( mlt_properties_get( properties, "rescale" ), "none" ) ) + { + // Special case optimisation to negate odd effect of sample aspect ratio + // not corresponding exactly with image resolution. + if ( ( (int)( this_aspect * 1000 ) == (int)( this->display_aspect * 1000 ) ) && + ( (int)( mlt_frame_get_aspect_ratio( frame ) * 1000 ) == (int)( this->aspect_ratio * 1000 ) ) ) { - this->window_width = width; - this->window_height = height; + this->rect.w = this->window_width; + this->rect.h = this->window_height; } - - // open SDL window with video overlay, if possible - sdl_screen = SDL_SetVideoMode( this->window_width, this->window_height, 0, sdl_flags ); - - if ( sdl_screen != NULL ) + else { - SDL_Rect rect; - if ( this->window_width < this->window_height * aspect_ratio ) - { - rect.w = this->window_width; - rect.h = this->window_width / aspect_ratio; - } - else + // Use hardware scaler to normalise display aspect ratio + this->rect.w = frame_aspect / this_aspect * this->window_width; + this->rect.h = this->window_height; + if ( this->rect.w > this->window_width ) { - rect.w = this->window_height * aspect_ratio; - rect.h = this->window_height; + this->rect.w = this->window_width; + this->rect.h = this_aspect / frame_aspect * this->window_height + 0.5; } - - rect.x = ( this->window_width - rect.w ) / 2; - rect.y = ( this->window_height - rect.h ) / 2; - - SDL_SetClipRect( sdl_screen, &rect ); - - // Force an overlay recreation - if ( sdl_overlay != NULL ) - SDL_FreeYUVOverlay( sdl_overlay ); - sdl_lock_display(); - sdl_overlay = SDL_CreateYUVOverlay( width, height, SDL_YUY2_OVERLAY, sdl_screen ); - sdl_unlock_display(); } } - - if ( sdl_screen != NULL && sdl_overlay != NULL ) + // Special case optimisation to negate odd effect of sample aspect ratio + // not corresponding exactly with image resolution. + else if ( (int)( this_aspect * 1000 ) == (int)( this->display_aspect * 1000 ) ) { - buffer = sdl_overlay->pixels[ 0 ]; - if ( sdl_lock_display() ) - { - if ( SDL_LockYUVOverlay( sdl_overlay ) >= 0 ) - { - memcpy( buffer, image, width * height * 2 ); - SDL_UnlockYUVOverlay( sdl_overlay ); - SDL_DisplayYUVOverlay( sdl_overlay, &sdl_screen->clip_rect ); - } - sdl_unlock_display(); - } + this->rect.w = this->window_width; + this->rect.h = this->window_height; + } + // Use hardware scaler to normalise sample aspect ratio + else if ( this->window_height * this->display_aspect > this->window_width ) + { + this->rect.w = this->window_width; + this->rect.h = this->window_width / this->display_aspect + 0.5; } else { - // TODO: allocate buffer? + this->rect.w = this->window_height * this->display_aspect + 0.5; + this->rect.h = this->window_height; } + + this->rect.x = ( this->window_width - this->rect.w ) / 2; + this->rect.y = ( this->window_height - this->rect.h ) / 2; + + // Force an overlay recreation + if ( this->sdl_overlay != NULL ) + SDL_FreeYUVOverlay( this->sdl_overlay ); - // Close the frame - mlt_frame_close( frame ); + // 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(); + } } - else + + if ( mlt_properties_get_int( properties, "changed" ) ) + { + 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_unlock_display(); + mlt_properties_set_int( properties, "changed", 0 ); + } + + if ( 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 ) + memcpy( this->buffer, image, width * height * 2 ); + SDL_UnlockYUVOverlay( this->sdl_overlay ); + SDL_DisplayYUVOverlay( this->sdl_overlay, &this->sdl_screen->clip_rect ); + } + sdl_unlock_display(); + } + } + + return 0; +} + +static void *video_thread( void *arg ) +{ + // Identify the arg + consumer_sdl this = arg; + + // Obtain time of thread start + struct timeval now; + int64_t start = 0; + int64_t elapsed = 0; + struct timespec tm; + mlt_frame next = NULL; + mlt_properties properties = NULL; + double speed = 0; + + // Get the current time + gettimeofday( &now, NULL ); + + // Determine start time + start = ( int64_t )now.tv_sec * 1000000 + now.tv_usec; + + while ( this->running ) + { + // Pop the next frame + pthread_mutex_lock( &this->video_mutex ); + while ( ( next = mlt_deque_pop_front( this->queue ) ) == NULL && this->running ) + pthread_cond_wait( &this->video_cond, &this->video_mutex ); + pthread_mutex_unlock( &this->video_mutex ); + + // Get the properties + properties = mlt_frame_properties( next ); + + // Get the speed of the frame + speed = mlt_properties_get_double( properties, "_speed" ); + + // Get the current time + gettimeofday( &now, NULL ); + + // Get the elapsed time + elapsed = ( ( int64_t )now.tv_sec * 1000000 + now.tv_usec ) - start; + + // See if we have to delay the display of the current frame + if ( mlt_properties_get_int( properties, "rendered" ) == 1 && this->running ) { - break; + // Obtain the scheduled playout time + mlt_position scheduled = mlt_properties_get_position( properties, "playtime" ); + + // Determine the difference between the elapsed time and the scheduled playout time + mlt_position difference = scheduled - elapsed; + + // Smooth playback a bit + if ( difference > 20000 && speed == 1.0 ) + { + tm.tv_sec = difference / 1000000; + tm.tv_nsec = ( difference % 1000000 ) * 500; + nanosleep( &tm, NULL ); + } + + // Show current frame if not too old + if ( difference > -10000 || speed != 1.0 || mlt_deque_count( this->queue ) < 2 ) + consumer_play_video( this, next ); + + // If the queue is empty, recalculate start to allow build up again + if ( mlt_deque_count( this->queue ) == 0 && speed == 1.0 ) + { + gettimeofday( &now, NULL ); + start = ( ( int64_t )now.tv_sec * 1000000 + now.tv_usec ) - scheduled + 20000; + } } - } // while + + // This frame can now be closed + mlt_frame_close( next ); + } + + return NULL; +} + +/** Threaded wrapper for pipe. +*/ + +static void *consumer_thread( void *arg ) +{ + // Identify the arg + consumer_sdl this = arg; + + // Get the consumer + mlt_consumer consumer = &this->parent; + + // Video thread + pthread_t thread; + + // internal intialization + int init_audio = 1; + int init_video = 1; + mlt_frame frame = NULL; + mlt_properties properties = NULL; + int duration = 0; + int64_t playtime = 0; + + if ( SDL_Init( SDL_INIT_VIDEO | SDL_INIT_AUDIO | 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 ); + + // Loop until told not to + while( this->running ) + { + // Get a frame from the attached producer + frame = mlt_consumer_rt_frame( consumer ); + + // Ensure that we have a frame + if ( frame != NULL ) + { + // Get the frame properties + properties = mlt_frame_properties( frame ); + + // Play audio + init_audio = consumer_play_audio( this, frame, init_audio, &duration ); + + // Determine the start time now + if ( this->playing && init_video ) + { + // Create the video thread + pthread_create( &thread, NULL, video_thread, this ); + + // Video doesn't need to be initialised any more + init_video = 0; + } + + // Set playtime for this frame + mlt_properties_set_position( properties, "playtime", playtime ); + + // Push this frame to the back of the queue + pthread_mutex_lock( &this->video_mutex ); + mlt_deque_push_back( this->queue, frame ); + pthread_cond_broadcast( &this->video_cond ); + pthread_mutex_unlock( &this->video_mutex ); + + // Calculate the next playtime + playtime += ( duration * 1000 ); + } + } + + // Kill the video thread + if ( init_video == 0 ) + { + pthread_mutex_lock( &this->video_mutex ); + pthread_cond_broadcast( &this->video_cond ); + pthread_mutex_unlock( &this->video_mutex ); + pthread_join( thread, NULL ); + } // internal cleanup - if ( init_audio == 0 ) - SDL_AudioQuit( ); - if ( sdl_overlay != NULL ) - SDL_FreeYUVOverlay( sdl_overlay ); + if ( this->sdl_overlay != NULL ) + SDL_FreeYUVOverlay( this->sdl_overlay ); SDL_Quit( ); + while( mlt_deque_count( this->queue ) ) + mlt_frame_close( mlt_deque_pop_back( this->queue ) ); + + this->sdl_screen = NULL; + this->sdl_overlay = NULL; + this->audio_avail = 0; + return NULL; } @@ -344,6 +696,9 @@ static int consumer_get_dimensions( int *width, int *height ) // Specify the SDL Version SDL_VERSION( &wm.version ); + // Lock the display + sdl_lock_display(); + // Get the wm structure if ( SDL_GetWMInfo( &wm ) == 1 ) { @@ -369,6 +724,9 @@ static int consumer_get_dimensions( int *width, int *height ) } } + // Unlock the display + sdl_lock_display(); + return changed; } @@ -380,22 +738,19 @@ static void consumer_close( mlt_consumer parent ) // Get the actual object consumer_sdl this = parent->child; - // Kill the thread and clean up - this->running = 0; + // Stop the consumer + mlt_consumer_stop( parent ); - pthread_mutex_lock( &this->audio_mutex ); - pthread_cond_broadcast( &this->audio_cond ); - pthread_mutex_unlock( &this->audio_mutex ); + // Close the queue + mlt_deque_close( this->queue ); - pthread_join( this->thread, NULL ); + // Destroy mutexes pthread_mutex_destroy( &this->audio_mutex ); pthread_cond_destroy( &this->audio_cond ); - // Now clean up the rest (the close = NULL is a bit nasty but needed for now) - parent->close = NULL; + // Now clean up the rest mlt_consumer_close( parent ); // Finally clean up this free( this ); } -