X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmodules%2Fsdl%2Fconsumer_sdl.c;h=adc60b42cd1b64fff011aa743372b885ea0b7836;hb=ae748aa4403b44430bbf57b49aa6f386f15d8407;hp=e56d56c71294fa63bbf87041e2c64a9989f37094;hpb=7c518e80321a87a22d2e48835442c9f5b70dcd17;p=mlt diff --git a/src/modules/sdl/consumer_sdl.c b/src/modules/sdl/consumer_sdl.c index e56d56c7..adc60b42 100644 --- a/src/modules/sdl/consumer_sdl.c +++ b/src/modules/sdl/consumer_sdl.c @@ -20,12 +20,21 @@ #include "consumer_sdl.h" #include +#include #include #include #include #include #include #include +#include + +#ifdef __DARWIN__ +# include "consumer_sdl_osx_hack.h" +# import +# import +#endif + /** This classes definition. */ @@ -36,35 +45,41 @@ struct consumer_sdl_s { struct mlt_consumer_s parent; mlt_properties properties; - int format; - int video; + mlt_deque queue; pthread_t thread; + int joined; int running; - uint8_t audio_buffer[ 4096 * 3 ]; + 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; + int previous_width; + int previous_height; int width; int height; int playing; - mlt_frame *queue; - int size; - int count; int sdl_flags; SDL_Surface *sdl_screen; SDL_Overlay *sdl_overlay; + SDL_Rect rect; uint8_t *buffer; + int bpp; }; /** 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 ); +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. @@ -72,12 +87,25 @@ static int consumer_get_dimensions( int *width, int *height ); mlt_consumer consumer_sdl_init( char *arg ) { +#ifdef __DARWIN__ + // Initialize Cocoa + NSApplicationLoad(); + [NSApplication sharedApplication]; + + // Spawn a fake thread so that cocoa knows to be multithreaded + DummyThread *dummy = [[DummyThread alloc] init]; + [NSThread detachNewThreadSelector:@selector(startThread:) toTarget:dummy withObject:nil]; +#endif + // Create the consumer object consumer_sdl this = calloc( sizeof( struct consumer_sdl_s ), 1 ); // 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; @@ -85,48 +113,57 @@ 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 ); + // Default display aspect ratio + double display_ratio = mlt_properties_get_double( this->properties, "display_ratio" ); + // Set the default volume 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 fps - mlt_properties_set_double( this->properties, "fps", 25 ); + // 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", 512 ); + + // Ensure we don't join on a non-running object + this->joined = 1; + // process actual param - if ( arg == NULL || !strcmp( arg, "PAL" ) ) - { - this->width = 720; - this->height = 576; - } - else if ( !strcmp( arg, "NTSC" ) ) + if ( arg == NULL || sscanf( arg, "%dx%d", &this->width, &this->height ) != 2 ) { - this->width = 720; - this->height = 480; - mlt_properties_set_double( this->properties, "fps", 29.97 ); - } - else if ( sscanf( arg, "%dx%d", &this->width, &this->height ) != 2 ) - { - this->width = 720; - this->height = 576; + this->width = mlt_properties_get_int( this->properties, "width" ); + this->height = mlt_properties_get_int( this->properties, "height" ); } - // Default window size and aspect ratio - this->aspect_ratio = 4.0 / 3.0; - this->window_width = (int)( (float)this->height * this->aspect_ratio ) + 1; + // 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_DOUBLEBUF | SDL_HWACCEL | SDL_RESIZABLE; + this->sdl_flags = SDL_HWSURFACE | SDL_ASYNCBLIT | SDL_HWACCEL | SDL_RESIZABLE | SDL_DOUBLEBUF; - // Create the the thread - pthread_create( &this->thread, NULL, consumer_thread, this ); + // Allow thread to be started/stopped + parent->start = consumer_start; + 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; @@ -139,6 +176,63 @@ 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; + + if ( !this->running ) + { + consumer_stop( parent ); + + this->running = 1; + 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 ); + } + else + { + this->width = mlt_properties_get_int( this->properties, "width" ); + this->height = mlt_properties_get_int( this->properties, "height" ); + } + + pthread_create( &this->thread, NULL, consumer_thread, this ); + } + + return 0; +} + +int consumer_stop( mlt_consumer parent ) +{ + // Get the actual object + consumer_sdl this = parent->child; + + if ( this->joined == 0 ) + { + // Kill the thread and clean up + this->joined = 1; + this->running = 0; + 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( ); @@ -157,7 +251,7 @@ static void sdl_fill_audio( void *udata, uint8_t *stream, int len ) consumer_sdl this = udata; // Get the volume - float volume = mlt_properties_get_double( this->properties, "volume" ); + double volume = mlt_properties_get_double( this->properties, "volume" ); pthread_mutex_lock( &this->audio_mutex ); @@ -168,7 +262,7 @@ static void sdl_fill_audio( void *udata, uint8_t *stream, int len ) 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; @@ -185,7 +279,7 @@ static void sdl_fill_audio( void *udata, uint8_t *stream, int len ) memcpy( stream, this->audio_buffer, this->audio_avail ); // Mix the audio - SDL_MixAudio( stream, stream, len, ( int )( ( float )SDL_MIX_MAXVOLUME * volume ) ); + SDL_MixAudio( stream, stream, len, ( int )( ( double )SDL_MIX_MAXVOLUME * volume ) ); // No audio left this->audio_avail = 0; @@ -198,26 +292,29 @@ static void sdl_fill_audio( void *udata, uint8_t *stream, int len ) pthread_mutex_unlock( &this->audio_mutex ); } -static int consumer_play_audio( consumer_sdl this, mlt_frame frame, int init_audio ) +static int consumer_play_audio( consumer_sdl this, mlt_frame frame, int init_audio, int *duration ) { // Get the properties of this consumer mlt_properties properties = this->properties; mlt_audio_format afmt = mlt_audio_pcm; // Set the preferred params of the test card signal - int channels = 2; - int frequency = 48000; + int channels = mlt_properties_get_int( properties, "channels" ); + int frequency = mlt_properties_get_int( properties, "frequency" ); static int counter = 0; + int samples = mlt_sample_calculator( mlt_properties_get_double( this->properties, "fps" ), frequency, counter++ ); int16_t *pcm; int bytes; mlt_frame_get_audio( frame, &pcm, &afmt, &frequency, &channels, &samples ); + *duration = ( ( samples * 1000 ) / frequency ); if ( mlt_properties_get_int( properties, "audio_off" ) ) { this->playing = 1; + init_audio = 1; return init_audio; } @@ -226,7 +323,7 @@ static int consumer_play_audio( consumer_sdl this, mlt_frame frame, int init_aud SDL_AudioSpec request; SDL_AudioSpec got; - SDL_EnableKeyRepeat( SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL ); + int audio_buffer = mlt_properties_get_int( properties, "audio_buffer" ); // specify audio format memset( &request, 0, sizeof( SDL_AudioSpec ) ); @@ -234,7 +331,7 @@ static int consumer_play_audio( consumer_sdl this, mlt_frame frame, int init_aud request.freq = frequency; request.format = AUDIO_S16; request.channels = channels; - request.samples = 1024; + request.samples = audio_buffer; request.callback = sdl_fill_audio; request.userdata = (void *)this; if ( SDL_OpenAudio( &request, &got ) != 0 ) @@ -251,16 +348,19 @@ 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 ); bytes = ( samples * channels * 2 ); pthread_mutex_lock( &this->audio_mutex ); - while ( bytes > ( sizeof( this->audio_buffer) - this->audio_avail ) ) + while ( this->running && bytes > ( sizeof( this->audio_buffer) - this->audio_avail ) ) pthread_cond_wait( &this->audio_cond, &this->audio_mutex ); - mlt_properties properties = mlt_frame_properties( frame ); - if ( mlt_properties_get_double( properties, "speed" ) == 1 ) - memcpy( &this->audio_buffer[ this->audio_avail ], pcm, bytes ); - else - memset( &this->audio_buffer[ this->audio_avail ], 0, bytes ); - this->audio_avail += bytes; + if ( this->running ) + { + if ( mlt_properties_get_double( properties, "_speed" ) == 1 ) + memcpy( &this->audio_buffer[ this->audio_avail ], pcm, bytes ); + 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 ); } @@ -282,41 +382,23 @@ 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" ) ) - { - mlt_frame_close( frame ); - return 0; - } - - if ( this->count == this->size ) + if ( this->running && mlt_properties_get_int( properties, "video_off" ) == 0 ) { - this->size += 25; - this->queue = realloc( this->queue, sizeof( mlt_frame ) * this->size ); - } - this->queue[ this->count ++ ] = frame; - - if ( this->playing ) - { - // We're working on the oldest frame now - frame = this->queue[ 0 ]; - - // Shunt the frames in the queue down - int i = 0; - for ( i = 1; i < this->count; i ++ ) - this->queue[ i - 1 ] = this->queue[ i ]; - this->count --; - // 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 if ( this->sdl_screen != NULL ) { 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: @@ -324,105 +406,239 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame ) 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 && strcmp( SDL_GetKeyName(event.key.keysym.sym), "space" ) ) - callback( producer, SDL_GetKeyName(event.key.keysym.sym) ); - else if ( callback != NULL && producer != NULL && !strcmp( SDL_GetKeyName(event.key.keysym.sym), "space" ) ) - callback( producer, " " ); + 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->width = width; - this->height = height; - changed = 1; + if ( this->sdl_overlay != NULL ) + SDL_FreeYUVOverlay( this->sdl_overlay ); + this->sdl_overlay = NULL; + } + + 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->sdl_screen == NULL || changed ) + if ( this->running ) { - double aspect_ratio = mlt_frame_get_aspect_ratio( frame ); - float display_aspect_ratio = (float)width / (float)height; - SDL_Rect rect; + // Determine window's new display aspect ratio + double this_aspect = ( double )this->window_width / this->window_height; + + // Get the display aspect ratio + double display_ratio = mlt_properties_get_double( properties, "display_ratio" ); + + // Determine frame's display aspect ratio + double frame_aspect = mlt_frame_get_aspect_ratio( frame ) * width / height; - if ( mlt_properties_get_double( properties, "aspect_ratio" ) ) - aspect_ratio = mlt_properties_get_double( properties, "aspect_ratio" ); + // Store the width and height received + this->width = width; + this->height = height; - if ( aspect_ratio == 1 ) + // If using hardware scaler + if ( mlt_properties_get( properties, "rescale" ) != NULL && + !strcmp( mlt_properties_get( properties, "rescale" ), "none" ) ) { - rect.w = this->window_width; - rect.h = this->window_height; + // 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 ) + { + this->rect.w = this->window_width; + this->rect.h = this_aspect / frame_aspect * this->window_height; + } } - else if ( this->window_width < this->window_height * aspect_ratio ) + // Special case optimisation to negate odd effect of sample aspect ratio + // not corresponding exactly with image resolution. + else if ( (int)( this_aspect * 1000 ) == (int)( display_ratio * 1000 ) ) { - rect.w = this->window_width; - rect.h = this->window_width / aspect_ratio; + this->rect.w = this->window_width; + this->rect.h = this->window_height; } - else + // Use hardware scaler to normalise sample aspect ratio + else if ( this->window_height * display_ratio > 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->window_width / display_ratio; } - - if ( mlt_properties_get_int( properties, "scale_overlay" ) ) + else { - if ( ( float )rect.w * display_aspect_ratio < this->window_width ) - rect.w = ( int )( ( float )rect.w * display_aspect_ratio ); - else if ( ( float )rect.h * display_aspect_ratio < this->window_height ) - rect.h = ( int )( ( float )rect.h * display_aspect_ratio ); + this->rect.w = this->window_height * display_ratio; + 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; - rect.x = ( this->window_width - rect.w ) / 2; - rect.y = ( this->window_height - rect.h ) / 2; + mlt_properties_set_int( this->properties, "rect_x", this->rect.x ); + 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 - this->sdl_screen = SDL_SetVideoMode( this->window_width, this->window_height, 0, this->sdl_flags ); + SDL_SetClipRect( this->sdl_screen, &this->rect ); + } - if ( this->sdl_screen != NULL ) - { - SDL_SetClipRect( this->sdl_screen, &rect ); - - sdl_lock_display(); - this->sdl_overlay = SDL_CreateYUVOverlay( this->width - (this->width % 4), this->height- (this->height % 2 ), SDL_YUY2_OVERLAY, this->sdl_screen ); - sdl_unlock_display(); - } + 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->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(); if ( SDL_LockYUVOverlay( this->sdl_overlay ) >= 0 ) { - mlt_resize_yuv422( this->buffer, this->width - (this->width % 4 ), this->height- (this->height % 2 ), image, width, height ); + 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(); } } - else + + return 0; +} + +static void *video_thread( void *arg ) +{ + // Identify the arg + consumer_sdl this = arg; + +#ifdef __DARWIN__ + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; +#endif + + // 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 real time flag + int real_time = mlt_properties_get_int( this->properties, "real_time" ); + + // Get the current time + gettimeofday( &now, NULL ); + + // Determine start time + start = ( int64_t )now.tv_sec * 1000000 + now.tv_usec; + + while ( this->running ) { - frame = NULL; + // Pop the next frame + pthread_mutex_lock( &this->video_mutex ); + 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 ); + + // 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 ) + { + // 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 ( real_time && ( 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 ( !real_time || ( 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 ( real_time && ( mlt_deque_count( this->queue ) == 0 && speed == 1.0 ) ) + { + gettimeofday( &now, NULL ); + start = ( ( int64_t )now.tv_sec * 1000000 + now.tv_usec ) - scheduled + 20000; + } + } + + // This frame can now be closed + mlt_frame_close( next ); + next = NULL; } - // Close the frame - if ( frame != NULL ) - mlt_frame_close( frame ); + if ( next != NULL ) + mlt_frame_close( next ); - if ( this->count ) - mlt_frame_get_image( this->queue[ this->count - 1 ], &image, &vfmt, &width, &height, 0 ); + mlt_consumer_stopped( &this->parent ); - return 0; +#ifdef __DARWIN__ + [pool release]; +#endif + + return NULL; } /** Threaded wrapper for pipe. @@ -433,41 +649,122 @@ static void *consumer_thread( void *arg ) // Identify the arg consumer_sdl this = arg; +#ifdef __DARWIN__ + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; +#endif + // Get the consumer mlt_consumer consumer = &this->parent; - // Get the service assoicated to the consumer - mlt_service service = mlt_consumer_service( consumer ); - - // Define a frame pointer - mlt_frame frame; + // 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; + struct timespec tm = { 0, 100000 }; + + this->bpp = mlt_properties_get_int( this->properties, "bpp" ); - if ( SDL_Init( SDL_INIT_VIDEO | SDL_INIT_AUDIO | SDL_INIT_NOPARACHUTE ) < 0 ) + if ( mlt_properties_get_int( MLT_CONSUMER_PROPERTIES( consumer ), "sdl_started" ) == 0 ) { - fprintf( stderr, "Failed to initialize SDL: %s\n", SDL_GetError() ); - return NULL; + 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 + { + 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 ); + } + } + + if ( !mlt_properties_get_int( MLT_CONSUMER_PROPERTIES( consumer ), "audio_off" ) ) + SDL_InitSubSystem( SDL_INIT_AUDIO ); + // Loop until told not to while( this->running ) { - // Get a frame from the service (should never return anything other than 0) - if ( mlt_service_get_frame( service, &frame, 0 ) == 0 ) + // Get a frame from the attached producer + frame = mlt_consumer_rt_frame( consumer ); + + // Ensure that we have a frame + if ( frame != NULL ) { - init_audio = consumer_play_audio( this, frame, init_audio ); - consumer_play_video( this, frame ); + // 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 ); + + while ( this->running && mlt_deque_count( this->queue ) > 15 ) + nanosleep( &tm, NULL ); + + // 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 ( 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 ) ); + + this->sdl_screen = NULL; + this->sdl_overlay = NULL; + this->audio_avail = 0; + +#ifdef __DARWIN__ + [pool release]; +#endif return NULL; } @@ -482,6 +779,10 @@ static int consumer_get_dimensions( int *width, int *height ) // Specify the SDL Version SDL_VERSION( &wm.version ); + // Lock the display + sdl_lock_display(); + +#ifndef __DARWIN__ // Get the wm structure if ( SDL_GetWMInfo( &wm ) == 1 ) { @@ -506,6 +807,10 @@ static int consumer_get_dimensions( int *width, int *height ) *height = attr.height; } } +#endif + + // Unlock the display + sdl_lock_display(); return changed; } @@ -518,21 +823,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 ); + // Now clean up the rest + mlt_consumer_close( parent ); + + // 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 - mlt_consumer_close( parent ); - // Finally clean up this free( this ); } -