, _audio_channels (0)
, _audio_block_size (1024)
, _playing (false)
+ , _latency_history_count (0)
{
#ifndef __WXOSX__
_panel->SetDoubleBuffered (true);
in the preview.
*/
_player->set_always_burn_subtitles (true);
- _player->set_ignore_audio ();
_player->set_play_referenced ();
_film->Changed.connect (boost::bind (&FilmViewer::film_changed, this, _1));
_player->Changed.connect (boost::bind (&FilmViewer::player_changed, this, _1));
+ /* Keep about 1 second's worth of history samples */
+ _latency_history_count = _film->audio_frame_rate() / _audio_block_size;
+
recreate_butler ();
calculate_sizes ();
void
FilmViewer::get ()
{
- cout << "get!\n";
-
pair<shared_ptr<PlayerVideo>, DCPTime> video;
do {
video = _butler->get_video ();
- } while (_film->three_d() && ((_left_eye->GetValue() && video.first->eyes() == EYES_RIGHT) || (_right_eye->GetValue() && video.first->eyes() == EYES_LEFT)));
+ } while (
+ _film->three_d() &&
+ ((_left_eye->GetValue() && video.first->eyes() == EYES_RIGHT) || (_right_eye->GetValue() && video.first->eyes() == EYES_LEFT))
+ );
if (!video.first) {
+ _frame.reset ();
+ refresh_panel ();
return;
}
}
if (_audio.isStreamRunning ()) {
- DCPTime const now = time().ceil (_film->video_frame_rate ());
get ();
update_position_label ();
update_position_slider ();
- DCPTime const next = now + DCPTime::from_frames (1, _film->video_frame_rate ());
+ DCPTime const next = _video_position + DCPTime::from_frames (1, _film->video_frame_rate ());
+
+ if (next >= _film->length()) {
+ stop ();
+ }
+
_timer.Start (max ((next.seconds() - time().seconds()) * 1000, 0.0), wxTIMER_ONE_SHOT);
}
+
+ if (_butler) {
+ _butler->rethrow ();
+ }
}
void
}
if (_play_button->GetValue()) {
- _timer.Start (1000 / _film->video_frame_rate());
+ start ();
} else {
- _timer.Stop ();
+ stop ();
}
}
}
_playing = false;
+ _play_button->SetValue (false);
return true;
}
_outline_content->Enable (c);
_frame_number->Enable (c);
_timecode->Enable (c);
+ _jump_to_selected->Enable (c);
_left_eye->Enable (c && _film->three_d ());
_right_eye->Enable (c && _film->three_d ());
FilmViewer::time () const
{
if (_audio.isStreamRunning ()) {
- return DCPTime::from_seconds (const_cast<RtAudio*>(&_audio)->getStreamTime ());
+ return DCPTime::from_seconds (const_cast<RtAudio*>(&_audio)->getStreamTime ()) -
+ DCPTime::from_frames (average_latency(), _film->audio_frame_rate());
}
return _video_position;
FilmViewer::audio_callback (void* out_p, unsigned int frames)
{
_butler->get_audio (reinterpret_cast<float*> (out_p), frames);
+
+ boost::mutex::scoped_lock lm (_latency_history_mutex, boost::try_to_lock);
+ if (lm) {
+ _latency_history.push_back (_audio.getStreamLatency ());
+ if (_latency_history.size() > static_cast<size_t> (_latency_history_count)) {
+ _latency_history.pop_front ();
+ }
+ }
+
return 0;
}
+
+Frame
+FilmViewer::average_latency () const
+{
+ boost::mutex::scoped_lock lm (_latency_history_mutex);
+ if (_latency_history.empty()) {
+ return 0;
+ }
+
+ Frame total = 0;
+ BOOST_FOREACH (Frame i, _latency_history) {
+ total += i;
+ }
+
+ return total / _latency_history.size();
+}