X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fsdl%2Fconsumer_sdl.c;h=dfce3d1ad10a3268192f6726af71f65e3c1a427d;hb=4c96cb2b639338d6308dd473983b9b4cbb9e27c9;hp=b2dcd900df8c098dfa132ca079b95527dbe8b388;hpb=a038d8a6f14b30dd52242d2f69601e6393e44475;p=melted diff --git a/src/modules/sdl/consumer_sdl.c b/src/modules/sdl/consumer_sdl.c index b2dcd90..dfce3d1 100644 --- a/src/modules/sdl/consumer_sdl.c +++ b/src/modules/sdl/consumer_sdl.c @@ -40,21 +40,26 @@ struct consumer_sdl_s mlt_properties properties; mlt_deque queue; pthread_t thread; + int joined; int running; - uint8_t audio_buffer[ 4096 * 19 ]; + uint8_t audio_buffer[ 4096 * 10 ]; int audio_avail; pthread_mutex_t audio_mutex; pthread_cond_t audio_cond; + pthread_mutex_t video_mutex; + pthread_cond_t video_cond; int window_width; int window_height; float aspect_ratio; float display_aspect; + double last_frame_aspect; int width; int height; int playing; int sdl_flags; SDL_Surface *sdl_screen; SDL_Overlay *sdl_overlay; + SDL_Rect rect; uint8_t *buffer; }; @@ -67,6 +72,7 @@ static int consumer_is_stopped( mlt_consumer parent ); static void consumer_close( mlt_consumer parent ); static void *consumer_thread( void * ); static int consumer_get_dimensions( int *width, int *height ); +static void consumer_sdl_event( mlt_listener listener, mlt_properties owner, mlt_service this, void **args ); /** This is what will be called by the factory - anything can be passed in via the argument, but keep it simple. @@ -99,6 +105,8 @@ mlt_consumer consumer_sdl_init( char *arg ) // This is the initialisation of the consumer pthread_mutex_init( &this->audio_mutex, NULL ); pthread_cond_init( &this->audio_cond, NULL); + pthread_mutex_init( &this->video_mutex, NULL ); + pthread_cond_init( &this->video_cond, NULL); // Default scaler (for now we'll use nearest) mlt_properties_set( this->properties, "rescale", "nearest" ); @@ -109,8 +117,14 @@ mlt_consumer consumer_sdl_init( char *arg ) // Default progressive true mlt_properties_set_int( this->properties, "progressive", 0 ); + // Default audio buffer + mlt_properties_set_int( this->properties, "audio_buffer", 1024 ); + // Get sample aspect ratio this->aspect_ratio = mlt_properties_get_double( this->properties, "aspect_ratio" ); + + // Ensure we don't join on a non-running object + this->joined = 1; // Default display aspect ratio this->display_aspect = 4.0 / 3.0; @@ -122,7 +136,7 @@ mlt_consumer consumer_sdl_init( char *arg ) this->height = mlt_properties_get_int( this->properties, "height" ); // Default window size - this->window_width = ( float )this->height * this->display_aspect + 0.5; + this->window_width = ( float )this->height * this->display_aspect; this->window_height = this->height; } else @@ -142,13 +156,16 @@ mlt_consumer consumer_sdl_init( char *arg ) } // Set the sdl flags - this->sdl_flags = SDL_HWSURFACE | SDL_ASYNCBLIT | SDL_HWACCEL | SDL_RESIZABLE; + this->sdl_flags = SDL_HWSURFACE | SDL_ASYNCBLIT | SDL_HWACCEL | SDL_RESIZABLE | SDL_DOUBLEBUF; // Allow thread to be started/stopped parent->start = consumer_start; parent->stop = consumer_stop; parent->is_stopped = consumer_is_stopped; + // Register specific events + mlt_events_register( this->properties, "consumer-sdl-event", ( mlt_transmitter )consumer_sdl_event ); + // Return the consumer produced return parent; } @@ -160,6 +177,12 @@ mlt_consumer consumer_sdl_init( char *arg ) return NULL; } +static void consumer_sdl_event( mlt_listener listener, mlt_properties owner, mlt_service this, void **args ) +{ + if ( listener != NULL ) + listener( owner, this, ( SDL_Event * )args[ 0 ] ); +} + int consumer_start( mlt_consumer parent ) { consumer_sdl this = parent->child; @@ -168,7 +191,10 @@ int consumer_start( mlt_consumer parent ) { pthread_attr_t thread_attributes; + consumer_stop( parent ); + this->running = 1; + this->joined = 0; // Allow the user to force resizing to window size if ( mlt_properties_get_int( this->properties, "resize" ) ) @@ -180,7 +206,7 @@ int consumer_start( mlt_consumer parent ) // Inherit the scheduling priority pthread_attr_init( &thread_attributes ); pthread_attr_setinheritsched( &thread_attributes, PTHREAD_INHERIT_SCHED ); - + pthread_create( &this->thread, &thread_attributes, consumer_thread, this ); } @@ -192,7 +218,7 @@ int consumer_stop( mlt_consumer parent ) // Get the actual object consumer_sdl this = parent->child; - if ( this->running ) + if ( this->joined == 0 ) { // Kill the thread and clean up this->running = 0; @@ -202,6 +228,7 @@ int consumer_stop( mlt_consumer parent ) pthread_mutex_unlock( &this->audio_mutex ); pthread_join( this->thread, NULL ); + this->joined = 1; } return 0; @@ -242,7 +269,7 @@ static void sdl_fill_audio( void *udata, uint8_t *stream, int len ) if ( this->audio_avail >= len ) { // Place in the audio buffer - SDL_MixAudio( stream, this->audio_buffer, len, ( int )( ( float )SDL_MIX_MAXVOLUME * volume ) ); + memcpy( stream, this->audio_buffer, len ); // Remove len from the audio available this->audio_avail -= len; @@ -303,13 +330,15 @@ static int consumer_play_audio( consumer_sdl this, mlt_frame frame, int init_aud SDL_AudioSpec request; SDL_AudioSpec got; + int audio_buffer = mlt_properties_get_int( properties, "audio_buffer" ); + // 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 = audio_buffer; request.callback = sdl_fill_audio; request.userdata = (void *)this; if ( SDL_OpenAudio( &request, &got ) != 0 ) @@ -329,13 +358,16 @@ static int consumer_play_audio( consumer_sdl this, mlt_frame frame, int init_aud 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 ) ) + while ( this->running && bytes > ( sizeof( this->audio_buffer) - this->audio_avail ) ) pthread_cond_wait( &this->audio_cond, &this->audio_mutex ); - if ( mlt_properties_get_double( properties, "_speed" ) == 1 ) - memcpy( &this->audio_buffer[ this->audio_avail ], pcm, bytes ); - else - memset( &this->audio_buffer[ this->audio_avail ], 0, bytes ); - this->audio_avail += bytes; + if ( this->running ) + { + if ( mlt_properties_get_double( properties, "_speed" ) == 1 ) + memcpy( &this->audio_buffer[ this->audio_avail ], pcm, bytes ); + else + memset( &this->audio_buffer[ this->audio_avail ], 0, bytes ); + this->audio_avail += bytes; + } pthread_cond_broadcast( &this->audio_cond ); pthread_mutex_unlock( &this->audio_mutex ); } @@ -360,6 +392,7 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame ) if ( mlt_properties_get_int( properties, "video_off" ) == 0 ) { // Get the image, width and height + mlt_events_fire( properties, "consumer-frame-show", frame, NULL ); mlt_frame_get_image( frame, &image, &vfmt, &width, &height, 0 ); // Handle events @@ -371,6 +404,8 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame ) while ( SDL_PollEvent( &event ) ) { + mlt_events_fire( this->properties, "consumer-sdl-event", &event, NULL ); + switch( event.type ) { case SDL_VIDEORESIZE: @@ -397,17 +432,20 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame ) } } - if ( width != this->width || height != this->height ) + if ( width != this->width || height != this->height || + ( int )( this->last_frame_aspect * 1000 ) != ( int )( mlt_frame_get_aspect_ratio( frame ) * 1000 ) ) { - this->width = width; - this->height = height; - changed = 1; + if ( mlt_frame_get_aspect_ratio( frame ) != 1.0 || this->last_frame_aspect == 0.0 ) + { + this->width = width; + this->height = height; + this->last_frame_aspect = mlt_frame_get_aspect_ratio( frame ); + changed = 1; + } } if ( this->sdl_screen == NULL || changed ) { - SDL_Rect rect; - // Determine frame's display aspect ratio float frame_aspect = mlt_frame_get_aspect_ratio( frame ) * this->width / this->height; @@ -423,18 +461,18 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame ) if ( ( (int)( this_aspect * 1000 ) == (int)( this->display_aspect * 1000 ) ) && ( (int)( mlt_frame_get_aspect_ratio( frame ) * 1000 ) == (int)( this->aspect_ratio * 1000 ) ) ) { - rect.w = this->window_width; - rect.h = this->window_height; + this->rect.w = this->window_width; + this->rect.h = this->window_height; } else { // Use hardware scaler to normalise display aspect ratio - rect.w = frame_aspect / this_aspect * this->window_width + 0.5; - rect.h = this->window_height; - if ( rect.w > this->window_width ) + this->rect.w = frame_aspect / this_aspect * this->window_width; + this->rect.h = this->window_height; + if ( this->rect.w > this->window_width ) { - rect.w = this->window_width; - rect.h = this_aspect / frame_aspect * this->window_height + 0.5; + this->rect.w = this->window_width; + this->rect.h = this_aspect / frame_aspect * this->window_height; } } } @@ -442,43 +480,61 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame ) // not corresponding exactly with image resolution. else if ( (int)( this_aspect * 1000 ) == (int)( this->display_aspect * 1000 ) ) { - rect.w = this->window_width; - rect.h = this->window_height; + this->rect.w = this->window_width; + this->rect.h = this->window_height; } // Use hardware scaler to normalise sample aspect ratio - else if ( this->window_height * frame_aspect > this->window_width ) + else if ( this->window_height * this->display_aspect > this->window_width ) { - rect.w = this->window_width; - rect.h = this->window_width / frame_aspect + 0.5; + this->rect.w = this->window_width; + this->rect.h = this->window_width / this->display_aspect; } else { - rect.w = this->window_height * frame_aspect + 0.5; - rect.h = this->window_height; + this->rect.w = this->window_height * this->display_aspect; + this->rect.h = this->window_height; } - rect.x = ( this->window_width - rect.w ) / 2; - rect.y = ( this->window_height - rect.h ) / 2; + this->rect.x = ( this->window_width - this->rect.w ) / 2; + this->rect.y = ( this->window_height - this->rect.h ) / 2; + + mlt_properties_set_int( this->properties, "rect_x", this->rect.x ); + mlt_properties_set_int( this->properties, "rect_y", this->rect.y ); + mlt_properties_set_int( this->properties, "rect_w", this->rect.w ); + mlt_properties_set_int( this->properties, "rect_h", this->rect.h ); // Force an overlay recreation if ( this->sdl_overlay != NULL ) SDL_FreeYUVOverlay( this->sdl_overlay ); // open SDL window with video overlay, if possible + sdl_lock_display(); this->sdl_screen = SDL_SetVideoMode( this->window_width, this->window_height, 0, this->sdl_flags ); + sdl_unlock_display(); if ( this->sdl_screen != NULL ) { - SDL_SetClipRect( this->sdl_screen, &rect ); + SDL_SetClipRect( this->sdl_screen, &this->rect ); sdl_lock_display(); this->sdl_overlay = SDL_CreateYUVOverlay( this->width, this->height, SDL_YUY2_OVERLAY, this->sdl_screen ); sdl_unlock_display(); } } + if ( mlt_properties_get_int( properties, "changed" ) ) + { + sdl_lock_display(); + this->sdl_screen = SDL_SetVideoMode( this->window_width, this->window_height, 0, this->sdl_flags ); + SDL_SetClipRect( this->sdl_screen, &this->rect ); + SDL_Flip( this->sdl_screen ); + sdl_unlock_display(); + mlt_properties_set_int( properties, "changed", 0 ); + } + if ( this->sdl_screen != NULL && this->sdl_overlay != NULL ) { this->buffer = this->sdl_overlay->pixels[ 0 ]; + sdl_lock_display(); if ( SDL_LockYUVOverlay( this->sdl_overlay ) >= 0 ) { if ( image != NULL ) @@ -486,12 +542,94 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame ) SDL_UnlockYUVOverlay( this->sdl_overlay ); SDL_DisplayYUVOverlay( this->sdl_overlay, &this->sdl_screen->clip_rect ); } + sdl_unlock_display(); } } return 0; } +static void *video_thread( void *arg ) +{ + // Identify the arg + consumer_sdl this = arg; + + // Obtain time of thread start + struct timeval now; + int64_t start = 0; + int64_t elapsed = 0; + struct timespec tm; + mlt_frame next = NULL; + mlt_properties properties = NULL; + double speed = 0; + + // Get real time flag + int real_time = mlt_properties_get_int( this->properties, "real_time" ); + + // Get the current time + gettimeofday( &now, NULL ); + + // Determine start time + start = ( int64_t )now.tv_sec * 1000000 + now.tv_usec; + + while ( this->running ) + { + // Pop the next frame + pthread_mutex_lock( &this->video_mutex ); + while ( ( next = mlt_deque_pop_front( this->queue ) ) == NULL && this->running ) + pthread_cond_wait( &this->video_cond, &this->video_mutex ); + pthread_mutex_unlock( &this->video_mutex ); + + // Get the properties + properties = mlt_frame_properties( next ); + + // Get the speed of the frame + speed = mlt_properties_get_double( properties, "_speed" ); + + // Get the current time + gettimeofday( &now, NULL ); + + // Get the elapsed time + elapsed = ( ( int64_t )now.tv_sec * 1000000 + now.tv_usec ) - start; + + // See if we have to delay the display of the current frame + if ( mlt_properties_get_int( properties, "rendered" ) == 1 && this->running ) + { + // Obtain the scheduled playout time + mlt_position scheduled = mlt_properties_get_position( properties, "playtime" ); + + // Determine the difference between the elapsed time and the scheduled playout time + mlt_position difference = scheduled - elapsed; + + // Smooth playback a bit + if ( real_time && ( difference > 20000 && speed == 1.0 ) ) + { + tm.tv_sec = difference / 1000000; + tm.tv_nsec = ( difference % 1000000 ) * 500; + nanosleep( &tm, NULL ); + } + + // Show current frame if not too old + if ( !real_time || ( difference > -10000 || speed != 1.0 || mlt_deque_count( this->queue ) < 2 ) ) + consumer_play_video( this, next ); + + // If the queue is empty, recalculate start to allow build up again + if ( real_time && ( mlt_deque_count( this->queue ) == 0 && speed == 1.0 ) ) + { + gettimeofday( &now, NULL ); + start = ( ( int64_t )now.tv_sec * 1000000 + now.tv_usec ) - scheduled + 20000; + } + } + + // This frame can now be closed + mlt_frame_close( next ); + } + + mlt_consumer_stopped( &this->parent ); + + return NULL; +} + /** Threaded wrapper for pipe. */ @@ -503,19 +641,17 @@ static void *consumer_thread( void *arg ) // Get the consumer mlt_consumer consumer = &this->parent; + // Video thread + pthread_t thread; + // 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; + int init_video = 1; mlt_frame frame = NULL; mlt_properties properties = NULL; + int duration = 0; + int64_t playtime = 0; + struct timespec tm = { 0, 100000 }; if ( SDL_Init( SDL_INIT_VIDEO | SDL_INIT_AUDIO | SDL_INIT_NOPARACHUTE ) < 0 ) { @@ -542,81 +678,42 @@ static void *consumer_thread( void *arg ) init_audio = consumer_play_audio( this, frame, init_audio, &duration ); // Determine the start time now - if ( this->playing && start == 0 ) + if ( this->playing && init_video ) { - // Get the current time - gettimeofday( &now, NULL ); + // Create the video thread + pthread_create( &thread, NULL, video_thread, this ); - // Determine start time - start = ( int64_t )now.tv_sec * 1000000 + now.tv_usec; + // Video doesn't need to be initialised any more + init_video = 0; } // Set playtime for this frame mlt_properties_set_position( properties, "playtime", playtime ); + while ( this->running && mlt_deque_count( this->queue ) > 15 ) + nanosleep( &tm, NULL ); + // Push this frame to the back of the queue + pthread_mutex_lock( &this->video_mutex ); mlt_deque_push_back( this->queue, frame ); + pthread_cond_broadcast( &this->video_cond ); + pthread_mutex_unlock( &this->video_mutex ); // Calculate the next playtime playtime += ( duration * 1000 ); } + } - // Pop the next frame - next = mlt_deque_pop_front( this->queue ); - - while ( next != NULL && this->playing ) - { - // Get the properties - properties = mlt_frame_properties( next ); - - // Get the current time - gettimeofday( &now, NULL ); - - // Get the elapsed time - elapsed = ( ( int64_t )now.tv_sec * 1000000 + now.tv_usec ) - start; - - // See if we have to delay the display of the current frame - if ( mlt_properties_get_int( properties, "rendered" ) == 1 ) - { - // Obtain the scheduled playout time - mlt_position scheduled = mlt_properties_get_position( properties, "playtime" ); - - // Determine the difference between the elapsed time and the scheduled playout time - mlt_position difference = scheduled - elapsed; - - // If the frame is quite some way in the future, go get another - if ( difference > 80000 && mlt_deque_count( this->queue ) < 6 ) - break; - - // Smooth playback a bit - if ( difference > 20000 && mlt_properties_get_double( properties, "_speed" ) == 1.0 ) - { - tm.tv_sec = difference / 1000000; - tm.tv_nsec = ( difference % 1000000 ) * 1000; - nanosleep( &tm, NULL ); - } - - // Show current frame if not too old - if ( difference > -10000 || mlt_properties_get_double( properties, "_speed" ) != 1.0 ) - consumer_play_video( this, next ); - else - start = start - difference; - } - - // This is an unrendered frame - just close it - mlt_frame_close( next ); - - // Pop the next frame - next = mlt_deque_pop_front( this->queue ); - } - - if ( next != NULL ) - mlt_deque_push_front( this->queue, next ); + // Kill the video thread + if ( init_video == 0 ) + { + pthread_mutex_lock( &this->video_mutex ); + pthread_cond_broadcast( &this->video_cond ); + pthread_mutex_unlock( &this->video_mutex ); + pthread_join( thread, NULL ); } // internal cleanup - if ( init_audio == 0 ) - SDL_AudioQuit( ); if ( this->sdl_overlay != NULL ) SDL_FreeYUVOverlay( this->sdl_overlay ); SDL_Quit( ); @@ -641,6 +738,9 @@ static int consumer_get_dimensions( int *width, int *height ) // Specify the SDL Version SDL_VERSION( &wm.version ); + // Lock the display + sdl_lock_display(); + // Get the wm structure if ( SDL_GetWMInfo( &wm ) == 1 ) { @@ -666,6 +766,9 @@ static int consumer_get_dimensions( int *width, int *height ) } } + // Unlock the display + sdl_lock_display(); + return changed; }