X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fsdl%2Fconsumer_sdl.c;h=b066393af9c9db5bea6411e4f5af74d0e33e115c;hb=2e354c12a6ae418b3bf3c526b3370b98a717f70b;hp=41eea141ed2208dc5e9f56c5f469740213605637;hpb=788b48cb6c5163a522e0f51c80ad640cf7caed31;p=melted diff --git a/src/modules/sdl/consumer_sdl.c b/src/modules/sdl/consumer_sdl.c index 41eea14..b066393 100644 --- a/src/modules/sdl/consumer_sdl.c +++ b/src/modules/sdl/consumer_sdl.c @@ -41,10 +41,12 @@ struct consumer_sdl_s mlt_deque queue; pthread_t thread; 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; @@ -55,6 +57,7 @@ struct consumer_sdl_s int sdl_flags; SDL_Surface *sdl_screen; SDL_Overlay *sdl_overlay; + SDL_Rect rect; uint8_t *buffer; }; @@ -99,6 +102,8 @@ 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" ); @@ -109,6 +114,9 @@ mlt_consumer consumer_sdl_init( char *arg ) // 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" ); @@ -142,7 +150,7 @@ mlt_consumer consumer_sdl_init( char *arg ) } // 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; @@ -169,7 +177,14 @@ int consumer_start( mlt_consumer parent ) 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 ); @@ -235,7 +250,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; @@ -296,13 +311,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 = 1024; + request.samples = audio_buffer; request.callback = sdl_fill_audio; request.userdata = (void *)this; if ( SDL_OpenAudio( &request, &got ) != 0 ) @@ -399,8 +416,6 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame ) if ( this->sdl_screen == NULL || changed ) { - SDL_Rect rect; - // Determine frame's display aspect ratio float frame_aspect = mlt_frame_get_aspect_ratio( frame ) * this->width / this->height; @@ -416,18 +431,18 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame ) if ( ( (int)( this_aspect * 1000 ) == (int)( this->display_aspect * 1000 ) ) && ( (int)( mlt_frame_get_aspect_ratio( frame ) * 1000 ) == (int)( this->aspect_ratio * 1000 ) ) ) { - rect.w = this->window_width; - rect.h = this->window_height; + this->rect.w = this->window_width; + this->rect.h = this->window_height; } else { // Use hardware scaler to normalise display aspect ratio - rect.w = frame_aspect / this_aspect * this->window_width + 0.5; - rect.h = this->window_height; - if ( rect.w > this->window_width ) + this->rect.w = frame_aspect / this_aspect * this->window_width + 0.5; + this->rect.h = this->window_height; + if ( this->rect.w > this->window_width ) { - rect.w = this->window_width; - rect.h = this_aspect / frame_aspect * this->window_height + 0.5; + this->rect.w = this->window_width; + this->rect.h = this_aspect / frame_aspect * this->window_height + 0.5; } } } @@ -435,23 +450,23 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame ) // 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_height; + 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 * frame_aspect > this->window_width ) { - rect.w = this->window_width; - rect.h = this->window_width / frame_aspect + 0.5; + this->rect.w = this->window_width; + this->rect.h = this->window_width / frame_aspect + 0.5; } else { - rect.w = this->window_height * frame_aspect + 0.5; - rect.h = this->window_height; + this->rect.w = this->window_height * frame_aspect + 0.5; + this->rect.h = this->window_height; } - rect.x = ( this->window_width - rect.w ) / 2; - rect.y = ( this->window_height - rect.h ) / 2; + 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 ) @@ -462,32 +477,117 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame ) 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 - 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 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 ( difference > 10000 && 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; + } + } + + // This frame can now be closed + mlt_frame_close( next ); + } + + return NULL; +} + /** Threaded wrapper for pipe. */ @@ -499,18 +599,16 @@ 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 timeval 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; - mlt_frame next = NULL; - mlt_frame frame = NULL; if ( SDL_Init( SDL_INIT_VIDEO | SDL_INIT_AUDIO | SDL_INIT_NOPARACHUTE ) < 0 ) { @@ -530,71 +628,46 @@ static void *consumer_thread( void *arg ) // 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 - gettimeofday( &now, NULL ); + // Create the video thread + pthread_create( &thread, NULL, video_thread, this ); - // 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; + // Video doesn't need to be initialised any more + init_video = 0; } // Set playtime for this frame - mlt_properties_set_position( mlt_frame_properties( frame ), "playtime", playtime ); + 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 ); } + } - if ( this->playing ) - { - // Pop the next frame - next = mlt_deque_pop_front( this->queue ); - - // 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 ) - { - mlt_position scheduled = mlt_properties_get_position( mlt_frame_properties( next ), "playtime" ) + 5000; - if ( scheduled > elapsed && mlt_deque_count( this->queue ) > 25 ) - { - tm.tv_sec = ( scheduled - elapsed ) / 1000000; - tm.tv_nsec = ( ( scheduled - elapsed ) % 1000000 ) * 1000; - nanosleep( &tm, NULL ); - - // Show current frame - consumer_play_video( this, next ); - } - else if ( scheduled > elapsed ) - { - // More time to kill - mlt_deque_push_front( this->queue, next ); - } - else - { - // Show current frame - consumer_play_video( this, next ); - } - } - else - { - // This is an unrendered frame - just close it - mlt_frame_close( next ); - } - } + // 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( ); @@ -658,6 +731,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 );