X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Fgl_video_view.cc;h=c3a6112831750641cedc226733010ba83b70fb94;hp=da5cc31a06124686beb06f3c1ae75be6082f5eab;hb=046d84f45621f7e128cb30160a315f98881c6f4b;hpb=4358c54894741eef96bc8018a57fb2b0c059a4c1

diff --git a/src/wx/gl_video_view.cc b/src/wx/gl_video_view.cc
index da5cc31a0..c3a611283 100644
--- a/src/wx/gl_video_view.cc
+++ b/src/wx/gl_video_view.cc
@@ -23,27 +23,41 @@
 #include "lib/image.h"
 #include "lib/dcpomatic_assert.h"
 #include "lib/exceptions.h"
+#include "lib/cross.h"
+#include "lib/player_video.h"
 #include <boost/bind.hpp>
 #include <iostream>
 
 #ifdef DCPOMATIC_OSX
 #include <OpenGL/glu.h>
 #include <OpenGL/glext.h>
-#else
+#include <OpenGL/CGLTypes.h>
+#include <OpenGL/OpenGL.h>
+#endif
+
+#ifdef DCPOMATIC_LINUX
 #include <GL/glu.h>
 #include <GL/glext.h>
 #include <GL/glxext.h>
 #endif
 
+#ifdef DCPOMATIC_WINDOWS
+#include <GL/glu.h>
+#include <GL/glext.h>
+#include <GL/wglext.h>
+#endif
+
 using std::cout;
 using boost::shared_ptr;
 using boost::optional;
 
 GLVideoView::GLVideoView (FilmViewer* viewer, wxWindow *parent)
 	: VideoView (viewer)
+	, _vsync_enabled (false)
+	, _thread (0)
+	, _one_shot (false)
 {
 	_canvas = new wxGLCanvas (parent, wxID_ANY, 0, wxDefaultPosition, wxDefaultSize, wxFULL_REPAINT_ON_RESIZE);
-	_context = new wxGLContext (_canvas);
 	_canvas->Bind (wxEVT_PAINT, boost::bind(&GLVideoView::paint, this));
 	_canvas->Bind (wxEVT_SIZE, boost::bind(boost::ref(Sized)));
 
@@ -52,21 +66,27 @@ GLVideoView::GLVideoView (FilmViewer* viewer, wxWindow *parent)
 		/* Enable vsync */
 		Display* dpy = wxGetX11Display();
 		glXSwapIntervalEXT (dpy, DefaultScreen(dpy), 1);
+		_vsync_enabled = true;
 	}
 #endif
 
 #ifdef DCPOMATIC_WINDOWS
 	if (_canvas->IsExtensionSupported("WGL_EXT_swap_control")) {
 		/* Enable vsync */
-		wglSwapIntervalEXT (1);
+		PFNWGLSWAPINTERVALEXTPROC swap = (PFNWGLSWAPINTERVALEXTPROC) wglGetProcAddress("wglSwapIntervalEXT");
+		if (swap) {
+			swap (1);
+			_vsync_enabled = true;
+		}
 	}
 
 #endif
 
 #ifdef DCPOMATIC_OSX
 	/* Enable vsync */
-	long swapInterval = 1;
+	GLint swapInterval = 1;
 	CGLSetParameter (CGLGetCurrentContext(), kCGLCPSwapInterval, &swapInterval);
+	_vsync_enabled = true;
 #endif
 
 	glGenTextures (1, &_id);
@@ -76,12 +96,17 @@ GLVideoView::GLVideoView (FilmViewer* viewer, wxWindow *parent)
 
 GLVideoView::~GLVideoView ()
 {
+	if (_thread) {
+		_thread->interrupt ();
+		_thread->join ();
+	}
+	delete _thread;
+
 	glDeleteTextures (1, &_id);
-	delete _context;
 }
 
 static void
-       check_gl_error (char const * last)
+check_gl_error (char const * last)
 {
 	GLenum const e = glGetError ();
 	if (e != GL_NO_ERROR) {
@@ -92,11 +117,14 @@ static void
 void
 GLVideoView::paint ()
 {
+	/* XXX_b: can't do this yet */
+#if 0
         _viewer->state_timer().set("paint-panel");
 	_canvas->SetCurrent (*_context);
 	wxPaintDC dc (_canvas);
 	draw ();
 	_viewer->state_timer().unset();
+#endif
 }
 
 void
@@ -105,8 +133,9 @@ GLVideoView::update ()
 	if (!_canvas->IsShownOnScreen()) {
 		return;
 	}
-	wxClientDC dc (_canvas);
-	draw ();
+	/* XXX_b */
+//	wxClientDC dc (_canvas);
+//	draw ();
 }
 
 void
@@ -231,3 +260,114 @@ GLVideoView::set_image (shared_ptr<const Image> image)
 	glTexParameterf (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
 	check_gl_error ("glTexParameterf");
 }
+
+void
+GLVideoView::start ()
+{
+	_thread = new boost::thread (boost::bind(&GLVideoView::thread, this));
+}
+
+void
+GLVideoView::stop ()
+{
+	if (_thread) {
+		_thread->interrupt ();
+		_thread->join ();
+	}
+	delete _thread;
+	_thread = 0;
+}
+
+bool
+GLVideoView::one_shot () const
+{
+	boost::mutex::scoped_lock lm (_one_shot_mutex);
+	return _one_shot;
+}
+
+void
+GLVideoView::set_one_shot (bool s)
+{
+	boost::mutex::scoped_lock lm (_one_shot_mutex);
+	_one_shot = s;
+}
+
+void
+GLVideoView::thread ()
+try
+{
+	/* XXX_b: check all calls and signal emissions in this method & protect them if necessary */
+	{
+		boost::mutex::scoped_lock lm (_context_mutex);
+		_context = new wxGLContext (_canvas);
+		_canvas->SetCurrent (*_context);
+	}
+
+	while (true) {
+		if (!film() && !one_shot()) {
+			/* XXX: this should be an indefinite wait until
+			   one of our conditions becomes true.
+			 */
+			dcpomatic_sleep_milliseconds (40);
+			continue;
+		}
+
+		set_one_shot (false);
+
+		dcpomatic::DCPTime const next = position() + one_video_frame();
+
+		if (next >= film()->length()) {
+			_viewer->stop ();
+			_viewer->emit_finished ();
+			continue;
+		}
+
+		get_next_frame (false);
+		{
+			boost::mutex::scoped_lock lm (_mutex);
+			set_image (_player_video.first->image(bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), false, true));
+		}
+		draw ();
+
+		while (time_until_next_frame() < 5) {
+			get_next_frame (true);
+		}
+
+		boost::this_thread::interruption_point ();
+		dcpomatic_sleep_milliseconds (time_until_next_frame());
+	}
+
+	{
+		boost::mutex::scoped_lock lm (_context_mutex);
+		delete _context;
+	}
+}
+catch (boost::thread_interrupted& e)
+{
+	/* XXX_b: store exceptions here */
+	delete _context;
+	return;
+}
+
+wxGLContext *
+GLVideoView::context () const
+{
+	boost::mutex::scoped_lock lm (_context_mutex);
+	return _context;
+}
+
+bool
+GLVideoView::display_next_frame (bool non_blocking)
+{
+	bool const g = get_next_frame (non_blocking);
+	set_one_shot (true);
+	return g;
+}
+
+dcpomatic::DCPTime
+GLVideoView::one_video_frame () const
+{
+	return dcpomatic::DCPTime::from_frames (1, film()->video_frame_rate());
+}
+
+