Use an enum instead of a bool to specify blocking/non-blocking.

[dcpomatic.git] / src / wx / video_view.cc

diff --git a/src/wx/video_view.cc b/src/wx/video_view.cc
index 7e9e1a94723b11ff89a90d383494367a1e9cd068..1c645f11f688bd6adab4924c07ad9b0fcd25811c 100644 (file)
--- a/src/wx/video_view.cc
+++ b/src/wx/video_view.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2019 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2019-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,28 +18,32 @@
 
 */
 
+
 #include "video_view.h"
 #include "wx_util.h"
 #include "film_viewer.h"
 #include "lib/butler.h"
+#include "lib/dcpomatic_log.h"
+#include <boost/optional.hpp>
+#include <sys/time.h>
+
+
+using std::shared_ptr;
+using boost::optional;
+
+
+static constexpr int TOO_MANY_DROPPED_FRAMES = 20;
+static constexpr int TOO_MANY_DROPPED_PERIOD = 5.0;
 
-using boost::shared_ptr;
 
 VideoView::VideoView (FilmViewer* viewer)
        : _viewer (viewer)
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-       , _in_watermark (false)
-#endif
        , _state_timer ("viewer")
-       , _video_frame_rate (0)
-       , _eyes (EYES_LEFT)
-       , _three_d (false)
-       , _dropped (0)
-       , _gets (0)
 {
 
 }
 
+
 void
 VideoView::clear ()
 {
@@ -48,78 +52,96 @@ VideoView::clear ()
        _player_video.second = dcpomatic::DCPTime ();
 }
 
+
 /** Could be called from any thread.
  *  @param non_blocking true to return false quickly if no video is available quickly.
- *  @return false if we gave up because it would take too long, otherwise true.
+ *  @return FAIL if there's no frame, AGAIN if the method should be called again, or SUCCESS
+ *  if there is a frame.
  */
-bool
+VideoView::NextFrameResult
 VideoView::get_next_frame (bool non_blocking)
 {
        if (length() == dcpomatic::DCPTime()) {
-               return true;
+               return FAIL;
        }
 
-       shared_ptr<Butler> butler = _viewer->butler ();
-       DCPOMATIC_ASSERT (butler);
+       auto butler = _viewer->butler ();
+       if (!butler) {
+               return FAIL;
+       }
        add_get ();
 
        boost::mutex::scoped_lock lm (_mutex);
 
        do {
                Butler::Error e;
-               _player_video = butler->get_video (!non_blocking, &e);
-               if (!_player_video.first && e == Butler::AGAIN) {
-                       return false;
+               auto pv = butler->get_video (non_blocking ? Butler::Behaviour::NON_BLOCKING : Butler::Behaviour::BLOCKING, &e);
+               if (e.code == Butler::Error::Code::DIED) {
+                       LOG_ERROR ("Butler died with %1", e.summary());
                }
+               if (!pv.first) {
+                       return e.code == Butler::Error::Code::AGAIN ? AGAIN : FAIL;
+               }
+               _player_video = pv;
        } while (
                _player_video.first &&
                _three_d &&
                _eyes != _player_video.first->eyes() &&
-               _player_video.first->eyes() != EYES_BOTH
+               _player_video.first->eyes() != Eyes::BOTH
                );
 
-       return true;
+       if (_player_video.first && _player_video.first->error()) {
+               ++_errored;
+       }
+
+       return SUCCESS;
 }
 
+
 dcpomatic::DCPTime
 VideoView::one_video_frame () const
 {
        return dcpomatic::DCPTime::from_frames (1, video_frame_rate());
 }
 
-/** @return Time in ms until the next frame is due */
-int
+
+/** @return Time in ms until the next frame is due, or empty if nothing is due */
+optional<int>
 VideoView::time_until_next_frame () const
 {
        if (length() == dcpomatic::DCPTime()) {
                /* There's no content, so this doesn't matter */
-               return 0;
+               return optional<int>();
        }
 
-       dcpomatic::DCPTime const next = position() + one_video_frame();
-       dcpomatic::DCPTime const time = _viewer->audio_time().get_value_or(position());
+       auto const next = position() + one_video_frame();
+       auto const time = _viewer->audio_time().get_value_or(position());
        if (next < time) {
                return 0;
        }
        return (next.seconds() - time.seconds()) * 1000;
 }
 
+
 void
 VideoView::start ()
 {
        boost::mutex::scoped_lock lm (_mutex);
        _dropped = 0;
+       _errored = 0;
+       gettimeofday(&_dropped_check_period_start, nullptr);
 }
 
+
 bool
-VideoView::refresh_metadata (shared_ptr<const Film> film, dcp::Size video_container_size, dcp::Size film_frame_size)
+VideoView::reset_metadata (shared_ptr<const Film> film, dcp::Size player_video_container_size)
 {
-       boost::mutex::scoped_lock lm (_mutex);
-       if (!_player_video.first) {
+       auto pv = player_video ();
+       if (!pv.first) {
                return false;
        }
 
-       if (!_player_video.first->reset_metadata (film, video_container_size, film_frame_size)) {
+       if (!pv.first->reset_metadata(film, player_video_container_size)) {
                return false;
        }
 
@@ -127,3 +149,40 @@ VideoView::refresh_metadata (shared_ptr<const Film> film, dcp::Size video_contai
        return true;
 }
 
+
+void
+VideoView::add_dropped ()
+{
+       bool too_many = false;
+
+       {
+               boost::mutex::scoped_lock lm (_mutex);
+               ++_dropped;
+               if (_dropped > TOO_MANY_DROPPED_FRAMES) {
+                       struct timeval now;
+                       gettimeofday (&now, nullptr);
+                       double const elapsed = seconds(now) - seconds(_dropped_check_period_start);
+                       too_many = elapsed < TOO_MANY_DROPPED_PERIOD;
+                       _dropped = 0;
+                       _dropped_check_period_start = now;
+               }
+       }
+
+       if (too_many) {
+               emit (boost::bind(boost::ref(TooManyDropped)));
+       }
+}
+
+
+wxColour
+VideoView::pad_colour () const
+{
+       if (_viewer->pad_black()) {
+               return wxColour(0, 0, 0);
+       } else if (gui_is_dark()) {
+               return wxColour(50, 50, 50);
+       } else {
+               return wxColour(240, 240, 240);
+       }
+}
+