#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 * 24 ];
+ uint8_t audio_buffer[ 4096 * 19 ];
int audio_avail;
pthread_mutex_t audio_mutex;
pthread_cond_t audio_cond;
int window_width;
int window_height;
float aspect_ratio;
+ float display_aspect;
int width;
int height;
int playing;
// 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", 1 );
+ mlt_properties_set_int( this->properties, "progressive", 0 );
- // Get aspect ratio
+ // 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;
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;
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;
}
request.freq = frequency;
request.format = AUDIO_S16;
request.channels = channels;
- request.samples = 4096;
+ request.samples = 1024;
request.callback = sdl_fill_audio;
request.userdata = (void *)this;
if ( SDL_OpenAudio( &request, &got ) != 0 )
{
fprintf( stderr, "SDL failed to open audio: %s\n", SDL_GetError() );
- mlt_properties_set_int( properties, "audio_off", 1 );
init_audio = 2;
}
else if ( got.size != 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, int64_t playtime )
+static int consumer_play_video( consumer_sdl this, mlt_frame frame )
{
- int error = 0;
// Get the properties of this consumer
mlt_properties properties = this->properties;
int width = this->width, height = this->height;
uint8_t *image;
int changed = 0;
- struct timeb now;
- ftime( &now );
- int64_t start = ( ( int64_t )now.time * 1000 + now.millitm );
-
- if ( mlt_properties_get_int( properties, "video_off" ) )
- {
- mlt_frame_close( frame );
- return 0;
- }
-
- if ( frame != NULL )
- {
- // Set playtime
- 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 );
- }
-
- if ( this->playing )
- {
- // We might want to use an old frame if the current frame is skipped
- mlt_frame candidate = NULL;
- frame = NULL;
-
- while ( frame == NULL && mlt_deque_count( this->queue ) )
- {
- frame = mlt_deque_peek_front( this->queue );
- playtime = mlt_properties_get_position( mlt_frame_properties( frame ), "playtime" );
-
- // Check if frame is in the future or past
- if ( playtime > elapsed + 500 )
- {
- // Too far in the future - play it now
- frame = mlt_deque_pop_front( this->queue );
- }
- else if ( playtime > elapsed + 160 )
- {
- // Time to squeeze a few more frames in
- frame = candidate;
- candidate = NULL;
- error = 1;
- break;
- }
- else if ( playtime < elapsed )
- {
- 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 );
- }
- }
-
- if ( frame == NULL )
- frame = candidate;
- else if ( candidate != NULL )
- mlt_frame_close( candidate );
- }
- else
- {
- if ( frame != NULL )
- mlt_frame_get_image( frame, &image, &vfmt, &width, &height, 0 );
- frame = NULL;
- }
- if ( this->playing && frame != NULL )
+ if ( mlt_properties_get_int( properties, "video_off" ) == 0 )
{
// Get the image, width and height
mlt_frame_get_image( frame, &image, &vfmt, &width, &height, 0 );
- ftime( &now );
- elapsed += ( ( int64_t )now.time * 1000 + now.millitm ) - start;
-
- playtime = mlt_properties_get_position( mlt_frame_properties( frame ), "playtime" );
- struct timespec slow = { 0, ( playtime - elapsed ) * 1000 };
- if ( slow.tv_nsec > 50 )
- nanosleep( &slow, NULL );
-
+
// Handle events
if ( this->sdl_screen != NULL )
{
this->window_height = event.resize.h;
changed = 1;
break;
+ case SDL_QUIT:
+ this->running = 0;
+ break;
case SDL_KEYDOWN:
{
mlt_producer producer = mlt_properties_get_data( properties, "transport_producer", NULL );
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;
+
+ // 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 ( mlt_properties_get_double( properties, "aspect_ratio" ) )
- aspect_ratio = mlt_properties_get_double( properties, "aspect_ratio" );
-
- if ( aspect_ratio == 1 )
+ // If using hardware scaler
+ if ( mlt_properties_get( properties, "rescale" ) != NULL &&
+ !strcmp( mlt_properties_get( properties, "rescale" ), "none" ) )
+ {
+ // 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 ) ) )
+ {
+ rect.w = this->window_width;
+ 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 )
+ {
+ rect.w = this->window_width;
+ rect.h = this_aspect / frame_aspect * this->window_height + 0.5;
+ }
+ }
+ }
+ // 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_height;
}
- else if ( this->window_width < this->window_height * aspect_ratio )
+ // Use hardware scaler to normalise sample aspect ratio
+ else if ( this->window_height * frame_aspect > this->window_width )
{
rect.w = this->window_width;
- rect.h = this->window_width / aspect_ratio;
+ rect.h = this->window_width / frame_aspect + 0.5;
}
else
{
- rect.w = this->window_height * aspect_ratio;
+ rect.w = this->window_height * frame_aspect + 0.5;
rect.h = this->window_height;
}
-
- if ( mlt_properties_get_int( properties, "scale_overlay" ) )
- {
- 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 );
- }
-
+
rect.x = ( this->window_width - rect.w ) / 2;
rect.y = ( this->window_height - rect.h ) / 2;
-
+
// Force an overlay recreation
if ( this->sdl_overlay != NULL )
SDL_FreeYUVOverlay( this->sdl_overlay );
if ( this->sdl_screen != NULL )
{
SDL_SetClipRect( this->sdl_screen, &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();
}
}
this->buffer = this->sdl_overlay->pixels[ 0 ];
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 );
}
}
// Close the frame
- if ( frame != NULL )
- mlt_frame_close( frame );
+ mlt_frame_close( frame );
- return error || frame == NULL;
+ return 0;
}
/** Threaded wrapper for pipe.
int init_audio = 1;
// Obtain time of thread start
- struct timeb now;
+ 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;
+ mlt_frame frame = NULL;
- // Initialise the SDL subsystem
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;
}
- // Additional initialisation
SDL_EnableKeyRepeat( SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL );
SDL_EnableUNICODE( 1 );
while( this->running )
{
// Get a frame from the attached producer
- mlt_frame frame = mlt_consumer_get_frame( consumer );
- mlt_frame video_frame = frame;
- int done = 0;
+ frame = mlt_consumer_rt_frame( consumer );
// Ensure that we have a frame
- while ( !done )
+ if ( frame != NULL )
{
// Play audio
- if ( sizeof( this->audio_buffer ) - this->audio_avail > 8192 || mlt_deque_count( this->queue ) < 2 )
- {
- init_audio = consumer_play_audio( this, frame, init_audio, &duration );
- done = 1;
- }
+ init_audio = consumer_play_audio( this, frame, init_audio, &duration );
if ( this->playing )
{
// Get the current time
- ftime( &now );
+ gettimeofday( &now, NULL );
// Determine elapsed time
if ( start == 0 )
- start = ( int64_t )now.time * 1000 + now.millitm;
+ start = ( int64_t )now.tv_sec * 1000000 + now.tv_usec;
else
- elapsed = ( ( int64_t )now.time * 1000 + now.millitm ) - start;
+ elapsed = ( ( int64_t )now.tv_sec * 1000000 + now.tv_usec) - start;
}
- if ( consumer_play_video( this, video_frame, elapsed, playtime ) )
+ // Set playtime for this frame
+ 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 );
+
+ // Calculate the next playtime
+ playtime += ( duration * 1000 );
+ }
+
+ if ( this->playing )
+ {
+ // Pop the next frame
+ next = mlt_deque_pop_front( this->queue );
+
+ // See if we have to delay the display of the current frame
+ if ( next != NULL && mlt_properties_get_int( mlt_frame_properties( next ), "rendered" ) == 1 )
{
- if ( !done )
+ mlt_position scheduled = mlt_properties_get_position( mlt_frame_properties( next ), "playtime" ) + 5000;
+ if ( scheduled > elapsed && mlt_deque_count( this->queue ) > 25 )
+ {
+ tm.tv_sec = ( scheduled - elapsed ) / 1000000;
+ tm.tv_nsec = ( ( scheduled - elapsed ) % 1000000 ) * 1000;
+ nanosleep( &tm, NULL );
+
+ // Show current frame
+ consumer_play_video( this, next );
+ }
+ else if ( scheduled > elapsed )
{
- init_audio = consumer_play_audio( this, frame, init_audio, &duration );
- done = 1;
+ // More time to kill
+ mlt_deque_push_front( this->queue, next );
+ }
+ else
+ {
+ // Show current frame
+ consumer_play_video( this, next );
}
}
-
- if ( video_frame != NULL )
+ else
{
- video_frame = NULL;
- playtime += duration;
+ // This is an unrendered frame - just close it
+ mlt_frame_close( next );
}
}
}
// 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 / mlt / blobdiff