void
SimpleVideoView::timer ()
{
- if (!_viewer->film() || !_viewer->playing()) {
+ if (!_viewer->playing()) {
return;
}
- get (false);
+ display_next_frame (false);
DCPTime const next = _viewer->position() + _viewer->one_video_frame();
- if (next >= _viewer->film()->length()) {
+ if (next >= length()) {
_viewer->stop ();
_viewer->Finished ();
return;
}
LOG_DEBUG_PLAYER("%1 -> %2; delay %3", next.seconds(), _viewer->time().seconds(), max((next.seconds() - _viewer->time().seconds()) * 1000, 1.0));
- _timer.Start (max ((next.seconds() - _viewer->time().seconds()) * 1000, 1.0), wxTIMER_ONE_SHOT);
+ _timer.Start (time_until_next_frame(), wxTIMER_ONE_SHOT);
- if (_viewer->_butler) {
- _viewer->_butler->rethrow ();
+ if (_viewer->butler()) {
+ _viewer->butler()->rethrow ();
}
}
}
/** Try to get a frame from the butler and display it.
- * @param lazy true to return false quickly if no video is available quickly (i.e. we are waiting for the butler).
+ * @param non_blocking true to return false quickly if no video is available quickly (i.e. we are waiting for the butler).
* false to ask the butler to block until it has video (unless it is suspended).
* @return true on success, false if we did nothing because it would have taken too long.
*/
bool
-SimpleVideoView::get (bool lazy)
+SimpleVideoView::display_next_frame (bool non_blocking)
{
- DCPOMATIC_ASSERT (_viewer->_butler);
- _viewer->_gets++;
-
- do {
- Butler::Error e;
- _player_video = _viewer->_butler->get_video (!lazy, &e);
- if (!_player_video.first && e == Butler::AGAIN) {
- if (lazy) {
- /* No video available; return saying we failed */
- return false;
- } else {
- /* Player was suspended; come back later */
- signal_manager->when_idle (boost::bind(&SimpleVideoView::get, this, false));
- return false;
- }
+ bool r = get_next_frame (non_blocking);
+ if (!r) {
+ if (non_blocking) {
+ /* No video available; return saying we failed */
+ return false;
+ } else {
+ /* Player was suspended; come back later */
+ signal_manager->when_idle (boost::bind(&SimpleVideoView::display_next_frame, this, false));
+ return false;
}
- } while (
- _player_video.first &&
- _viewer->film()->three_d() &&
- _viewer->_eyes != _player_video.first->eyes() &&
- _player_video.first->eyes() != EYES_BOTH
- );
-
- try {
- _viewer->_butler->rethrow ();
- } catch (DecodeError& e) {
- error_dialog (get(), e.what());
}
display_player_video ();
- _viewer->PositionChanged ();
return true;
}
void
SimpleVideoView::display_player_video ()
{
- if (!_player_video.first) {
+ if (!player_video().first) {
set_image (shared_ptr<Image>());
_viewer->refresh_view ();
return;
}
- if (_viewer->playing() && (_viewer->time() - _player_video.second) > _viewer->one_video_frame()) {
+ if (_viewer->playing() && (_viewer->time() - player_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).
*/
- _viewer->_video_position = _player_video.second;
++_viewer->_dropped;
return;
}
_viewer->_state_timer.set ("get image");
set_image (
- _player_video.first->image(bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), false, true)
+ player_video().first->image(bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), false, true)
);
_viewer->_state_timer.set ("ImageChanged");
- _viewer->ImageChanged (_player_video.first);
+ _viewer->ImageChanged (player_video().first);
_viewer->_state_timer.unset ();
- _viewer->_video_position = _player_video.second;
- _viewer->_inter_position = _player_video.first->inter_position ();
- _viewer->_inter_size = _player_video.first->inter_size ();
+ _viewer->_inter_position = player_video().first->inter_position ();
+ _viewer->_inter_size = player_video().first->inter_size ();
_viewer->refresh_view ();