X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fsdl%2Fconsumer_sdl.c;h=1d1e95965b5631ade68f2661486ea40ab8264ffb;hb=23571c330fd1644833dcb73661ac987eda177200;hp=8ddabcdad85ac98638b76dd18e04d9a18444ba8e;hpb=12d4027b3039f13c4b5f9fdb12f2fb4b7d3c3f44;p=melted diff --git a/src/modules/sdl/consumer_sdl.c b/src/modules/sdl/consumer_sdl.c index 8ddabcd..1d1e959 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. */ @@ -55,7 +55,6 @@ struct consumer_sdl_s SDL_Surface *sdl_screen; SDL_Overlay *sdl_overlay; uint8_t *buffer; - int time_taken; }; /** Forward references to static functions. @@ -103,8 +102,11 @@ mlt_consumer consumer_sdl_init( char *arg ) // 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", 1 ); + mlt_properties_set_int( this->properties, "progressive", 0 ); // Get aspect ratio this->aspect_ratio = mlt_properties_get_double( this->properties, "aspect_ratio" ); @@ -115,9 +117,9 @@ mlt_consumer consumer_sdl_init( char *arg ) 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 * this->aspect_ratio ) + 1; + this->window_width = (int)( (float)this->height * 4.0/3.0 + 0.5); this->window_height = this->height; // Set the sdl flags @@ -261,6 +263,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; } @@ -275,7 +278,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 = 2048; + request.samples = 1024; request.callback = sdl_fill_audio; request.userdata = (void *)this; if ( SDL_OpenAudio( &request, &got ) != 0 ) @@ -292,11 +295,11 @@ 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 ) ) 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 @@ -313,7 +316,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; @@ -323,88 +326,10 @@ 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" ) ); - - if ( !this->playing ) - { - struct timeb render; - mlt_frame_get_image( frame, &image, &vfmt, &width, &height, 0 ); - ftime( &render ); - this->time_taken = ( ( int64_t )render.time * 1000 + render.millitm ) - ( ( int64_t )before.time * 1000 + before.millitm ); - mlt_properties_set( mlt_frame_properties( frame ), "rendered", "true" ); - } - - // 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 + 100 ) - { - // no frame to show or remove - frame = NULL; - break; - } - else if ( playtime < elapsed - 20 ) - { - mlt_frame_close( candidate ); - candidate = mlt_deque_pop_front( this->queue ); - if ( mlt_properties_get( mlt_frame_properties( frame ), "rendered" ) == NULL ) - { - mlt_frame_close( candidate ); - candidate = NULL; - } - 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 ); - } - - struct timeb render; - ftime( &render ); - - if ( this->playing && frame != NULL ) + 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 ); - ftime( &render ); - if ( mlt_properties_get( mlt_frame_properties( frame ), "rendered" ) == NULL ) - this->time_taken = ( ( int64_t )render.time * 1000 + render.millitm ) - ( ( int64_t )before.time * 1000 + before.millitm ); // Handle events if ( this->sdl_screen != NULL ) @@ -422,6 +347,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 ); @@ -447,12 +375,12 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame, int64_t elap if ( this->sdl_screen == NULL || changed ) { - double aspect_ratio = mlt_frame_get_aspect_ratio( frame ); - float display_aspect_ratio = (float)width / (float)height; + 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_double( properties, "aspect_ratio" ) ) - aspect_ratio = mlt_properties_get_double( properties, "aspect_ratio" ); + 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 ) { @@ -462,11 +390,11 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame, int64_t elap else if ( this->window_width < this->window_height * aspect_ratio ) { rect.w = this->window_width; - rect.h = this->window_width / aspect_ratio; + rect.h = this->window_width / aspect_ratio + 1; } else { - rect.w = this->window_height * aspect_ratio; + rect.w = this->window_height * aspect_ratio + 1; rect.h = this->window_height; } @@ -511,35 +439,7 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame, int64_t elap } // Close the frame - if ( frame != NULL ) - mlt_frame_close( frame ); - - struct timeb after; - ftime( &after ); - int processing = ( ( int64_t )after.time * 1000 + after.millitm ) - ( ( int64_t )render.time * 1000 + render.millitm ); - int delay = playtime - elapsed - processing; - - if ( delay > this->time_taken && mlt_deque_count( this->queue ) ) - { - mlt_frame next = mlt_deque_peek_front( this->queue ); - playtime = mlt_properties_get_position( mlt_frame_properties( next ), "playtime" ); - if ( playtime > elapsed + delay ) - { - struct timeb render; - mlt_frame_get_image( next, &image, &vfmt, &width, &height, 0 ); - ftime( &render ); - this->time_taken = ( ( int64_t )render.time * 1000 + render.millitm ) - ( ( int64_t )after.time * 1000 + after.millitm ); - mlt_properties_set( mlt_frame_properties( next ), "rendered", "true" ); - } - else - { - this->time_taken /= 2; - } - } - else - { - this->time_taken /= 2; - } + mlt_frame_close( frame ); return 0; } @@ -559,11 +459,14 @@ static void *consumer_thread( void *arg ) int init_audio = 1; // Obtain time of thread start - struct timeb now; + 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 ) { @@ -578,7 +481,7 @@ 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 ) @@ -589,18 +492,59 @@ static void *consumer_thread( void *arg ) if ( this->playing ) { // Get the current time - ftime( &now ); + gettimeofday( &now, NULL ); // Determine elapsed time if ( start == 0 ) - start = ( int64_t )now.time * 1000 + now.millitm; + start = ( int64_t )now.tv_sec * 1000000 + now.tv_usec; else - elapsed = ( ( int64_t )now.time * 1000 + now.millitm ) - start; + elapsed = ( ( int64_t )now.tv_sec * 1000000 + now.tv_usec) - start; } - consumer_play_video( this, frame, elapsed, playtime ); + // Set playtime for this frame + mlt_properties_set_position( mlt_frame_properties( frame ), "playtime", playtime ); + + // Push this frame to the back of the queue + mlt_deque_push_back( this->queue, frame ); + + // Calculate the next playtime + playtime += ( duration * 1000 ); + } + + if ( this->playing ) + { + // Pop the next frame + next = mlt_deque_pop_front( this->queue ); - playtime += duration; + // 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 ); + } } } @@ -680,4 +624,3 @@ static void consumer_close( mlt_consumer parent ) // Finally clean up this free( this ); } -