X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fsdl%2Fconsumer_sdl.c;h=d35e4a7869f24346a6ed46883d13cbd5bb85aaa8;hb=03fdfa6be1e0ff3c0a08b7587165ec32e99f1051;hp=1c8219370217974e2dba89a1185415ceab945572;hpb=6159bd78fa8e72c784747776a2c4c63d9c461ff5;p=melted diff --git a/src/modules/sdl/consumer_sdl.c b/src/modules/sdl/consumer_sdl.c index 1c82193..d35e4a7 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 * 6 ]; 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" ) ) { @@ -270,7 +277,7 @@ static int consumer_play_audio( consumer_sdl this, mlt_frame frame, int init_aud request.freq = frequency; request.format = AUDIO_S16; request.channels = channels; - request.samples = 1024; + request.samples = 2048; request.callback = sdl_fill_audio; request.userdata = (void *)this; if ( SDL_OpenAudio( &request, &got ) != 0 ) @@ -308,7 +315,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, int skip, int64_t playtime ) { // Get the properties of this consumer mlt_properties properties = this->properties; @@ -317,6 +324,7 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame ) int width = this->width, height = this->height; uint8_t *image; int changed = 0; + int show = 1; if ( mlt_properties_get_int( properties, "video_off" ) ) { @@ -324,59 +332,95 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame ) return 0; } - if ( this->count == this->size ) + // Handle events + if ( this->sdl_screen != NULL ) { - this->size += 25; - this->queue = realloc( this->queue, sizeof( mlt_frame ) * this->size ); + 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; + } + } } - this->queue[ this->count ++ ] = frame; - if ( this->playing ) - { - // We're working on the oldest frame now - frame = this->queue[ 0 ]; + // Set skip + mlt_properties_set_int( mlt_frame_properties( frame ), "skip", skip ); + mlt_properties_set_position( mlt_frame_properties( frame ), "playtime", playtime ); - // 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 --; + // Push this frame to the back of the queue + mlt_deque_push_back( this->queue, frame ); + frame = NULL; - // Get the image, width and height - mlt_frame_get_image( frame, &image, &vfmt, &width, &height, 0 ); + if ( this->playing ) + { + // We might want to use an old frame if the current frame is skipped + mlt_frame candidate = NULL; - if ( this->sdl_screen != NULL ) + while ( frame == NULL && mlt_deque_count( this->queue ) ) { - SDL_Event event; - - changed = consumer_get_dimensions( &this->window_width, &this->window_height ); + 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" ); - while ( SDL_PollEvent( &event ) ) + // Check if frame is in the future or past + if ( !show ) { - 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; - } + frame = mlt_deque_pop_front( this->queue ); + mlt_frame_close( frame ); + frame = NULL; + } + else if ( playtime > elapsed ) + { + // no frame to show or remove + frame = NULL; + break; + } + else if ( playtime < elapsed - 40 ) + { + 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 ); + } + + if ( this->playing && frame != NULL ) + { + // Get the image, width and height + mlt_frame_get_image( frame, &image, &vfmt, &width, &height, 0 ); + if ( width != this->width || height != this->height ) { this->width = width; @@ -442,23 +486,25 @@ 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 ); + 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; } @@ -477,6 +523,14 @@ 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; + 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() ); @@ -492,8 +546,35 @@ static void *consumer_thread( void *arg ) // Ensure that we have a frame if ( frame != NULL ) { - init_audio = consumer_play_audio( this, frame, init_audio ); - consumer_play_video( this, frame ); + 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 ); + + 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; + + skip = playtime < elapsed; + + if ( skip ) + start = start + ( elapsed - playtime ); + } + + consumer_play_video( this, frame, elapsed, skip, playtime ); + + playtime += duration; } } @@ -504,6 +585,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;