mlt_deque queue;
pthread_t thread;
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;
int window_height;
float aspect_ratio;
float display_aspect;
+ double last_frame_aspect;
int width;
int height;
int playing;
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.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 + 0.5;
}
else
{
- this->rect.w = this->window_height * frame_aspect + 0.5;
+ this->rect.w = this->window_height * this->display_aspect + 0.5;
this->rect.h = this->window_height;
}
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();
}
}
mlt_frame next = NULL;
mlt_properties properties = NULL;
double speed = 0;
- int skipped = 0;
+
+ // Get real time flag
+ int real_time = mlt_properties_get_int( this->properties, "real_time" );
// Get the current time
gettimeofday( &now, NULL );
mlt_position difference = scheduled - elapsed;
// Smooth playback a bit
- if ( difference > 20000 && speed == 1.0 )
+ if ( real_time && ( difference > 20000 && speed == 1.0 ) )
{
tm.tv_sec = difference / 1000000;
tm.tv_nsec = ( difference % 1000000 ) * 500;
}
// Show current frame if not too old
- if ( difference > -10000 || speed != 1.0 || mlt_deque_count( this->queue ) < 2 )
+ if ( !real_time || ( difference > -10000 || speed != 1.0 || mlt_deque_count( this->queue ) < 2 ) )
consumer_play_video( this, next );
- else
- skipped ++;
// If the queue is empty, recalculate start to allow build up again
- if ( mlt_deque_count( this->queue ) == 0 )
+ 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;
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 )
{
// 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 );
// 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;
}