X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fsdl%2Fconsumer_sdl.c;h=1d1e95965b5631ade68f2661486ea40ab8264ffb;hb=23571c330fd1644833dcb73661ac987eda177200;hp=f438d26a6d1023b92591eac13365bfb015c714b2;hpb=c9e2414c3588e554db5fc94d268bc0c9de3dba30;p=melted diff --git a/src/modules/sdl/consumer_sdl.c b/src/modules/sdl/consumer_sdl.c index f438d26..1d1e959 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,23 +38,31 @@ 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 * 19 ]; int audio_avail; pthread_mutex_t audio_mutex; pthread_cond_t audio_cond; int window_width; int window_height; + float aspect_ratio; int width; int height; + int playing; + int sdl_flags; + SDL_Surface *sdl_screen; + SDL_Overlay *sdl_overlay; + 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 ); @@ -69,6 +79,9 @@ mlt_consumer consumer_sdl_init( char *arg ) // 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; @@ -83,30 +96,39 @@ mlt_consumer consumer_sdl_init( char *arg ) 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); + // 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", 2 ); + + // Default progressive true + mlt_properties_set_int( this->properties, "progressive", 0 ); + + // Get aspect ratio + this->aspect_ratio = mlt_properties_get_double( this->properties, "aspect_ratio" ); + // process actual param - if ( arg == NULL || !strcmp( arg, "PAL" ) ) - { - this->width = 720; - this->height = 576; - } - else if ( !strcmp( arg, "NTSC" ) ) - { - this->width = 720; - this->height = 480; - } - else if ( sscanf( arg, "%dx%d", &this->width, &this->height ) != 2 ) + if ( arg == NULL || 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 + this->window_width = (int)( (float)this->height * 4.0/3.0 + 0.5); + this->window_height = this->height; + + // Set the sdl flags + this->sdl_flags = SDL_HWSURFACE | SDL_ASYNCBLIT | SDL_HWACCEL | SDL_RESIZABLE; - - // 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; // Return the consumer produced return parent; @@ -119,6 +141,45 @@ mlt_consumer consumer_sdl_init( char *arg ) return NULL; } +int consumer_start( mlt_consumer parent ) +{ + consumer_sdl this = parent->child; + + if ( !this->running ) + { + this->running = 1; + 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->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( ); @@ -132,7 +193,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; @@ -141,7 +202,7 @@ 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 ); @@ -170,10 +231,219 @@ 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 ); } +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; + static int counter = 0; + if ( mlt_properties_get_int( properties, "frequency" ) != 0 ) + frequency = mlt_properties_get_int( properties, "frequency" ); + + 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; + } + + if ( init_audio == 1 ) + { + SDL_AudioSpec request; + SDL_AudioSpec got; + + // specify audio format + memset( &request, 0, sizeof( SDL_AudioSpec ) ); + this->playing = 0; + 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, &got ) != 0 ) + { + 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 ); + 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; + } + + return init_audio; +} + +static int consumer_play_video( consumer_sdl this, mlt_frame frame ) +{ + // Get the properties of this consumer + mlt_properties properties = this->properties; + + mlt_image_format vfmt = mlt_image_yuv422; + int width = this->width, height = this->height; + uint8_t *image; + int changed = 0; + + 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 ) + { + 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->width = width; + this->height = height; + changed = 1; + } + + if ( this->sdl_screen == NULL || changed ) + { + double aspect_ratio = ( float )this->aspect_ratio * this->width / this->height; + float display_aspect_ratio = ( float )width / height; + SDL_Rect rect; + if ( mlt_properties_get( properties, "rescale" ) != NULL && + !strcmp( mlt_properties_get( properties, "rescale" ), "none" ) ) + aspect_ratio = mlt_frame_get_aspect_ratio( frame ) * mlt_properties_get_int(mlt_frame_properties(frame),"width") / mlt_properties_get_int(mlt_frame_properties(frame),"height"); + + if ( aspect_ratio == 1 ) + { + rect.w = this->window_width; + rect.h = this->window_height; + } + else if ( this->window_width < this->window_height * aspect_ratio ) + { + rect.w = this->window_width; + rect.h = this->window_width / aspect_ratio + 1; + } + else + { + rect.w = this->window_height * aspect_ratio + 1; + rect.h = this->window_height; + } + + if ( mlt_properties_get_int( properties, "scale_overlay" ) ) + { + 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 ); + } + + rect.x = ( this->window_width - rect.w ) / 2; + rect.y = ( this->window_height - rect.h ) / 2; + + // 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 ); + + 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->sdl_screen != NULL && this->sdl_overlay != NULL ) + { + this->buffer = this->sdl_overlay->pixels[ 0 ]; + if ( SDL_LockYUVOverlay( this->sdl_overlay ) >= 0 ) + { + memcpy( this->buffer, image, width * height * 2 ); + SDL_UnlockYUVOverlay( this->sdl_overlay ); + SDL_DisplayYUVOverlay( this->sdl_overlay, &this->sdl_screen->clip_rect ); + } + } + } + + // Close the frame + mlt_frame_close( frame ); + + return 0; +} + /** Threaded wrapper for pipe. */ @@ -185,170 +455,113 @@ static void *consumer_thread( void *arg ) // 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; - // 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 bytes; + + // Obtain time of thread start + struct timeval now; + int64_t start = 0; + int64_t elapsed = 0; + int duration = 0; + int64_t playtime = 0; + struct timespec tm; + mlt_frame next = NULL; + mlt_frame frame = NULL; 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 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 ) { - mlt_image_format vfmt = mlt_image_yuv422; - int width = this->width, height = this->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 ) + // Play audio + init_audio = consumer_play_audio( this, frame, init_audio, &duration ); + + if ( this->playing ) { - 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; + // Get the current time + gettimeofday( &now, NULL ); + + // Determine elapsed time + if ( start == 0 ) + start = ( int64_t )now.tv_sec * 1000000 + now.tv_usec; + else + elapsed = ( ( int64_t )now.tv_sec * 1000000 + now.tv_usec) - start; } - 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 ); - 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 ); - // Get the image, width and height - mlt_frame_get_image( frame, &image, &vfmt, &width, &height, 0 ); + // Set playtime for this frame + mlt_properties_set_position( mlt_frame_properties( frame ), "playtime", playtime ); - if ( sdl_screen != NULL ) - { - SDL_Event event; + // Push this frame to the back of the queue + mlt_deque_push_back( this->queue, frame ); - changed = consumer_get_dimensions( &this->window_width, &this->window_height ); + // Calculate the next playtime + playtime += ( duration * 1000 ); + } - while ( SDL_PollEvent( &event ) ) - { - switch( event.type ) - { - case SDL_VIDEORESIZE: - this->window_width = event.resize.w; - this->window_height = event.resize.h; - changed = 1; - break; - } - } - } + if ( this->playing ) + { + // Pop the next frame + next = mlt_deque_pop_front( this->queue ); - if ( sdl_screen == NULL || changed ) + // See if we have to delay the display of the current frame + if ( next != NULL && mlt_properties_get_int( mlt_frame_properties( next ), "rendered" ) == 1 ) { - double aspect_ratio = mlt_frame_get_aspect_ratio( frame ); - - if ( this->window_width == 0 || this->window_height == 0 ) + mlt_position scheduled = mlt_properties_get_position( mlt_frame_properties( next ), "playtime" ) + 5000; + if ( scheduled > elapsed && mlt_deque_count( this->queue ) > 25 ) { - this->window_width = width; - this->window_height = height; - } - - // open SDL window with video overlay, if possible - sdl_screen = SDL_SetVideoMode( this->window_width, this->window_height, 0, sdl_flags ); + tm.tv_sec = ( scheduled - elapsed ) / 1000000; + tm.tv_nsec = ( ( scheduled - elapsed ) % 1000000 ) * 1000; + nanosleep( &tm, NULL ); - if ( sdl_screen != NULL ) + // Show current frame + consumer_play_video( this, next ); + } + else if ( scheduled > elapsed ) { - 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 - { - rect.w = this->window_height * aspect_ratio; - rect.h = this->window_height; - } - - 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( this->width, this->height, SDL_YUY2_OVERLAY, sdl_screen ); - sdl_unlock_display(); + // More time to kill + mlt_deque_push_front( this->queue, next ); } - } - - if ( sdl_screen != NULL && sdl_overlay != NULL ) - { - buffer = sdl_overlay->pixels[ 0 ]; - if ( sdl_lock_display() ) + else { - if ( SDL_LockYUVOverlay( sdl_overlay ) >= 0 ) - { - mlt_resize_yuv422( buffer, this->width, this->height, image, width, height ); - SDL_UnlockYUVOverlay( sdl_overlay ); - SDL_DisplayYUVOverlay( sdl_overlay, &sdl_screen->clip_rect ); - } - sdl_unlock_display(); + // Show current frame + consumer_play_video( this, next ); } } else { - // TODO: allocate buffer? + // This is an unrendered frame - just close it + mlt_frame_close( next ); } - - // Close the frame - mlt_frame_close( frame ); - } - else - { - break; } - } // while + } // 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; } @@ -398,22 +611,16 @@ 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 ); - - 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 ); } -