X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fsdl%2Fconsumer_sdl.c;h=74cfd28cb67ad5ac0b2fc052e5a047cbac239493;hb=edfb53ebb1ce5b141e34b7feb7df7448cbc5be96;hp=1be99ce49fbd045e87dd02267efd15e0c6fecd60;hpb=0b288164cbeb9a3c98107d439d86844be13ba910;p=melted diff --git a/src/modules/sdl/consumer_sdl.c b/src/modules/sdl/consumer_sdl.c index 1be99ce..74cfd28 100644 --- a/src/modules/sdl/consumer_sdl.c +++ b/src/modules/sdl/consumer_sdl.c @@ -27,6 +27,7 @@ #include #include #include +#include /** This classes definition. */ @@ -40,7 +41,7 @@ struct consumer_sdl_s mlt_deque queue; pthread_t thread; int running; - uint8_t audio_buffer[ 4096 * 3 ]; + uint8_t audio_buffer[ 4096 * 19 ]; int audio_avail; pthread_mutex_t audio_mutex; pthread_cond_t audio_cond; @@ -54,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. @@ -101,6 +103,9 @@ 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", 8 ); + // Default progressive true mlt_properties_set_int( this->properties, "progressive", 1 ); @@ -113,9 +118,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 @@ -235,7 +240,7 @@ static void sdl_fill_audio( void *udata, uint8_t *stream, int len ) pthread_mutex_unlock( &this->audio_mutex ); } -static int consumer_play_audio( consumer_sdl this, mlt_frame frame, int init_audio ) +static int consumer_play_audio( consumer_sdl this, mlt_frame frame, int init_audio, int *duration ) { // Get the properties of this consumer mlt_properties properties = this->properties; @@ -254,6 +259,7 @@ static int consumer_play_audio( consumer_sdl this, mlt_frame frame, int init_aud int bytes; mlt_frame_get_audio( frame, &pcm, &afmt, &frequency, &channels, &samples ); + *duration = ( ( samples * 1000 ) / frequency ); if ( mlt_properties_get_int( properties, "audio_off" ) ) { @@ -266,16 +272,13 @@ 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; request.freq = frequency; request.format = AUDIO_S16; request.channels = channels; - request.samples = 1024; + request.samples = 4096; request.callback = sdl_fill_audio; request.userdata = (void *)this; if ( SDL_OpenAudio( &request, &got ) != 0 ) @@ -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 ) +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; @@ -329,23 +332,36 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame ) return 0; } + // Set skip + 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 ); + frame = NULL; if ( this->playing ) - { - // Get the frame at the front of the queue frame = mlt_deque_pop_front( this->queue ); + if ( this->playing && frame != NULL && mlt_properties_get_int( mlt_frame_properties( frame ), "rendered" ) == 1 ) + { + playtime = mlt_properties_get_position( mlt_frame_properties( frame ), "playtime" ); + // Get the image, width and height mlt_frame_get_image( frame, &image, &vfmt, &width, &height, 0 ); + if ( playtime > elapsed + 25000 ) + { + struct timespec tm = { ( playtime - elapsed ) / 1000000, ( ( playtime - elapsed ) % 1000000 ) * 1000 }; + nanosleep( &tm, 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 ) @@ -369,9 +385,8 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame ) break; } } - } - + if ( width != this->width || height != this->height ) { this->width = width; @@ -381,12 +396,12 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame ) 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 ) { @@ -396,11 +411,11 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame ) 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; } @@ -443,24 +458,11 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame ) } } } - else - { - frame = NULL; - } // Close the frame if ( frame != NULL ) mlt_frame_close( frame ); - if ( mlt_deque_count( this->queue ) ) - { - // 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; } @@ -478,27 +480,50 @@ static void *consumer_thread( void *arg ) // internal intialization int init_audio = 1; + // Obtain time of thread start + struct timeval now; + int64_t start = 0; + int64_t elapsed = 0; + int duration = 0; + int64_t playtime = 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 ) { // Get a frame from the attached producer - mlt_frame frame = mlt_consumer_get_frame( consumer ); + mlt_frame frame = mlt_consumer_rt_frame( consumer ); // Ensure that we have a frame if ( frame != NULL ) { - // 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 ) ); - - init_audio = consumer_play_audio( this, frame, init_audio ); - consumer_play_video( this, frame ); + // Play audio + init_audio = consumer_play_audio( this, frame, init_audio, &duration ); + + if ( this->playing ) + { + // Get the current time + gettimeofday( &now, NULL ); + + // 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; + + } + + consumer_play_video( this, frame, elapsed, playtime ); + + playtime += ( duration * 1000 ); } } @@ -578,4 +603,3 @@ static void consumer_close( mlt_consumer parent ) // Finally clean up this free( this ); } -