X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fsdl%2Fconsumer_sdl.c;h=f2d9fe798928a8018c9da2e5a6b27823ce2fed3f;hb=bdbe7d802961afa00c233b3cf30e32f0e1c3740a;hp=d35e4a7869f24346a6ed46883d13cbd5bb85aaa8;hpb=037e09bc7cd1c94c73f200d2583dee5a786da810;p=melted diff --git a/src/modules/sdl/consumer_sdl.c b/src/modules/sdl/consumer_sdl.c index d35e4a7..f2d9fe7 100644 --- a/src/modules/sdl/consumer_sdl.c +++ b/src/modules/sdl/consumer_sdl.c @@ -41,7 +41,7 @@ struct consumer_sdl_s mlt_deque queue; pthread_t thread; int running; - uint8_t audio_buffer[ 4096 * 6 ]; + uint8_t audio_buffer[ 4096 * 19 ]; int audio_avail; pthread_mutex_t audio_mutex; pthread_cond_t audio_cond; @@ -268,9 +268,6 @@ static int consumer_play_audio( consumer_sdl this, mlt_frame frame, int init_aud SDL_AudioSpec request; SDL_AudioSpec got; - SDL_EnableKeyRepeat( SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL ); - SDL_EnableUNICODE( 1 ); - // specify audio format memset( &request, 0, sizeof( SDL_AudioSpec ) ); this->playing = 0; @@ -315,7 +312,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, int skip, int64_t playtime ) +static int consumer_play_video( consumer_sdl this, mlt_frame frame, int64_t elapsed, int64_t playtime ) { // Get the properties of this consumer mlt_properties properties = this->properties; @@ -324,7 +321,9 @@ 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; - int show = 1; + + struct timeb before; + ftime( &before ); if ( mlt_properties_get_int( properties, "video_off" ) ) { @@ -332,41 +331,9 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame, int64_t elap return 0; } - // Handle events - if ( this->sdl_screen != NULL ) - { - SDL_Event event; - - changed = consumer_get_dimensions( &this->window_width, &this->window_height ); - - while ( SDL_PollEvent( &event ) ) - { - switch( event.type ) - { - case SDL_VIDEORESIZE: - this->window_width = event.resize.w; - this->window_height = event.resize.h; - changed = 1; - break; - case SDL_KEYDOWN: - { - mlt_producer producer = mlt_properties_get_data( properties, "transport_producer", NULL ); - char keyboard[ 2 ] = " "; - void (*callback)( mlt_producer, char * ) = mlt_properties_get_data( properties, "transport_callback", NULL ); - if ( callback != NULL && producer != NULL && event.key.keysym.unicode < 0x80 && event.key.keysym.unicode > 0 ) - { - keyboard[ 0 ] = ( char )event.key.keysym.unicode; - callback( producer, keyboard ); - } - } - break; - } - } - } - // Set skip - mlt_properties_set_int( mlt_frame_properties( frame ), "skip", 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 ); @@ -380,23 +347,20 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame, int64_t elap while ( frame == NULL && mlt_deque_count( this->queue ) ) { frame = mlt_deque_peek_front( this->queue ); - show = !mlt_properties_get_int( mlt_frame_properties( frame ), "skip" ); playtime = mlt_properties_get_position( mlt_frame_properties( frame ), "playtime" ); // Check if frame is in the future or past - if ( !show ) + if ( mlt_deque_count( this->queue ) > 25 ) { frame = mlt_deque_pop_front( this->queue ); - mlt_frame_close( frame ); - frame = NULL; } - else if ( playtime > elapsed ) + else if ( playtime > elapsed + 60 || mlt_deque_count( this->queue ) < 12 ) { // no frame to show or remove frame = NULL; break; } - else if ( playtime < elapsed - 40 ) + else if ( playtime < elapsed - 20 ) { if ( candidate != NULL ) mlt_frame_close( candidate ); @@ -418,9 +382,52 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame, int64_t elap if ( this->playing && frame != NULL ) { + 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 ) + { + SDL_Event event; + + changed = consumer_get_dimensions( &this->window_width, &this->window_height ); + + while ( SDL_PollEvent( &event ) ) + { + switch( event.type ) + { + case SDL_VIDEORESIZE: + this->window_width = event.resize.w; + this->window_height = event.resize.h; + changed = 1; + break; + case SDL_KEYDOWN: + { + mlt_producer producer = mlt_properties_get_data( properties, "transport_producer", NULL ); + char keyboard[ 2 ] = " "; + void (*callback)( mlt_producer, char * ) = mlt_properties_get_data( properties, "transport_callback", NULL ); + if ( callback != NULL && producer != NULL && event.key.keysym.unicode < 0x80 && event.key.keysym.unicode > 0 ) + { + keyboard[ 0 ] = ( char )event.key.keysym.unicode; + callback( producer, keyboard ); + } + } + break; + } + } + } + if ( width != this->width || height != this->height ) { this->width = width; @@ -497,15 +504,6 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame, int64_t elap if ( frame != NULL ) mlt_frame_close( frame ); - if ( mlt_deque_count( this->queue ) && !skip ) - { - // Tell the producers about our scale relative to the normalisation - frame = mlt_deque_peek_front( this->queue ); - mlt_properties_set_double( mlt_frame_properties( frame ), "consumer_scale", - ( double )height / mlt_properties_get_double( properties, "height" ) ); - mlt_frame_get_image( frame, &image, &vfmt, &width, &height, 0 ); - } - return 0; } @@ -529,14 +527,16 @@ static void *consumer_thread( void *arg ) int64_t elapsed = 0; int duration = 0; int64_t playtime = 0; - int skip = 0; 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; } - + + SDL_EnableKeyRepeat( SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL ); + SDL_EnableUNICODE( 1 ); + // Loop until told not to while( this->running ) { @@ -546,12 +546,6 @@ static void *consumer_thread( void *arg ) // Ensure that we have a frame if ( frame != NULL ) { - skip = 0; - - // SDL adapts display aspect, but set this so pixel aspect can be normalised -// mlt_properties_set_double( mlt_frame_properties( frame ), "consumer_aspect_ratio", -// mlt_frame_get_aspect_ratio( frame ) ); - // Play audio init_audio = consumer_play_audio( this, frame, init_audio, &duration ); @@ -565,14 +559,9 @@ static void *consumer_thread( void *arg ) start = ( int64_t )now.time * 1000 + now.millitm; else elapsed = ( ( int64_t )now.time * 1000 + now.millitm ) - start; - - skip = playtime < elapsed; - - if ( skip ) - start = start + ( elapsed - playtime ); } - consumer_play_video( this, frame, elapsed, skip, playtime ); + consumer_play_video( this, frame, elapsed, playtime ); playtime += duration; }