#include <pthread.h>
#include <SDL/SDL.h>
#include <SDL/SDL_syswm.h>
+#include <sys/timeb.h>
/** This classes definition.
*/
mlt_deque queue;
pthread_t thread;
int running;
- uint8_t audio_buffer[ 4096 * 3 ];
+ uint8_t audio_buffer[ 4096 * 19 ];
int audio_avail;
pthread_mutex_t audio_mutex;
pthread_cond_t audio_cond;
pthread_mutex_unlock( &this->audio_mutex );
}
-static int consumer_play_audio( consumer_sdl this, mlt_frame frame, int init_audio )
+static int consumer_play_audio( consumer_sdl this, mlt_frame frame, int init_audio, int *duration )
{
// Get the properties of this consumer
mlt_properties properties = this->properties;
int bytes;
mlt_frame_get_audio( frame, &pcm, &afmt, &frequency, &channels, &samples );
+ *duration = ( ( samples * 1000 ) / frequency );
if ( mlt_properties_get_int( properties, "audio_off" ) )
{
request.freq = frequency;
request.format = AUDIO_S16;
request.channels = channels;
- request.samples = 1024;
+ request.samples = 2048;
request.callback = sdl_fill_audio;
request.userdata = (void *)this;
if ( SDL_OpenAudio( &request, &got ) != 0 )
return init_audio;
}
-static int consumer_play_video( consumer_sdl this, mlt_frame frame )
+static int consumer_play_video( consumer_sdl this, mlt_frame frame, int64_t elapsed, int64_t playtime )
{
// Get the properties of this consumer
mlt_properties properties = this->properties;
uint8_t *image;
int changed = 0;
+ struct timeb before;
+ ftime( &before );
+
if ( mlt_properties_get_int( properties, "video_off" ) )
{
mlt_frame_close( frame );
return 0;
}
+ // 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 )
{
- // Get the frame at the front of the queue
- frame = mlt_deque_pop_front( this->queue );
+ // 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" );
+
+ // 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 )
+ {
+ //struct timeb after;
// 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 );
+
+
+ // Handle events
if ( this->sdl_screen != NULL )
{
SDL_Event event;
-
+
changed = consumer_get_dimensions( &this->window_width, &this->window_height );
-
+
while ( SDL_PollEvent( &event ) )
{
switch( event.type )
break;
}
}
-
}
-
+
if ( width != this->width || height != this->height )
{
this->width = width;
}
}
}
- else
- {
- frame = NULL;
- }
// Close the frame
if ( frame != NULL )
mlt_frame_close( frame );
- if ( mlt_deque_count( this->queue ) )
- {
- // 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 );
- }
-
return 0;
}
// internal intialization
int init_audio = 1;
+ // Obtain time of thread start
+ struct timeb now;
+ int64_t start = 0;
+ int64_t elapsed = 0;
+ int duration = 0;
+ int64_t playtime = 0;
+
if ( SDL_Init( SDL_INIT_VIDEO | SDL_INIT_AUDIO | SDL_INIT_NOPARACHUTE ) < 0 )
{
fprintf( stderr, "Failed to initialize SDL: %s\n", SDL_GetError() );
// Ensure that we have a frame
if ( frame != NULL )
{
- // 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 ) );
-
- init_audio = consumer_play_audio( this, frame, init_audio );
- consumer_play_video( this, frame );
+ // Play audio
+ init_audio = consumer_play_audio( this, frame, init_audio, &duration );
+
+ if ( this->playing )
+ {
+ // 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;
+ }
+
+ consumer_play_video( this, frame, elapsed, playtime );
+
+ playtime += duration;
}
}
projects / melted / blobdiff