#include "lib/cross.h"
#include "lib/player_video.h"
#include "lib/butler.h"
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
#include <iostream>
#ifdef DCPOMATIC_OSX
#ifdef DCPOMATIC_LINUX
#include <GL/glu.h>
#include <GL/glext.h>
-#include <GL/glxext.h>
#endif
#ifdef DCPOMATIC_WINDOWS
#endif
using std::cout;
-using boost::shared_ptr;
+using std::shared_ptr;
using boost::optional;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
+
+
+static void
+check_gl_error (char const * last)
+{
+ GLenum const e = glGetError ();
+ if (e != GL_NO_ERROR) {
+ throw GLError (last, e);
+ }
+}
+
GLVideoView::GLVideoView (FilmViewer* viewer, wxWindow *parent)
: VideoView (viewer)
+ , _context (nullptr)
, _have_storage (false)
, _vsync_enabled (false)
, _playing (false)
_canvas = new wxGLCanvas (parent, wxID_ANY, 0, wxDefaultPosition, wxDefaultSize, wxFULL_REPAINT_ON_RESIZE);
_canvas->Bind (wxEVT_PAINT, boost::bind(&GLVideoView::update, this));
_canvas->Bind (wxEVT_SIZE, boost::bind(boost::ref(Sized)));
- _canvas->Bind (wxEVT_CREATE, boost::bind(&GLVideoView::create, this));
_canvas->Bind (wxEVT_TIMER, boost::bind(&GLVideoView::check_for_butler_errors, this));
_timer.reset (new wxTimer(_canvas));
_timer->Start (2000);
-
-#if defined(DCPOMATIC_LINUX) && defined(DCPOMATIC_HAVE_GLX_SWAP_INTERVAL_EXT)
- if (_canvas->IsExtensionSupported("GLX_EXT_swap_control")) {
- /* 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 */
- PFNWGLSWAPINTERVALEXTPROC swap = (PFNWGLSWAPINTERVALEXTPROC) wglGetProcAddress("wglSwapIntervalEXT");
- if (swap) {
- swap (1);
- _vsync_enabled = true;
- }
- }
-
-#endif
-
-#ifdef DCPOMATIC_OSX
- /* Enable vsync */
- GLint swapInterval = 1;
- CGLSetParameter (CGLGetCurrentContext(), kCGLCPSwapInterval, &swapInterval);
- _vsync_enabled = true;
-#endif
-
- glGenTextures (1, &_id);
- glBindTexture (GL_TEXTURE_2D, _id);
- glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
}
GLVideoView::~GLVideoView ()
{
+ boost::this_thread::disable_interruption dis;
+
try {
_thread.interrupt ();
_thread.join ();
- } catch (...) {
-
- }
+ } catch (...) {}
glDeleteTextures (1, &_id);
}
}
}
-static void
-check_gl_error (char const * last)
-{
- GLenum const e = glGetError ();
- if (e != GL_NO_ERROR) {
- throw GLError (last, e);
- }
-}
void
GLVideoView::update ()
if (!_canvas->IsShownOnScreen()) {
return;
}
+
+#ifdef DCPOMATIC_OSX
+ /* macOS gives errors if we don't do this (and therefore [NSOpenGLContext setView:]) from the main thread */
+ ensure_context ();
+#endif
}
+
+ if (!_thread.joinable()) {
+ _thread = boost::thread (boost::bind(&GLVideoView::thread, this));
+ }
+
request_one_shot ();
}
+
+void
+GLVideoView::ensure_context ()
+{
+ if (!_context) {
+ _context = new wxGLContext (_canvas);
+ _canvas->SetCurrent (*_context);
+ }
+}
+
void
GLVideoView::draw (Position<int> inter_position, dcp::Size inter_size)
{
wxSize canvas_size;
{
boost::mutex::scoped_lock lm (_canvas_mutex);
- canvas_size = _canvas->GetSize ();
+ if (_canvas) {
+ canvas_size = _canvas->GetSize ();
+ }
}
if (canvas_size.GetWidth() < 64 || canvas_size.GetHeight() < 0) {
}
glFlush();
+ check_gl_error ("glFlush");
boost::mutex::scoped_lock lm (_canvas_mutex);
_canvas->SwapBuffers();
{
shared_ptr<PlayerVideo> pv = player_video().first;
if (pv) {
- set_image (pv->image(bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), false, true));
+ set_image (pv->image(bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), VideoRange::FULL, false, true));
draw (pv->inter_position(), pv->inter_size());
+ _viewer->image_changed (pv);
}
}
{
{
boost::mutex::scoped_lock lm (_canvas_mutex);
- _context = new wxGLContext (_canvas); //local
- _canvas->SetCurrent (*_context);
+
+#if defined(DCPOMATIC_OSX)
+ /* Without this we see errors like
+ * ../src/osx/cocoa/glcanvas.mm(194): assert ""context"" failed in SwapBuffers(): should have current context [in thread 700006970000]
+ */
+ WXGLSetCurrentContext (_context->GetWXGLContext());
+#else
+ /* We must call this here on Linux otherwise we get no image (for reasons
+ * that aren't clear). However, doing ensure_context() from this thread
+ * on macOS gives
+ * "[NSOpenGLContext setView:] must be called from the main thread".
+ */
+ ensure_context ();
+#endif
+ }
+
+#if defined(DCPOMATIC_LINUX) && defined(DCPOMATIC_HAVE_GLX_SWAP_INTERVAL_EXT)
+ if (_canvas->IsExtensionSupported("GLX_EXT_swap_control")) {
+ /* 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 */
+ PFNWGLSWAPINTERVALEXTPROC swap = (PFNWGLSWAPINTERVALEXTPROC) wglGetProcAddress("wglSwapIntervalEXT");
+ if (swap) {
+ swap (1);
+ _vsync_enabled = true;
+ }
+ }
+
+#endif
+
+#ifdef DCPOMATIC_OSX
+ /* Enable vsync */
+ GLint swapInterval = 1;
+ CGLSetParameter (CGLGetCurrentContext(), kCGLCPSwapInterval, &swapInterval);
+ _vsync_enabled = true;
+#endif
+
+ glGenTextures (1, &_id);
+ check_gl_error ("glGenTextures");
+ glBindTexture (GL_TEXTURE_2D, _id);
+ check_gl_error ("glBindTexture");
+ glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
+ check_gl_error ("glPixelStorei");
while (true) {
boost::mutex::scoped_lock lm (_playing_mutex);
store_current ();
}
-bool
+
+VideoView::NextFrameResult
GLVideoView::display_next_frame (bool non_blocking)
{
- bool const r = get_next_frame (non_blocking);
+ NextFrameResult const r = get_next_frame (non_blocking);
request_one_shot ();
return r;
}
+
void
GLVideoView::request_one_shot ()
{
_thread_work_condition.notify_all ();
}
-void
-GLVideoView::create ()
-{
- if (!_thread.joinable()) {
- _thread = boost::thread (boost::bind(&GLVideoView::thread, this));
- }
-}