X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fgl_video_view.h;h=964f6f1ab9db2db8469e1fce8a36bd2d93279fa3;hb=HEAD;hp=1f9ed08ea75e78e2ef53bbbe48ca151389ea3977;hpb=27e5d372e8ca10ad0c1fd189f9dc76eb14d7a3ca;p=dcpomatic.git

diff --git a/src/wx/gl_video_view.h b/src/wx/gl_video_view.h
index 1f9ed08ea..69de7b76f 100644
--- a/src/wx/gl_video_view.h
+++ b/src/wx/gl_video_view.h
@@ -18,22 +18,54 @@
 
 */
 
+
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
+#include <wx/glcanvas.h>
+#include <wx/wx.h>
+LIBDCP_ENABLE_WARNINGS
+
+#undef None
+#undef Success
+#undef Status
+
+
+/* The OpenGL API in wxWidgets 3.0.x is sufficiently different to make it awkward to support,
+ * and I think it may even have things missing that we require (e.g. the attributes parameter
+ * to wxGLContext).  Hence we only support the GLVideoView on wxWidgets 3.1.0 and higher
+ * (which only excludes the old macOS builds, since wxWidgets 3.1.x does not support macOS
+ * 10.9 or earlier).
+ */
+#if wxCHECK_VERSION(3,1,0)
+
+
 #include "video_view.h"
 #include "lib/signaller.h"
 #include "lib/position.h"
-#include "lib/warnings.h"
-DCPOMATIC_DISABLE_WARNINGS
-#include <wx/glcanvas.h>
-#include <wx/wx.h>
-DCPOMATIC_ENABLE_WARNINGS
 #include <dcp/util.h>
 #include <boost/atomic.hpp>
-#include <boost/shared_ptr.hpp>
 #include <boost/thread.hpp>
 #include <boost/thread/condition.hpp>
-#undef None
-#undef Success
-#undef Status
+
+
+class Texture
+{
+public:
+	Texture (GLint unpack_alignment);
+	~Texture ();
+
+	Texture (Texture const&) = delete;
+	Texture& operator= (Texture const&) = delete;
+
+	void bind ();
+	void set (std::shared_ptr<const Image> image);
+
+private:
+	GLuint _name;
+	GLint _unpack_alignment;
+	boost::optional<dcp::Size> _size;
+};
+
 
 class GLVideoView : public VideoView
 {
@@ -41,38 +73,73 @@ public:
 	GLVideoView (FilmViewer* viewer, wxWindow* parent);
 	~GLVideoView ();
 
-	wxWindow* get () const {
+	wxWindow* get () const override {
 		return _canvas;
 	}
-	void update ();
-	void start ();
-	void stop ();
+	void update () override;
+	void start () override;
+	void stop () override;
 
-	bool display_next_frame (bool);
+	NextFrameResult display_next_frame (bool) override;
 
 	bool vsync_enabled () const {
 		return _vsync_enabled;
 	}
 
+	std::map<GLenum, std::string> information () const {
+		return _information;
+	}
+
 private:
-	void set_image (boost::shared_ptr<const Image> image);
+	void set_image (std::shared_ptr<const PlayerVideo> pv);
 	void set_image_and_draw ();
-	void draw (Position<int> inter_position, dcp::Size inter_size);
+	void draw ();
 	void thread ();
 	void thread_playing ();
 	void request_one_shot ();
 	void check_for_butler_errors ();
+	void ensure_context ();
+	void size_changed (wxSizeEvent const &);
+	void setup_shaders ();
+	void set_outline_content_colour (GLuint program);
+	void set_crop_guess_colour (GLuint program);
 
-	/* Mutex for use of _canvas; it's only contended when our ::thread
-	   is started up so this may be overkill.
-	 */
-	boost::mutex _canvas_mutex;
 	wxGLCanvas* _canvas;
 	wxGLContext* _context;
 
-	GLuint _id;
-	boost::optional<dcp::Size> _size;
-	bool _have_storage;
+	template <class T>
+	class Last
+	{
+	public:
+		void set_next (T const& next) {
+			_next = next;
+		}
+
+		bool changed () const {
+			return !_value || *_value != _next;
+		}
+
+		void update () {
+			_value = _next;
+		}
+
+	private:
+		boost::optional<T> _value;
+		T _next;
+	};
+
+	Last<wxSize> _last_canvas_size;
+	Last<dcp::Size> _last_video_size;
+	Last<Position<int>> _last_inter_position;
+	Last<dcp::Size> _last_inter_size;
+	Last<dcp::Size> _last_out_size;
+	Last<boost::optional<dcpomatic::Rect<float>>> _last_crop_guess;
+
+	boost::atomic<wxSize> _canvas_size;
+	boost::atomic<bool> _rec2020;
+	std::unique_ptr<Texture> _video_texture;
+	std::unique_ptr<Texture> _subtitle_texture;
+	bool _have_subtitle_to_render = false;
 	bool _vsync_enabled;
 	boost::thread _thread;
 
@@ -81,5 +148,13 @@ private:
 	boost::atomic<bool> _playing;
 	boost::atomic<bool> _one_shot;
 
-	boost::shared_ptr<wxTimer> _timer;
+	GLuint _vao;
+	GLint _fragment_type;
+	bool _setup_shaders_done = false;
+
+	std::shared_ptr<wxTimer> _timer;
+
+	std::map<GLenum, std::string> _information;
 };
+
+#endif