X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fvideo_view.h;h=b815afb7cc9da251283f21c3170fac3b0d53f1fc;hb=925d97b8e51421bf509c5ffbe4abe8f77a6ca95e;hp=142cfd022d580135bdd530a938a905031add6a61;hpb=4f7e9f125716a27ed9e2a8e30f067100cbee773a;p=dcpomatic.git

diff --git a/src/wx/video_view.h b/src/wx/video_view.h
index 142cfd022..b815afb7c 100644
--- a/src/wx/video_view.h
+++ b/src/wx/video_view.h
@@ -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,55 +18,98 @@
 
 */
 
+
 #ifndef DCPOMATIC_VIDEO_VIEW_H
 #define DCPOMATIC_VIDEO_VIEW_H
 
+
 #include "lib/dcpomatic_time.h"
-#include <boost/shared_ptr.hpp>
+#include "lib/exception_store.h"
+#include "lib/signaller.h"
+#include "lib/timer.h"
+#include "lib/types.h"
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
+#include <wx/wx.h>
+LIBDCP_ENABLE_WARNINGS
 #include <boost/signals2.hpp>
 #include <boost/thread.hpp>
 
-class Image;
-class wxWindow;
+
 class FilmViewer;
+class Image;
+class Player;
 class PlayerVideo;
+class wxWindow;
 
-class VideoView
+
+class VideoView : public ExceptionStore, public Signaller
 {
 public:
-	VideoView (FilmViewer* viewer)
-		: _viewer (viewer)
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-		, _in_watermark (false)
-#endif
-		, _video_frame_rate (0)
-	{}
-
+	VideoView (FilmViewer* viewer);
 	virtual ~VideoView () {}
 
-	virtual void set_image (boost::shared_ptr<const Image> image) = 0;
+	VideoView (VideoView const&) = delete;
+	VideoView& operator= (VideoView const&) = delete;
+
+	/** @return the thing displaying the image */
 	virtual wxWindow* get () const = 0;
+	/** Re-make and display the image from the current _player_video */
 	virtual void update () = 0;
-
-	/* XXX_b: make pure */
-	virtual void start () {}
-	/* XXX_b: make pure */
+	/** Called when playback starts */
+	virtual void start ();
+	/** Called when playback stops */
 	virtual void stop () {}
 
+	enum NextFrameResult {
+		FAIL,
+		AGAIN,
+		SUCCESS
+	};
+
+	/** Get the next frame and display it; used after seek */
+	virtual NextFrameResult display_next_frame (bool) = 0;
+
 	void clear ();
+	bool reset_metadata (std::shared_ptr<const Film> film, dcp::Size player_video_container_size);
 
+	/** Emitted from the GUI thread when our display changes in size */
 	boost::signals2::signal<void()> Sized;
+	/** Emitted from the GUI thread when a lot of frames are being dropped */
+	boost::signals2::signal<void()> TooManyDropped;
+
 
-	virtual bool display_next_frame (bool) = 0;
+	/* Accessors for FilmViewer */
 
-	/* XXX_b: to remove */
-	virtual void display_player_video () {}
+	int dropped () const {
+		boost::mutex::scoped_lock lm (_mutex);
+		return _dropped;
+	}
+
+	int errored () const {
+		boost::mutex::scoped_lock lm (_mutex);
+		return _errored;
+	}
+
+	int gets () const {
+		boost::mutex::scoped_lock lm (_mutex);
+		return _gets;
+	}
+
+	StateTimer const & state_timer () const {
+		return _state_timer;
+	}
 
 	dcpomatic::DCPTime position () const {
 		boost::mutex::scoped_lock lm (_mutex);
 		return _player_video.second;
 	}
 
+
+	/* Setters for FilmViewer so it can tell us our state and
+	 * we can then use (thread) safely.
+	 */
+
 	void set_video_frame_rate (int r) {
 		boost::mutex::scoped_lock lm (_mutex);
 		_video_frame_rate = r;
@@ -77,14 +120,39 @@ public:
 		_length = len;
 	}
 
-protected:
-	/* XXX_b: to remove */
-	friend class FilmViewer;
+	void set_eyes (Eyes eyes) {
+		boost::mutex::scoped_lock lm (_mutex);
+		_eyes = eyes;
+	}
+
+	void set_three_d (bool t) {
+		boost::mutex::scoped_lock lm (_mutex);
+		_three_d = t;
+	}
 
-	bool get_next_frame (bool non_blocking);
-	int time_until_next_frame () const;
+	void set_optimise_for_j2k (bool o) {
+		_optimise_for_j2k = o;
+	}
+
+protected:
+	NextFrameResult get_next_frame (bool non_blocking);
+	boost::optional<int> time_until_next_frame () const;
 	dcpomatic::DCPTime one_video_frame () const;
 
+	wxColour pad_colour () const;
+
+	wxColour outline_content_colour () const {
+		return wxColour(255, 0, 0);
+	}
+
+	wxColour outline_subtitles_colour () const {
+		return wxColour(0, 255, 0);
+	}
+
+	wxColour crop_guess_colour () const {
+		return wxColour(0, 0, 255);
+	}
+
 	int video_frame_rate () const {
 		boost::mutex::scoped_lock lm (_mutex);
 		return _video_frame_rate;
@@ -95,27 +163,40 @@ protected:
 		return _length;
 	}
 
-	std::pair<boost::shared_ptr<PlayerVideo>, dcpomatic::DCPTime> player_video () const {
+	std::pair<std::shared_ptr<PlayerVideo>, dcpomatic::DCPTime> player_video () const {
 		boost::mutex::scoped_lock lm (_mutex);
 		return _player_video;
 	}
 
+	void add_dropped ();
+
+	void add_get () {
+		boost::mutex::scoped_lock lm (_mutex);
+		++_gets;
+	}
+
 	FilmViewer* _viewer;
 
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-	bool _in_watermark;
-	int _watermark_x;
-	int _watermark_y;
-#endif
+	StateTimer _state_timer;
+
+	bool _optimise_for_j2k = false;
 
 private:
-	/** Mutex protecting all the state in VideoView */
+	/** Mutex protecting all the state in this class */
 	mutable boost::mutex _mutex;
 
-	std::pair<boost::shared_ptr<PlayerVideo>, dcpomatic::DCPTime> _player_video;
-	int _video_frame_rate;
+	std::pair<std::shared_ptr<PlayerVideo>, dcpomatic::DCPTime> _player_video;
+	int _video_frame_rate = 0;
 	/** length of the film we are playing, or 0 if there is none */
 	dcpomatic::DCPTime _length;
+	Eyes _eyes = Eyes::LEFT;
+	bool _three_d = false;
+
+	int _dropped = 0;
+	struct timeval _dropped_check_period_start;
+	int _errored = 0;
+	int _gets = 0;
 };
 
+
 #endif