return;
}
+ if ((time() - video.second) > one_video_frame()) {
+ /* Too late; just drop this frame before we try to get its image (which will be the time-consuming
+ part if this frame is J2K).
+ */
+ _video_position = video.second;
+ return;
+ }
+
/* In an ideal world, what we would do here is:
*
* 1. convert to XYZ exactly as we do in the DCP creation path.
get ();
update_position_label ();
update_position_slider ();
- DCPTime const next = _video_position + DCPTime::from_frames (1, _film->video_frame_rate ());
+ DCPTime const next = _video_position + one_video_frame();
if (next >= _film->length()) {
stop ();
return;
}
+
DCPTime t (_slider->GetValue() * _film->length().get() / 4096);
/* Ensure that we hit the end of the film at the end of the slider */
if (t >= _film->length ()) {
- t = _film->length() - DCPTime::from_frames (1, _film->video_frame_rate ());
+ t = _film->length() - one_video_frame();
}
seek (t, false);
update_position_label ();
DCPTime
FilmViewer::nudge_amount (wxMouseEvent& ev)
{
- DCPTime amount = DCPTime::from_frames (1, _film->video_frame_rate ());
+ DCPTime amount = one_video_frame ();
if (ev.ShiftDown() && !ev.ControlDown()) {
amount = DCPTime::from_seconds (1);
{
_player->set_dcp_decode_reduction (reduction);
}
+
+DCPTime
+FilmViewer::one_video_frame () const
+{
+ return DCPTime::from_frames (1, _film->video_frame_rate());
+}
void start ();
bool stop ();
Frame average_latency () const;
+ DCPTime one_video_frame () const;
boost::shared_ptr<Film> _film;
boost::shared_ptr<Player> _player;
bool _playing;
boost::shared_ptr<Butler> _butler;
- std::list<Frame> _latency_history;
- /** Mutex to protect _latency_history */
- mutable boost::mutex _latency_history_mutex;
- int _latency_history_count;
+ std::list<Frame> _latency_history;
+ /** Mutex to protect _latency_history */
+ mutable boost::mutex _latency_history_mutex;
+ int _latency_history_count;
boost::signals2::scoped_connection _config_changed_connection;
};