X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fsdl%2Fconsumer_sdl.c;h=de43e4300c8f2bb6dc1b464da07fb9cc5bfc31dc;hb=7f00120cd5cc8a7194ca016f3a340b57cf5703f5;hp=0d483cf4721ed9a2d2eac10c11cb49673d80bb1a;hpb=980bd5cb1c17023459f0330397b817e18b9cb0c3;p=melted diff --git a/src/modules/sdl/consumer_sdl.c b/src/modules/sdl/consumer_sdl.c index 0d483cf..de43e43 100644 --- a/src/modules/sdl/consumer_sdl.c +++ b/src/modules/sdl/consumer_sdl.c @@ -51,6 +51,7 @@ struct consumer_sdl_s int window_height; float aspect_ratio; float display_aspect; + double last_frame_aspect; int width; int height; int playing; @@ -130,7 +131,7 @@ mlt_consumer consumer_sdl_init( char *arg ) 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_width = ( float )this->height * this->display_aspect; this->window_height = this->height; } else @@ -339,13 +340,16 @@ static int consumer_play_audio( consumer_sdl this, mlt_frame frame, int init_aud 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 ); - 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 ); } @@ -407,10 +411,11 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame ) } } - 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; } @@ -437,12 +442,12 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame ) else { // Use hardware scaler to normalise display aspect ratio - this->rect.w = frame_aspect / this_aspect * this->window_width + 0.5; + 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 + 0.5; + this->rect.h = this_aspect / frame_aspect * this->window_height; } } } @@ -457,23 +462,30 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame ) 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; + this->rect.h = this->window_width / this->display_aspect; } else { - this->rect.w = this->window_height * this->display_aspect + 0.5; + 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; + + 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 ) { @@ -526,6 +538,9 @@ static void *video_thread( void *arg ) 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 ); @@ -562,7 +577,7 @@ static void *video_thread( void *arg ) mlt_position difference = scheduled - elapsed; // Smooth playback a bit - if ( difference > 20000 && speed == 1.0 ) + if ( real_time && ( difference > 20000 && speed == 1.0 ) ) { tm.tv_sec = difference / 1000000; tm.tv_nsec = ( difference % 1000000 ) * 500; @@ -570,11 +585,11 @@ static void *video_thread( void *arg ) } // Show current frame if not too old - if ( difference > -10000 || speed != 1.0 || mlt_deque_count( this->queue ) < 2 ) + 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 ( mlt_deque_count( this->queue ) == 0 && speed == 1.0 ) + 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; @@ -609,6 +624,7 @@ static void *consumer_thread( void *arg ) 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 ) { @@ -647,6 +663,9 @@ static void *consumer_thread( void *arg ) // 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 ); @@ -692,6 +711,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 ) { @@ -717,6 +739,9 @@ static int consumer_get_dimensions( int *width, int *height ) } } + // Unlock the display + sdl_lock_display(); + return changed; }