X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fsdl%2Fconsumer_sdl.c;h=b06ca484fc9fdc459c59bd935dac949f2f340a0d;hb=5c299d1ae6f3535df35b3f30bae0476a1ca50aa6;hp=bdae25c13ab8d7fcad6459c3a7f4091bb928ad39;hpb=bc14039bada8702953117bc424d00c2bf56d42f5;p=melted diff --git a/src/modules/sdl/consumer_sdl.c b/src/modules/sdl/consumer_sdl.c index bdae25c..b06ca48 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. */ @@ -41,7 +41,7 @@ struct consumer_sdl_s mlt_deque queue; pthread_t thread; int running; - uint8_t audio_buffer[ 4096 * 24 ]; + uint8_t audio_buffer[ 4096 * 19 ]; int audio_avail; pthread_mutex_t audio_mutex; pthread_cond_t audio_cond; @@ -55,6 +55,7 @@ struct consumer_sdl_s SDL_Surface *sdl_screen; SDL_Overlay *sdl_overlay; uint8_t *buffer; + int time_taken; }; /** Forward references to static functions. @@ -280,7 +281,6 @@ static int consumer_play_audio( consumer_sdl this, mlt_frame frame, int init_aud if ( SDL_OpenAudio( &request, &got ) != 0 ) { fprintf( stderr, "SDL failed to open audio: %s\n", SDL_GetError() ); - mlt_properties_set_int( properties, "audio_off", 1 ); init_audio = 2; } else if ( got.size != 0 ) @@ -315,7 +315,6 @@ static int consumer_play_audio( consumer_sdl this, mlt_frame frame, int init_aud static int consumer_play_video( consumer_sdl this, mlt_frame frame, int64_t elapsed, int64_t playtime ) { - int error = 0; // Get the properties of this consumer mlt_properties properties = this->properties; @@ -323,9 +322,6 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame, int64_t elap int width = this->width, height = this->height; uint8_t *image; int changed = 0; - struct timeb now; - ftime( &now ); - int64_t start = ( ( int64_t )now.time * 1000 + now.millitm ); if ( mlt_properties_get_int( properties, "video_off" ) ) { @@ -333,78 +329,29 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame, int64_t elap return 0; } - if ( frame != NULL ) - { - // Set playtime - 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" ) ); + // 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 ); - } + // 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; - frame = 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" ); + frame = mlt_deque_pop_front( this->queue ); - // Check if frame is in the future or past - if ( playtime > elapsed + 500 ) - { - // Too far in the future - play it now - frame = mlt_deque_pop_front( this->queue ); - } - else if ( playtime > elapsed + 160 ) - { - // Time to squeeze a few more frames in - frame = candidate; - candidate = NULL; - error = 1; - break; - } - else if ( playtime < elapsed ) - { - 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 ); - } - else + if ( this->playing && frame != NULL && mlt_properties_get_int( mlt_frame_properties( frame ), "rendered" ) == 1 ) { - if ( frame != NULL ) - mlt_frame_get_image( frame, &image, &vfmt, &width, &height, 0 ); - frame = NULL; - } + playtime = mlt_properties_get_position( mlt_frame_properties( frame ), "playtime" ); - if ( this->playing && frame != NULL ) - { // Get the image, width and height mlt_frame_get_image( frame, &image, &vfmt, &width, &height, 0 ); - ftime( &now ); - elapsed += ( ( int64_t )now.time * 1000 + now.millitm ) - start; - playtime = mlt_properties_get_position( mlt_frame_properties( frame ), "playtime" ); - struct timespec slow = { 0, ( playtime - elapsed ) * 1000 }; - if ( slow.tv_nsec > 50 ) - nanosleep( &slow, NULL ); + if ( playtime > elapsed + 20000 ) + { + struct timespec tm = { ( playtime - elapsed ) / 1000000, ( ( playtime - elapsed ) % 1000000 ) * 1000 }; + nanosleep( &tm, NULL ); + } // Handle events if ( this->sdl_screen != NULL ) @@ -514,7 +461,7 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame, int64_t elap if ( frame != NULL ) mlt_frame_close( frame ); - return error || frame == NULL; + return 0; } /** Threaded wrapper for pipe. @@ -532,20 +479,18 @@ 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; - // Initialise the SDL subsystem 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; } - // Additional initialisation SDL_EnableKeyRepeat( SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL ); SDL_EnableUNICODE( 1 ); @@ -553,46 +498,30 @@ static void *consumer_thread( void *arg ) while( this->running ) { // Get a frame from the attached producer - mlt_frame frame = mlt_consumer_get_frame( consumer ); - mlt_frame video_frame = frame; - int done = 0; + mlt_frame frame = mlt_consumer_rt_frame( consumer, mlt_image_yuv422 ); // Ensure that we have a frame - while ( !done ) + if ( frame != NULL ) { // Play audio - if ( sizeof( this->audio_buffer ) - this->audio_avail > 8192 || mlt_deque_count( this->queue ) < 2 ) - { - init_audio = consumer_play_audio( this, frame, init_audio, &duration ); - done = 1; - } + init_audio = consumer_play_audio( this, frame, init_audio, &duration ); 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; - if ( consumer_play_video( this, video_frame, elapsed, playtime ) ) - { - if ( !done ) - { - init_audio = consumer_play_audio( this, frame, init_audio, &duration ); - done = 1; - } } - if ( video_frame != NULL ) - { - video_frame = NULL; - playtime += duration; - } + consumer_play_video( this, frame, elapsed, playtime ); + + playtime += ( duration * 1000 ); } }