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;
// 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" );
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
pthread_attr_t thread_attributes;
this->running = 1;
+ this->joined = 0;
// Allow the user to force resizing to window size
if ( mlt_properties_get_int( this->properties, "resize" ) )
// 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 );
}
// 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;
pthread_mutex_unlock( &this->audio_mutex );
pthread_join( this->thread, NULL );
+ this->joined = 1;
}
return 0;
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;
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 );
}
}
}
- if ( width != this->width || height != this->height )
+ if ( width != this->width || height != this->height || this->last_frame_aspect != mlt_frame_get_aspect_ratio( frame ) )
{
this->width = width;
this->height = height;
+ this->last_frame_aspect = mlt_frame_get_aspect_ratio( frame );
changed = 1;
}
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;
}
}
}
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 )
{
this->rect.w = this->window_width;
- this->rect.h = this->window_width / frame_aspect + 0.5;
+ this->rect.h = this->window_width / this->display_aspect;
}
else
{
- this->rect.w = this->window_height * frame_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 )
{
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 )
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.
*/
// 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 )
{
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( );
// Specify the SDL Version
SDL_VERSION( &wm.version );
+ // Lock the display
+ sdl_lock_display();
+
// Get the wm structure
if ( SDL_GetWMInfo( &wm ) == 1 )
{
}
}
+ // Unlock the display
+ sdl_lock_display();
+
return changed;
}
projects / melted / blobdiff