X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fsdl%2Fconsumer_sdl.c;h=bdae25c13ab8d7fcad6459c3a7f4091bb928ad39;hb=bc14039bada8702953117bc424d00c2bf56d42f5;hp=1c8219370217974e2dba89a1185415ceab945572;hpb=6159bd78fa8e72c784747776a2c4c63d9c461ff5;p=melted diff --git a/src/modules/sdl/consumer_sdl.c b/src/modules/sdl/consumer_sdl.c index 1c82193..bdae25c 100644 --- a/src/modules/sdl/consumer_sdl.c +++ b/src/modules/sdl/consumer_sdl.c @@ -20,12 +20,14 @@ #include "consumer_sdl.h" #include +#include #include #include #include #include #include #include +#include /** This classes definition. */ @@ -36,11 +38,10 @@ struct consumer_sdl_s { struct mlt_consumer_s parent; mlt_properties properties; - int format; - int video; + mlt_deque queue; pthread_t thread; int running; - uint8_t audio_buffer[ 4096 * 3 ]; + uint8_t audio_buffer[ 4096 * 24 ]; int audio_avail; pthread_mutex_t audio_mutex; pthread_cond_t audio_cond; @@ -50,9 +51,6 @@ struct consumer_sdl_s int width; int height; int playing; - mlt_frame *queue; - int size; - int count; int sdl_flags; SDL_Surface *sdl_screen; SDL_Overlay *sdl_overlay; @@ -81,6 +79,9 @@ mlt_consumer consumer_sdl_init( char *arg ) // If no malloc'd and consumer init ok if ( this != NULL && mlt_consumer_init( &this->parent, this ) == 0 ) { + // Create the queue + this->queue = mlt_deque_init( ); + // Get the parent consumer object mlt_consumer parent = &this->parent; @@ -101,6 +102,12 @@ mlt_consumer consumer_sdl_init( char *arg ) // Default scaler (for now we'll use nearest) mlt_properties_set( this->properties, "rescale", "nearest" ); + // Default progressive true + mlt_properties_set_int( this->properties, "progressive", 1 ); + + // Get aspect ratio + this->aspect_ratio = mlt_properties_get_double( this->properties, "aspect_ratio" ); + // process actual param if ( arg == NULL || sscanf( arg, "%dx%d", &this->width, &this->height ) != 2 ) { @@ -108,13 +115,12 @@ mlt_consumer consumer_sdl_init( char *arg ) this->height = mlt_properties_get_int( this->properties, "height" ); } - // Default window size and aspect ratio - this->aspect_ratio = 4.0 / 3.0; + // Default window size this->window_width = (int)( (float)this->height * this->aspect_ratio ) + 1; this->window_height = this->height; - + // Set the sdl flags - this->sdl_flags = SDL_HWSURFACE | SDL_DOUBLEBUF | SDL_HWACCEL | SDL_RESIZABLE; + this->sdl_flags = SDL_HWSURFACE | SDL_ASYNCBLIT | SDL_HWACCEL | SDL_RESIZABLE; // Allow thread to be started/stopped parent->start = consumer_start; @@ -230,7 +236,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; @@ -249,6 +255,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" ) ) { @@ -261,21 +268,19 @@ 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 ) { 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 ) @@ -308,8 +313,9 @@ 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 ) { + int error = 0; // Get the properties of this consumer mlt_properties properties = this->properties; @@ -317,6 +323,9 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame ) 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" ) ) { @@ -324,33 +333,86 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame ) return 0; } - if ( this->count == this->size ) + if ( frame != NULL ) { - this->size += 25; - this->queue = realloc( this->queue, sizeof( mlt_frame ) * this->size ); + // 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" ) ); + + // Push this frame to the back of the queue + mlt_deque_push_back( this->queue, frame ); } - this->queue[ this->count ++ ] = frame; if ( this->playing ) { - // We're working on the oldest frame now - frame = this->queue[ 0 ]; + // We might want to use an old frame if the current frame is skipped + mlt_frame candidate = NULL; + frame = NULL; - // Shunt the frames in the queue down - int i = 0; - for ( i = 1; i < this->count; i ++ ) - this->queue[ i - 1 ] = this->queue[ i ]; - this->count --; + 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 ( 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 ( frame != NULL ) + mlt_frame_get_image( frame, &image, &vfmt, &width, &height, 0 ); + frame = NULL; + } + + 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 ); + // 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 ) @@ -374,9 +436,8 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame ) break; } } - } - + if ( width != this->width || height != this->height ) { this->width = width; @@ -442,25 +503,18 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame ) this->buffer = this->sdl_overlay->pixels[ 0 ]; if ( SDL_LockYUVOverlay( this->sdl_overlay ) >= 0 ) { - mlt_resize_yuv422( this->buffer, this->width - (this->width % 4 ), this->height- (this->height % 2 ), image, width, height ); + memcpy( this->buffer, image, width * height * 2 ); SDL_UnlockYUVOverlay( this->sdl_overlay ); SDL_DisplayYUVOverlay( this->sdl_overlay, &this->sdl_screen->clip_rect ); } } } - else - { - frame = NULL; - } // Close the frame if ( frame != NULL ) mlt_frame_close( frame ); - if ( this->count ) - mlt_frame_get_image( this->queue[ this->count - 1 ], &image, &vfmt, &width, &height, 0 ); - - return 0; + return error || frame == NULL; } /** Threaded wrapper for pipe. @@ -477,23 +531,68 @@ static void *consumer_thread( void *arg ) // internal intialization int init_audio = 1; + // Obtain time of thread start + struct timeb 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 ); + // 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 video_frame = frame; + int done = 0; // Ensure that we have a frame - if ( frame != NULL ) + while ( !done ) { - init_audio = consumer_play_audio( this, frame, init_audio ); - consumer_play_video( this, frame ); + // 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; + } + + if ( this->playing ) + { + // Get the current time + ftime( &now ); + + // Determine elapsed time + if ( start == 0 ) + start = ( int64_t )now.time * 1000 + now.millitm; + else + elapsed = ( ( int64_t )now.time * 1000 + now.millitm ) - 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; + } } } @@ -504,6 +603,9 @@ static void *consumer_thread( void *arg ) SDL_FreeYUVOverlay( this->sdl_overlay ); SDL_Quit( ); + while( mlt_deque_count( this->queue ) ) + mlt_frame_close( mlt_deque_pop_back( this->queue ) ); + this->sdl_screen = NULL; this->sdl_overlay = NULL; this->audio_avail = 0;