X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fsdl%2Fconsumer_sdl.c;h=06171b9cfaab2f092e0573a38c428a68e6a7bafc;hb=245af2ef6564488632b77c6e9018519ba134a320;hp=f2d9fe798928a8018c9da2e5a6b27823ce2fed3f;hpb=bdbe7d802961afa00c233b3cf30e32f0e1c3740a;p=melted diff --git a/src/modules/sdl/consumer_sdl.c b/src/modules/sdl/consumer_sdl.c index f2d9fe7..06171b9 100644 --- a/src/modules/sdl/consumer_sdl.c +++ b/src/modules/sdl/consumer_sdl.c @@ -27,7 +27,7 @@ #include #include #include -#include +#include /** This classes definition. */ @@ -40,20 +40,26 @@ struct consumer_sdl_s mlt_properties properties; mlt_deque queue; pthread_t thread; + int joined; int running; - uint8_t audio_buffer[ 4096 * 19 ]; + 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; }; @@ -98,29 +104,55 @@ mlt_consumer consumer_sdl_init( char *arg ) // This is the initialisation of the consumer 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", 1 ); + mlt_properties_set_int( this->properties, "progressive", 0 ); + + // Default audio buffer + mlt_properties_set_int( this->properties, "audio_buffer", 1024 ); - // Get aspect ratio + // Get sample aspect ratio this->aspect_ratio = mlt_properties_get_double( this->properties, "aspect_ratio" ); + // Default display aspect ratio + this->display_aspect = 4.0 / 3.0; + // 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; + 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 = (int)( (float)this->height * this->aspect_ratio ) + 1; - this->window_height = this->height; - // Set the sdl flags - this->sdl_flags = SDL_HWSURFACE | SDL_ASYNCBLIT | SDL_HWACCEL | SDL_RESIZABLE; + this->sdl_flags = SDL_HWSURFACE | SDL_ASYNCBLIT | SDL_HWACCEL | SDL_RESIZABLE | SDL_DOUBLEBUF; // Allow thread to be started/stopped parent->start = consumer_start; @@ -144,8 +176,23 @@ int consumer_start( mlt_consumer parent ) if ( !this->running ) { + pthread_attr_t thread_attributes; + this->running = 1; - pthread_create( &this->thread, NULL, consumer_thread, this ); + 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 ); + } + + // 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; @@ -156,7 +203,7 @@ int consumer_stop( mlt_consumer parent ) // Get the actual object consumer_sdl this = parent->child; - if ( this->running ) + if ( this->joined == 0 ) { // Kill the thread and clean up this->running = 0; @@ -166,6 +213,7 @@ int consumer_stop( mlt_consumer parent ) pthread_mutex_unlock( &this->audio_mutex ); pthread_join( this->thread, NULL ); + this->joined = 1; } return 0; @@ -206,7 +254,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; @@ -243,11 +291,9 @@ static int consumer_play_audio( consumer_sdl this, mlt_frame frame, int init_aud 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; - 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++ ); @@ -260,6 +306,7 @@ static int consumer_play_audio( consumer_sdl this, mlt_frame frame, int init_aud if ( mlt_properties_get_int( properties, "audio_off" ) ) { this->playing = 1; + init_audio = 1; return init_audio; } @@ -268,13 +315,15 @@ static int consumer_play_audio( consumer_sdl this, mlt_frame frame, int init_aud 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 = 2048; + request.samples = audio_buffer; request.callback = sdl_fill_audio; request.userdata = (void *)this; if ( SDL_OpenAudio( &request, &got ) != 0 ) @@ -291,16 +340,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 ); } @@ -312,7 +364,7 @@ static int consumer_play_audio( consumer_sdl this, mlt_frame frame, int init_aud return init_audio; } -static int consumer_play_video( consumer_sdl this, mlt_frame frame, int64_t elapsed, int64_t playtime ) +static int consumer_play_video( consumer_sdl this, mlt_frame frame ) { // Get the properties of this consumer mlt_properties properties = this->properties; @@ -322,80 +374,11 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame, int64_t elap uint8_t *image; int changed = 0; - struct timeb before; - ftime( &before ); - - if ( mlt_properties_get_int( properties, "video_off" ) ) - { - mlt_frame_close( frame ); - return 0; - } - - // Set skip - mlt_properties_set_position( mlt_frame_properties( frame ), "playtime", playtime ); - mlt_properties_set_double( mlt_frame_properties( frame ), "consumer_scale", ( double )height / mlt_properties_get_double( properties, "height" ) ); - - // Push this frame to the back of the queue - mlt_deque_push_back( this->queue, frame ); - frame = NULL; - - if ( this->playing ) - { - // We might want to use an old frame if the current frame is skipped - mlt_frame candidate = NULL; - - while ( frame == NULL && mlt_deque_count( this->queue ) ) - { - frame = mlt_deque_peek_front( this->queue ); - playtime = mlt_properties_get_position( mlt_frame_properties( frame ), "playtime" ); - - // Check if frame is in the future or past - if ( mlt_deque_count( this->queue ) > 25 ) - { - frame = mlt_deque_pop_front( this->queue ); - } - else if ( playtime > elapsed + 60 || mlt_deque_count( this->queue ) < 12 ) - { - // no frame to show or remove - frame = NULL; - break; - } - else if ( playtime < elapsed - 20 ) - { - if ( candidate != NULL ) - mlt_frame_close( candidate ); - candidate = mlt_deque_pop_front( this->queue ); - frame = NULL; - } - else - { - // Get the frame at the front of the queue - frame = mlt_deque_pop_front( this->queue ); - } - } - - if ( frame == NULL ) - frame = candidate; - else if ( candidate != NULL ) - mlt_frame_close( candidate ); - } - - if ( this->playing && frame != NULL ) + if ( mlt_properties_get_int( properties, "video_off" ) == 0 ) { - struct timeb after; - // Get the image, width and height mlt_frame_get_image( frame, &image, &vfmt, &width, &height, 0 ); - - ftime( &after ); - //fprintf( stderr, "showing %lld at %lld\n", playtime, elapsed ); - int processing = ( ( int64_t )after.time * 1000 + after.millitm ) - ( ( int64_t )before.time * 1000 + before.millitm ); - - int delay = playtime - elapsed - processing; - struct timespec slow = { 0, ( delay % 1000 ) * 500000 }; - if ( slow.tv_nsec > 1000000 ) - nanosleep( &slow, NULL ); - + // Handle events if ( this->sdl_screen != NULL ) { @@ -412,6 +395,9 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame, int64_t elap 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 ); @@ -428,85 +414,200 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame, int64_t elap } } - if ( width != this->width || height != this->height ) + 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 ( this->sdl_screen == NULL || changed ) { - double aspect_ratio = mlt_frame_get_aspect_ratio( frame ); - float display_aspect_ratio = (float)width / (float)height; - SDL_Rect rect; - - if ( mlt_properties_get_double( properties, "aspect_ratio" ) ) - aspect_ratio = mlt_properties_get_double( properties, "aspect_ratio" ); + // 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 ( 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; + // 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->rect.w = this->window_width; + this->rect.h = this->window_height; + } + 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 ) + { + 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)( this->display_aspect * 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 * this->display_aspect > 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 / this->display_aspect; } - - 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 * this->display_aspect; + 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 + 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, &rect ); - + SDL_SetClipRect( this->sdl_screen, &this->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 ); + this->sdl_overlay = SDL_CreateYUVOverlay( this->width, this->height, SDL_YUY2_OVERLAY, this->sdl_screen ); sdl_unlock_display(); } } + 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 ) { - memcpy( this->buffer, image, width * height * 2 ); + 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(); } } - // Close the frame - if ( frame != NULL ) - mlt_frame_close( frame ); - 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 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 ) + { + // 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 ) + { + // 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 ); + } + + mlt_consumer_stopped( &this->parent ); + + return NULL; +} + /** Threaded wrapper for pipe. */ @@ -518,15 +619,17 @@ static void *consumer_thread( void *arg ) // Get the consumer mlt_consumer consumer = &this->parent; + // Video thread + pthread_t thread; + // internal intialization int init_audio = 1; - - // Obtain time of thread start - struct timeb now; - int64_t start = 0; - int64_t elapsed = 0; + int init_video = 1; + mlt_frame frame = NULL; + mlt_properties properties = NULL; int duration = 0; int64_t playtime = 0; + struct timespec tm = { 0, 100000 }; if ( SDL_Init( SDL_INIT_VIDEO | SDL_INIT_AUDIO | SDL_INIT_NOPARACHUTE ) < 0 ) { @@ -541,35 +644,54 @@ static void *consumer_thread( void *arg ) while( this->running ) { // Get a frame from the attached producer - mlt_frame frame = mlt_consumer_get_frame( consumer ); + 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 ); - if ( this->playing ) + // Determine the start time now + if ( this->playing && init_video ) { - // Get the current time - ftime( &now ); + // Create the video thread + pthread_create( &thread, NULL, video_thread, this ); - // Determine elapsed time - if ( start == 0 ) - start = ( int64_t )now.time * 1000 + now.millitm; - else - elapsed = ( ( int64_t )now.time * 1000 + now.millitm ) - start; + // Video doesn't need to be initialised any more + init_video = 0; } - consumer_play_video( this, frame, elapsed, playtime ); + // Set playtime for this frame + mlt_properties_set_position( properties, "playtime", playtime ); + + while ( this->running && mlt_deque_count( this->queue ) > 15 ) + nanosleep( &tm, NULL ); - playtime += duration; + // 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( ); @@ -594,6 +716,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 ) { @@ -619,6 +744,9 @@ static int consumer_get_dimensions( int *width, int *height ) } } + // Unlock the display + sdl_lock_display(); + return changed; } @@ -633,6 +761,9 @@ static void consumer_close( mlt_consumer parent ) // Stop the consumer mlt_consumer_stop( parent ); + // Close the queue + mlt_deque_close( this->queue ); + // Destroy mutexes pthread_mutex_destroy( &this->audio_mutex ); pthread_cond_destroy( &this->audio_cond ); @@ -643,4 +774,3 @@ static void consumer_close( mlt_consumer parent ) // Finally clean up this free( this ); } -