#include <pthread.h>
#include <SDL/SDL.h>
#include <SDL/SDL_syswm.h>
-#include <sys/timeb.h>
+#include <sys/time.h>
/** This classes definition.
*/
mlt_deque queue;
pthread_t thread;
int running;
- uint8_t audio_buffer[ 4096 * 6 ];
+ 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;
};
// 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" );
+ // Default buffer for low latency
+ mlt_properties_set_int( this->properties, "buffer", 1 );
+
// Default progressive true
mlt_properties_set_int( this->properties, "progressive", 0 );
- // Get aspect ratio
+ // 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" );
+ // Default display aspect ratio
+ this->display_aspect = 4.0 / 3.0;
+
// process actual param
if ( arg == NULL || sscanf( arg, "%dx%d", &this->width, &this->height ) != 2 )
{
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 = (int)( (float)this->height * this->aspect_ratio ) + 1;
- this->window_height = this->height;
-
// 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;
if ( !this->running )
{
+ pthread_attr_t thread_attributes;
+
this->running = 1;
- pthread_create( &this->thread, NULL, consumer_thread, this );
+
+ // Allow the user to force resizing to window size
+ if ( mlt_properties_get_int( this->properties, "resize" ) )
+ {
+ mlt_properties_set_int( this->properties, "width", this->width );
+ mlt_properties_set_int( this->properties, "height", this->height );
+ }
+
+ // 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 );
}
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_audio_format afmt = mlt_audio_pcm;
// Set the preferred params of the test card signal
- int channels = 2;
- int frequency = 48000;
+ int channels = mlt_properties_get_int( properties, "channels" );
+ int frequency = mlt_properties_get_int( properties, "frequency" );
static int counter = 0;
- if ( mlt_properties_get_int( properties, "frequency" ) != 0 )
- frequency = mlt_properties_get_int( properties, "frequency" );
int samples = mlt_sample_calculator( mlt_properties_get_double( this->properties, "fps" ), frequency, counter++ );
if ( mlt_properties_get_int( properties, "audio_off" ) )
{
this->playing = 1;
+ init_audio = 1;
return init_audio;
}
SDL_AudioSpec request;
SDL_AudioSpec got;
- SDL_EnableKeyRepeat( SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL );
- SDL_EnableUNICODE( 1 );
+ int audio_buffer = mlt_properties_get_int( properties, "audio_buffer" );
// specify audio format
memset( &request, 0, sizeof( SDL_AudioSpec ) );
request.freq = frequency;
request.format = AUDIO_S16;
request.channels = channels;
- request.samples = 2048;
+ request.samples = audio_buffer;
request.callback = sdl_fill_audio;
request.userdata = (void *)this;
if ( SDL_OpenAudio( &request, &got ) != 0 )
if ( init_audio == 0 )
{
+ 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 ) )
pthread_cond_wait( &this->audio_cond, &this->audio_mutex );
- mlt_properties properties = mlt_frame_properties( frame );
if ( mlt_properties_get_double( properties, "_speed" ) == 1 )
memcpy( &this->audio_buffer[ this->audio_avail ], pcm, bytes );
else
return init_audio;
}
-static int consumer_play_video( consumer_sdl this, mlt_frame frame, int64_t elapsed, int skip, int64_t playtime )
+static int consumer_play_video( consumer_sdl this, mlt_frame frame )
{
// Get the properties of this consumer
mlt_properties properties = this->properties;
int width = this->width, height = this->height;
uint8_t *image;
int changed = 0;
- int show = 1;
-
- if ( mlt_properties_get_int( properties, "video_off" ) )
- {
- mlt_frame_close( frame );
- return 0;
- }
- // Handle events
- if ( this->sdl_screen != NULL )
+ if ( mlt_properties_get_int( properties, "video_off" ) == 0 )
{
- SDL_Event event;
-
- changed = consumer_get_dimensions( &this->window_width, &this->window_height );
-
- while ( SDL_PollEvent( &event ) )
+ // Get the image, width and height
+ mlt_frame_get_image( frame, &image, &vfmt, &width, &height, 0 );
+
+ // Handle events
+ if ( this->sdl_screen != NULL )
{
- switch( event.type )
+ SDL_Event event;
+
+ changed = consumer_get_dimensions( &this->window_width, &this->window_height );
+
+ while ( SDL_PollEvent( &event ) )
{
- 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 )
+ switch( event.type )
+ {
+ case SDL_VIDEORESIZE:
+ this->window_width = event.resize.w;
+ this->window_height = event.resize.h;
+ changed = 1;
+ break;
+ case SDL_QUIT:
+ this->running = 0;
+ break;
+ case SDL_KEYDOWN:
{
- keyboard[ 0 ] = ( char )event.key.keysym.unicode;
- callback( producer, keyboard );
+ 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;
- }
- }
- }
-
- // Set skip
- mlt_properties_set_int( mlt_frame_properties( frame ), "skip", skip );
- mlt_properties_set_position( mlt_frame_properties( frame ), "playtime", playtime );
-
- // Push this frame to the back of the queue
- mlt_deque_push_back( this->queue, frame );
- frame = NULL;
-
- if ( this->playing )
- {
- // We might want to use an old frame if the current frame is skipped
- mlt_frame candidate = NULL;
-
- while ( frame == NULL && mlt_deque_count( this->queue ) )
- {
- 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" );
-
- // Check if frame is in the future or past
- if ( !show )
- {
- 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 );
+ break;
+ }
}
}
-
- 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 )
+
+ 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;
}
if ( this->sdl_screen == NULL || changed )
{
- double aspect_ratio = mlt_frame_get_aspect_ratio( frame );
- float display_aspect_ratio = (float)width / (float)height;
- SDL_Rect rect;
-
- if ( mlt_properties_get_double( properties, "aspect_ratio" ) )
- aspect_ratio = mlt_properties_get_double( properties, "aspect_ratio" );
+ // Determine frame's display aspect ratio
+ float frame_aspect = mlt_frame_get_aspect_ratio( frame ) * this->width / this->height;
+
+ // Determine window's new display aspect ratio
+ float this_aspect = ( float )this->window_width / this->window_height;
- if ( aspect_ratio == 1 )
+ // If using hardware scaler
+ if ( mlt_properties_get( properties, "rescale" ) != NULL &&
+ !strcmp( mlt_properties_get( properties, "rescale" ), "none" ) )
{
- rect.w = this->window_width;
- rect.h = this->window_height;
+ // Special case optimisation to negate odd effect of sample aspect ratio
+ // not corresponding exactly with image resolution.
+ if ( ( (int)( this_aspect * 1000 ) == (int)( this->display_aspect * 1000 ) ) &&
+ ( (int)( mlt_frame_get_aspect_ratio( frame ) * 1000 ) == (int)( this->aspect_ratio * 1000 ) ) )
+ {
+ this->rect.w = this->window_width;
+ this->rect.h = this->window_height;
+ }
+ else
+ {
+ // Use hardware scaler to normalise display aspect ratio
+ 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;
+ }
+ }
}
- else if ( this->window_width < this->window_height * aspect_ratio )
+ // Special case optimisation to negate odd effect of sample aspect ratio
+ // 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_width / aspect_ratio;
+ this->rect.w = this->window_width;
+ this->rect.h = this->window_height;
}
- else
+ // Use hardware scaler to normalise sample aspect ratio
+ else if ( this->window_height * this->display_aspect > this->window_width )
{
- rect.w = this->window_height * aspect_ratio;
- rect.h = this->window_height;
+ this->rect.w = this->window_width;
+ this->rect.h = this->window_width / this->display_aspect + 0.5;
}
-
- if ( mlt_properties_get_int( properties, "scale_overlay" ) )
+ else
{
- if ( ( float )rect.w * display_aspect_ratio < this->window_width )
- rect.w = ( int )( ( float )rect.w * display_aspect_ratio );
- else if ( ( float )rect.h * display_aspect_ratio < this->window_height )
- rect.h = ( int )( ( float )rect.h * display_aspect_ratio );
+ this->rect.w = this->window_height * this->display_aspect + 0.5;
+ 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;
+
// 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->width % 4), this->height- (this->height % 2 ), SDL_YUY2_OVERLAY, this->sdl_screen );
+ 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 )
{
- memcpy( this->buffer, image, width * height * 2 );
+ if ( image != NULL )
+ memcpy( this->buffer, image, width * height * 2 );
SDL_UnlockYUVOverlay( this->sdl_overlay );
SDL_DisplayYUVOverlay( this->sdl_overlay, &this->sdl_screen->clip_rect );
}
+ sdl_unlock_display();
}
}
- // Close the frame
- if ( frame != NULL )
- mlt_frame_close( frame );
+ 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 the current time
+ gettimeofday( &now, NULL );
+
+ // Determine start time
+ start = ( int64_t )now.tv_sec * 1000000 + now.tv_usec;
- if ( mlt_deque_count( this->queue ) && !skip )
+ while ( this->running )
{
- // 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 );
+ // 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 ( 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 ( 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 )
+ {
+ 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 );
}
- return 0;
+ 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 timeb now;
- int64_t start = 0;
- int64_t elapsed = 0;
+ int init_video = 1;
+ mlt_frame frame = NULL;
+ mlt_properties properties = NULL;
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() );
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 );
+ frame = mlt_consumer_rt_frame( consumer );
// Ensure that we have a frame
if ( frame != NULL )
{
- skip = 0;
+ // Get the frame properties
+ properties = mlt_frame_properties( frame );
- // 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 )
+ // Determine the start time now
+ if ( this->playing && init_video )
{
- // 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;
+ // Create the video thread
+ pthread_create( &thread, NULL, video_thread, this );
- if ( skip )
- start = start + ( elapsed - playtime );
+ // Video doesn't need to be initialised any more
+ init_video = 0;
}
- consumer_play_video( this, frame, elapsed, skip, playtime );
+ // Set playtime for this frame
+ mlt_properties_set_position( properties, "playtime", playtime );
- playtime += duration;
+ // 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 );
}
}
+ // 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;
}
// Stop the consumer
mlt_consumer_stop( parent );
+ // Close the queue
+ mlt_deque_close( this->queue );
+
// Destroy mutexes
pthread_mutex_destroy( &this->audio_mutex );
pthread_cond_destroy( &this->audio_cond );
// Finally clean up this
free( this );
}
-
projects / melted / blobdiff