#include <pthread.h>
#include <SDL/SDL.h>
#include <SDL/SDL_syswm.h>
-#include <sys/timeb.h>
+#include <sys/time.h>
/** This classes definition.
*/
SDL_Surface *sdl_screen;
SDL_Overlay *sdl_overlay;
uint8_t *buffer;
+ int time_taken;
};
/** Forward references to static functions.
// 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", 8 );
+
// Default progressive true
mlt_properties_set_int( this->properties, "progressive", 1 );
this->width = mlt_properties_get_int( this->properties, "width" );
this->height = mlt_properties_get_int( this->properties, "height" );
}
-
+
// Default window size
- this->window_width = (int)( (float)this->height * this->aspect_ratio ) + 1;
+ this->window_width = (int)( (float)this->height * 4.0/3.0 + 0.5);
this->window_height = this->height;
// Set the sdl flags
SDL_AudioSpec request;
SDL_AudioSpec got;
- SDL_EnableKeyRepeat( SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL );
- SDL_EnableUNICODE( 1 );
-
// specify audio format
memset( &request, 0, sizeof( SDL_AudioSpec ) );
this->playing = 0;
request.freq = frequency;
request.format = AUDIO_S16;
request.channels = channels;
- request.samples = 2048;
+ request.samples = 1024;
request.callback = sdl_fill_audio;
request.userdata = (void *)this;
if ( SDL_OpenAudio( &request, &got ) != 0 )
uint8_t *image;
int changed = 0;
- struct timeb before;
- ftime( &before );
-
if ( mlt_properties_get_int( properties, "video_off" ) )
{
mlt_frame_close( frame );
// Set skip
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 );
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 );
- playtime = mlt_properties_get_position( mlt_frame_properties( frame ), "playtime" );
+ frame = mlt_deque_pop_front( this->queue );
- // Check if frame is in the future or past
- if ( playtime > elapsed + 60 || mlt_deque_count( this->queue ) < 12 )
- {
- // no frame to show or remove
- frame = NULL;
- break;
- }
- else if ( playtime < elapsed - 20 )
- {
- 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 );
- }
-
- if ( this->playing && frame != NULL )
+ if ( this->playing && frame != NULL && mlt_properties_get_int( mlt_frame_properties( frame ), "rendered" ) == 1 )
{
- //struct timeb after;
+ playtime = mlt_properties_get_position( mlt_frame_properties( frame ), "playtime" );
// Get the image, width and height
mlt_frame_get_image( frame, &image, &vfmt, &width, &height, 0 );
- //ftime( &after );
- //fprintf( stderr, "showing %lld at %lld\n", playtime, elapsed );
- //elapsed += ( ( int64_t )after.time * 1000 + after.millitm ) - ( ( int64_t )before.time * 1000 + before.millitm );
-
- //playtime = mlt_properties_get_position( mlt_frame_properties( frame ), "playtime" );
- //struct timespec slow = { 0, ( playtime - elapsed ) * 500 };
- //if ( slow.tv_nsec > 20000 )
- //nanosleep( &slow, NULL );
-
+ if ( playtime > elapsed + 25000 )
+ {
+ struct timespec tm = { ( playtime - elapsed ) / 1000000, ( ( playtime - elapsed ) % 1000000 ) * 1000 };
+ nanosleep( &tm, NULL );
+ }
// Handle events
if ( this->sdl_screen != NULL )
if ( this->sdl_screen == NULL || changed )
{
- double aspect_ratio = mlt_frame_get_aspect_ratio( frame );
- float display_aspect_ratio = (float)width / (float)height;
+ double aspect_ratio = ( float )this->aspect_ratio * this->width / this->height;
+ float display_aspect_ratio = ( float )width / height;
SDL_Rect rect;
-
- if ( mlt_properties_get_double( properties, "aspect_ratio" ) )
- aspect_ratio = mlt_properties_get_double( properties, "aspect_ratio" );
+ if ( mlt_properties_get( properties, "rescale" ) != NULL &&
+ !strcmp( mlt_properties_get( properties, "rescale" ), "none" ) )
+ aspect_ratio = mlt_frame_get_aspect_ratio( frame ) * mlt_properties_get_int(mlt_frame_properties(frame),"width") / mlt_properties_get_int(mlt_frame_properties(frame),"height");
if ( aspect_ratio == 1 )
{
else if ( this->window_width < this->window_height * aspect_ratio )
{
rect.w = this->window_width;
- rect.h = this->window_width / aspect_ratio;
+ rect.h = this->window_width / aspect_ratio + 1;
}
else
{
- rect.w = this->window_height * aspect_ratio;
+ rect.w = this->window_height * aspect_ratio + 1;
rect.h = this->window_height;
}
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;
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 );
+ mlt_frame frame = mlt_consumer_rt_frame( consumer );
// Ensure that we have a frame
if ( frame != NULL )
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;
+
}
consumer_play_video( this, frame, elapsed, playtime );
- playtime += duration;
+ playtime += ( duration * 1000 );
}
}
// Finally clean up this
free( this );
}
-
projects / melted / blobdiff