Support subs and tidy up a few things.

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

diff --git a/src/wx/video_view.cc b/src/wx/video_view.cc
index 3e21e709dd2b5fc1749540ed9c4087d5aeddb20c..4d80e2535248ceaccc35621bfa6c59435c3768b8 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,30 +18,33 @@
 
 */
 
+
 #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::pair;
 using std::shared_ptr;
 using boost::optional;
 
+
+static constexpr int TOO_MANY_DROPPED_FRAMES = 20;
+static constexpr int TOO_MANY_DROPPED_PERIOD = 5.0;
+
+
 VideoView::VideoView (FilmViewer* viewer)
        : _viewer (viewer)
        , _state_timer ("viewer")
-       , _video_frame_rate (0)
-       , _eyes (Eyes::LEFT)
-       , _three_d (false)
-       , _dropped (0)
-       , _errored (0)
-       , _gets (0)
 {
 
 }
 
+
 void
 VideoView::clear ()
 {
@@ -50,6 +53,7 @@ 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 FAIL if there's no frame, AGAIN if the method should be called again, or SUCCESS
@@ -62,7 +66,7 @@ VideoView::get_next_frame (bool non_blocking)
                return FAIL;
        }
 
-       shared_ptr<Butler> butler = _viewer->butler ();
+       auto butler = _viewer->butler ();
        if (!butler) {
                return FAIL;
        }
@@ -72,7 +76,7 @@ VideoView::get_next_frame (bool non_blocking)
 
        do {
                Butler::Error e;
-               pair<shared_ptr<PlayerVideo>, dcpomatic::DCPTime> pv = butler->get_video (!non_blocking, &e);
+               auto pv = butler->get_video (!non_blocking, &e);
                if (e.code == Butler::Error::DIED) {
                        LOG_ERROR ("Butler died with %1", e.summary());
                }
@@ -94,12 +98,14 @@ VideoView::get_next_frame (bool non_blocking)
        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, or empty if nothing is due */
 optional<int>
 VideoView::time_until_next_frame () const
@@ -117,14 +123,17 @@ VideoView::time_until_next_frame () const
        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::reset_metadata (shared_ptr<const Film> film, dcp::Size player_video_container_size)
 {
@@ -141,3 +150,40 @@ VideoView::reset_metadata (shared_ptr<const Film> film, dcp::Size player_video_c
        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);
+       }
+}
+