X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fsdl%2Fconsumer_sdl.c;h=e78e3295dd93733ab03d159364828269fa047c39;hb=363fbe3ecac63a0b932fa909c974b6e5d696f543;hp=0d483cf4721ed9a2d2eac10c11cb49673d80bb1a;hpb=980bd5cb1c17023459f0330397b817e18b9cb0c3;p=melted diff --git a/src/modules/sdl/consumer_sdl.c b/src/modules/sdl/consumer_sdl.c index 0d483cf..e78e329 100644 --- a/src/modules/sdl/consumer_sdl.c +++ b/src/modules/sdl/consumer_sdl.c @@ -40,6 +40,7 @@ struct consumer_sdl_s mlt_properties properties; mlt_deque queue; pthread_t thread; + int joined; int running; uint8_t audio_buffer[ 4096 * 10 ]; int audio_avail; @@ -51,6 +52,7 @@ struct consumer_sdl_s int window_height; float aspect_ratio; float display_aspect; + double last_frame_aspect; int width; int height; int playing; @@ -70,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. @@ -119,6 +122,9 @@ mlt_consumer consumer_sdl_init( char *arg ) // 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; @@ -128,27 +134,12 @@ mlt_consumer consumer_sdl_init( char *arg ) { this->width = mlt_properties_get_int( this->properties, "width" ); 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_height = this->height; - } - else - { - if ( (int)( ( float )this->width / this->height * 1000 ) != - (int)( this->display_aspect * 1000 ) ) - { - // Override these - this->display_aspect = ( float )this->width / this->height; - this->aspect_ratio = 1.0; - mlt_properties_set_double( this->properties, "aspect_ratio", this->aspect_ratio ); - } - - // Set window size - this->window_width = this->width; - this->window_height = this->height; } + // Default window size + this->window_width = ( float )this->height * this->display_aspect; + this->window_height = this->height; + // Set the sdl flags this->sdl_flags = SDL_HWSURFACE | SDL_ASYNCBLIT | SDL_HWACCEL | SDL_RESIZABLE | SDL_DOUBLEBUF; @@ -157,6 +148,9 @@ mlt_consumer consumer_sdl_init( char *arg ) 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; } @@ -168,6 +162,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; @@ -176,7 +176,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" ) ) @@ -188,7 +191,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 ); } @@ -200,7 +203,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; @@ -210,6 +213,7 @@ int consumer_stop( mlt_consumer parent ) pthread_mutex_unlock( &this->audio_mutex ); pthread_join( this->thread, NULL ); + this->joined = 1; } return 0; @@ -339,13 +343,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 ); } @@ -370,6 +377,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 @@ -381,6 +389,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: @@ -407,10 +417,14 @@ 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 ) && + ( 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; } @@ -437,12 +451,12 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame ) else { // Use hardware scaler to normalise display aspect ratio - this->rect.w = frame_aspect / this_aspect * this->window_width + 0.5; + this->rect.w = frame_aspect / this_aspect * this->window_width; this->rect.h = this->window_height; if ( this->rect.w > this->window_width ) { this->rect.w = this->window_width; - this->rect.h = this_aspect / frame_aspect * this->window_height + 0.5; + this->rect.h = this_aspect / frame_aspect * this->window_height; } } } @@ -457,23 +471,30 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame ) else if ( this->window_height * this->display_aspect > this->window_width ) { this->rect.w = this->window_width; - this->rect.h = this->window_width / this->display_aspect + 0.5; + this->rect.h = this->window_width / this->display_aspect; } else { - this->rect.w = this->window_height * this->display_aspect + 0.5; + this->rect.w = this->window_height * this->display_aspect; this->rect.h = this->window_height; } 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 ) { @@ -526,6 +547,9 @@ static void *video_thread( void *arg ) 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 ); @@ -562,7 +586,7 @@ static void *video_thread( void *arg ) mlt_position difference = scheduled - elapsed; // Smooth playback a bit - if ( difference > 20000 && speed == 1.0 ) + if ( real_time && ( difference > 20000 && speed == 1.0 ) ) { tm.tv_sec = difference / 1000000; tm.tv_nsec = ( difference % 1000000 ) * 500; @@ -570,11 +594,11 @@ static void *video_thread( void *arg ) } // Show current frame if not too old - if ( difference > -10000 || speed != 1.0 || mlt_deque_count( this->queue ) < 2 ) + 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 ( mlt_deque_count( this->queue ) == 0 && speed == 1.0 ) + 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; @@ -585,6 +609,8 @@ static void *video_thread( void *arg ) mlt_frame_close( next ); } + mlt_consumer_stopped( &this->parent ); + return NULL; } @@ -609,6 +635,7 @@ static void *consumer_thread( void *arg ) 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 ) { @@ -647,6 +674,9 @@ static void *consumer_thread( void *arg ) // 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 ); @@ -692,6 +722,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 ) { @@ -717,6 +750,9 @@ static int consumer_get_dimensions( int *width, int *height ) } } + // Unlock the display + sdl_lock_display(); + return changed; }