Merge a set of changes which run the OpenGL video updates in a separatev2.15.40

thread, hopefully making things more elegant and robust.

1 files changed, 133 insertions, 0 deletions

diff --git a/src/wx/video_view.cc b/src/wx/video_view.cc
new file mode 100644
index 000000000..4edc2cd23
--- /dev/null
+++ b/src/wx/video_view.cc
@@ -0,0 +1,133 @@
+/*
+    Copyright (C) 2019 Carl Hetherington <cth@carlh.net>
+
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    DCP-o-matic is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+#include "video_view.h"
+#include "wx_util.h"
+#include "film_viewer.h"
+#include "lib/butler.h"
+#include <boost/optional.hpp>
+
+using boost::shared_ptr;
+using boost::optional;
+
+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 ()
+{
+	boost::mutex::scoped_lock lm (_mutex);
+	_player_video.first.reset ();
+	_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.
+ */
+bool
+VideoView::get_next_frame (bool non_blocking)
+{
+	if (length() == dcpomatic::DCPTime()) {
+		return true;
+	}
+
+	shared_ptr<Butler> butler = _viewer->butler ();
+	if (!butler) {
+		return false;
+	}
+	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;
+		}
+	} while (
+		_player_video.first &&
+		_three_d &&
+		_eyes != _player_video.first->eyes() &&
+		_player_video.first->eyes() != EYES_BOTH
+		);
+
+	return true;
+}
+
+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
+{
+	if (length() == dcpomatic::DCPTime()) {
+		/* There's no content, so this doesn't matter */
+		return optional<int>();
+	}
+
+	dcpomatic::DCPTime const next = position() + one_video_frame();
+	dcpomatic::DCPTime 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;
+}
+
+bool
+VideoView::refresh_metadata (shared_ptr<const Film> film, dcp::Size video_container_size, dcp::Size film_frame_size)
+{
+	boost::mutex::scoped_lock lm (_mutex);
+	if (!_player_video.first) {
+		return false;
+	}
+
+	if (!_player_video.first->reset_metadata (film, video_container_size, film_frame_size)) {
+		return false;
+	}
+
+	update ();
+	return true;
+}
+