X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fvideo_view.cc;h=42a7fe58b22c3a4d39ba98c26d9c171d13c4caed;hb=dd9be86db6cde0afa5da0d1d1ac43b42e05dca26;hp=e1a8b7306681b12972b63abb5c5780f92ef0cf2b;hpb=046d84f45621f7e128cb30160a315f98881c6f4b;p=dcpomatic.git

diff --git a/src/wx/video_view.cc b/src/wx/video_view.cc
index e1a8b7306..42a7fe58b 100644
--- a/src/wx/video_view.cc
+++ b/src/wx/video_view.cc
@@ -22,6 +22,25 @@
 #include "wx_util.h"
 #include "film_viewer.h"
 #include "lib/butler.h"
+#include "lib/dcpomatic_log.h"
+#include <boost/optional.hpp>
+
+using std::pair;
+using std::shared_ptr;
+using boost::optional;
+
+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 ()
@@ -31,55 +50,94 @@ VideoView::clear ()
 	_player_video.second = dcpomatic::DCPTime ();
 }
 
-/** @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.
+/** 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
+ *  if there is a frame.
  */
-bool
+VideoView::NextFrameResult
 VideoView::get_next_frame (bool non_blocking)
 {
-	DCPOMATIC_ASSERT (_viewer->butler());
-	_viewer->_gets++;
+	if (length() == dcpomatic::DCPTime()) {
+		return FAIL;
+	}
+
+	shared_ptr<Butler> butler = _viewer->butler ();
+	if (!butler) {
+		return FAIL;
+	}
+	add_get ();
 
 	boost::mutex::scoped_lock lm (_mutex);
 
 	do {
 		Butler::Error e;
-		_player_video = _viewer->butler()->get_video (!non_blocking, &e);
-		if (!_player_video.first && e == Butler::AGAIN) {
-			return false;
+		pair<shared_ptr<PlayerVideo>, dcpomatic::DCPTime> pv = butler->get_video (!non_blocking, &e);
+		if (e.code == Butler::Error::DIED) {
+			LOG_ERROR ("Butler died with %1", e.summary());
 		}
+		if (!pv.first) {
+			return e.code == Butler::Error::AGAIN ? AGAIN : FAIL;
+		}
+		_player_video = pv;
 	} while (
 		_player_video.first &&
-		_viewer->film()->three_d() &&
-		_viewer->_eyes != _player_video.first->eyes() &&
+		_three_d &&
+		_eyes != _player_video.first->eyes() &&
 		_player_video.first->eyes() != EYES_BOTH
 		);
 
-	try {
-		_viewer->butler()->rethrow ();
-	} catch (DecodeError& e) {
-		error_dialog (get(), e.what());
+	if (_player_video.first && _player_video.first->error()) {
+		++_errored;
 	}
 
-	return true;
+	return SUCCESS;
 }
 
 dcpomatic::DCPTime
 VideoView::one_video_frame () const
 {
-	return dcpomatic::DCPTime::from_frames (1, film()->video_frame_rate());
+	return dcpomatic::DCPTime::from_frames (1, video_frame_rate());
 }
 
-/* XXX_b: comment */
-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 optional<int>();
+	}
+
 	dcpomatic::DCPTime const next = position() + one_video_frame();
 	dcpomatic::DCPTime const time = _viewer->audio_time().get_value_or(position());
-	std::cout << to_string(next) << " " << to_string(time) << " " << ((next.seconds() - time.seconds()) * 1000) << "\n";
 	if (next < time) {
 		return 0;
 	}
 	return (next.seconds() - time.seconds()) * 1000;
 }
 
+void
+VideoView::start ()
+{
+	boost::mutex::scoped_lock lm (_mutex);
+	_dropped = 0;
+	_errored = 0;
+}
+
+bool
+VideoView::reset_metadata (shared_ptr<const Film> film, dcp::Size player_video_container_size)
+{
+	pair<shared_ptr<PlayerVideo>, dcpomatic::DCPTime> pv = player_video ();
+	if (!pv.first) {
+		return false;
+	}
+
+	if (!pv.first->reset_metadata(film, player_video_container_size)) {
+		return false;
+	}
+
+	update ();
+	return true;
+}
+