X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fsdl%2Fconsumer_sdl.c;h=b06ca484fc9fdc459c59bd935dac949f2f340a0d;hb=5c299d1ae6f3535df35b3f30bae0476a1ca50aa6;hp=715833c79c1b45856b091e3f2c942b476ea2b76f;hpb=8a3795b090723264c973d274eedc28da480e76fd;p=melted diff --git a/src/modules/sdl/consumer_sdl.c b/src/modules/sdl/consumer_sdl.c index 715833c..b06ca48 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,13 +51,11 @@ 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; uint8_t *buffer; + int time_taken; }; /** Forward references to static functions. @@ -81,6 +80,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 +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 progressive true + mlt_properties_set_int( this->properties, "progressive", 1 ); + // Get aspect ratio this->aspect_ratio = mlt_properties_get_double( this->properties, "aspect_ratio" ); @@ -116,7 +121,7 @@ mlt_consumer consumer_sdl_init( char *arg ) 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; @@ -232,7 +237,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; @@ -251,6 +256,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" ) ) { @@ -263,16 +269,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 ) @@ -310,7 +313,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; @@ -326,33 +329,37 @@ static int consumer_play_video( consumer_sdl this, mlt_frame 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; + // Set 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 ); + frame = NULL; if ( this->playing ) - { - // We're working on the oldest frame now - frame = this->queue[ 0 ]; + frame = mlt_deque_pop_front( this->queue ); - // 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 --; + 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 + 20000 ) + { + 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 ) @@ -376,9 +383,8 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame ) break; } } - } - + if ( width != this->width || height != this->height ) { this->width = width; @@ -444,29 +450,17 @@ 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 ) - { - // Tell the producers about our scale relative to the normalisation - mlt_properties_set_double( mlt_frame_properties( this->queue[ this->count - 1 ] ), "consumer_scale", - ( double )height / mlt_properties_get_double( properties, "height" ) ); - mlt_frame_get_image( this->queue[ this->count - 1 ], &image, &vfmt, &width, &height, 0 ); - } - return 0; } @@ -484,27 +478,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, mlt_image_yuv422 ); // 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 ); } } @@ -515,8 +532,8 @@ static void *consumer_thread( void *arg ) SDL_FreeYUVOverlay( this->sdl_overlay ); SDL_Quit( ); - while( -- this->count >= 0 ) - mlt_frame_close( this->queue[ this->count ] ); + while( mlt_deque_count( this->queue ) ) + mlt_frame_close( mlt_deque_pop_back( this->queue ) ); this->sdl_screen = NULL; this->sdl_overlay = NULL;