X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fsdl%2Fconsumer_sdl.c;h=589194adea7e728fec3030e599e90ccf9af7c41f;hb=2a800ec4c840132c7a629b764b673dce09771637;hp=3d4f53146de07a12156e911e9f3177ad8ac16e8e;hpb=abc466844ef298c20f1530c1f287de40445762a4;p=melted diff --git a/src/modules/sdl/consumer_sdl.c b/src/modules/sdl/consumer_sdl.c index 3d4f531..589194a 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 * 19 ]; 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; @@ -98,37 +99,31 @@ mlt_consumer consumer_sdl_init( char *arg ) pthread_mutex_init( &this->audio_mutex, NULL ); pthread_cond_init( &this->audio_cond, NULL); - // Default fps - mlt_properties_set_double( this->properties, "fps", 25 ); - // 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", 0 ); + + // Get aspect ratio + this->aspect_ratio = mlt_properties_get_double( this->properties, "aspect_ratio" ); + // process actual param - if ( arg == NULL || !strcmp( arg, "PAL" ) ) - { - this->width = 720; - this->height = 576; - } - else if ( !strcmp( arg, "NTSC" ) ) - { - this->width = 720; - this->height = 480; - mlt_properties_set_double( this->properties, "fps", 29.97 ); - } - else if ( sscanf( arg, "%dx%d", &this->width, &this->height ) != 2 ) + if ( arg == NULL || sscanf( arg, "%dx%d", &this->width, &this->height ) != 2 ) { - this->width = 720; - this->height = 576; + this->width = mlt_properties_get_int( this->properties, "width" ); + this->height = mlt_properties_get_int( this->properties, "height" ); } - - // Default window size and aspect ratio - this->aspect_ratio = 4.0 / 3.0; - this->window_width = (int)( (float)this->height * this->aspect_ratio ) + 1; + + // Default window size + this->window_width = (int)( (float)this->height * 4.0/3.0 + 0.5); 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; @@ -244,7 +239,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; @@ -263,10 +258,12 @@ 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" ) ) { this->playing = 1; + init_audio = 1; return init_audio; } @@ -275,9 +272,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; @@ -301,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 @@ -332,42 +326,18 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame ) uint8_t *image; int changed = 0; - if ( mlt_properties_get_int( properties, "video_off" ) ) + if ( mlt_properties_get_int( properties, "video_off" ) == 0 ) { - mlt_frame_close( frame ); - return 0; - } - - if ( this->count == this->size ) - { - this->size += 25; - this->queue = realloc( this->queue, sizeof( mlt_frame ) * this->size ); - } - this->queue[ this->count ++ ] = frame; - - if ( mlt_properties_get( properties, "rescale" ) != NULL ) - mlt_properties_set( mlt_frame_properties( frame ), "rescale.interp", mlt_properties_get( properties, "rescale" ) ); - - if ( this->playing ) - { - // We're working on the oldest frame now - frame = this->queue[ 0 ]; - - // 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 --; - // Get the image, width and height mlt_frame_get_image( frame, &image, &vfmt, &width, &height, 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 ) @@ -377,6 +347,9 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame ) 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 ); @@ -391,9 +364,8 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame ) break; } } - } - + if ( width != this->width || height != this->height ) { this->width = width; @@ -403,12 +375,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 ) { @@ -418,11 +390,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; } @@ -459,23 +431,15 @@ 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 ); + mlt_frame_close( frame ); return 0; } @@ -491,29 +455,96 @@ static void *consumer_thread( void *arg ) // Get the consumer mlt_consumer consumer = &this->parent; - // Get the service assoicated to the consumer - mlt_service service = mlt_consumer_service( consumer ); - - // Define a frame pointer - mlt_frame frame; - // 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; + struct timespec tm; + mlt_frame next = NULL; + mlt_frame frame = NULL; + 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 service (should never return anything other than 0) - if ( mlt_service_get_frame( service, &frame, 0 ) == 0 ) + // Get a frame from the attached producer + frame = mlt_consumer_rt_frame( consumer ); + + // Ensure that we have a frame + if ( frame != NULL ) + { + // 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; + } + + // 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 ) { - init_audio = consumer_play_audio( this, frame, init_audio ); - consumer_play_video( this, frame ); + // Pop the next frame + next = mlt_deque_pop_front( this->queue ); + + // 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 ); + } } } @@ -524,6 +555,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; @@ -590,4 +624,3 @@ static void consumer_close( mlt_consumer parent ) // Finally clean up this free( this ); } -