#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
#endif
using std::cout;
-using boost::shared_ptr;
+using std::shared_ptr;
using boost::optional;
#if BOOST_VERSION >= 106100
using namespace boost::placeholders;
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_SIZE, boost::bind(&GLVideoView::size_changed, this, _1));
_canvas->Bind (wxEVT_TIMER, boost::bind(&GLVideoView::check_for_butler_errors, this));
_timer.reset (new wxTimer(_canvas));
_timer->Start (2000);
}
+
+void
+GLVideoView::size_changed (wxSizeEvent const& ev)
+{
+ _canvas_size = ev.GetSize ();
+ Sized ();
+}
+
+
+
GLVideoView::~GLVideoView ()
{
boost::this_thread::disable_interruption dis;
_viewer->butler()->rethrow ();
} catch (DecodeError& e) {
error_dialog (get(), e.what());
+ } catch (dcp::ReadError& e) {
+ error_dialog (get(), wxString::Format(_("Could not read DCP: %s"), std_to_wx(e.what())));
}
}
+/** Called from the UI thread */
void
GLVideoView::update ()
{
- {
- boost::mutex::scoped_lock lm (_canvas_mutex);
- if (!_canvas->IsShownOnScreen()) {
- return;
- }
+ 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)
{
check_gl_error ("glDisable GL_DEPTH_TEST");
glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
- wxSize canvas_size;
- {
- boost::mutex::scoped_lock lm (_canvas_mutex);
- canvas_size = _canvas->GetSize ();
- }
+ auto const size = _canvas_size.load();
+ int const width = size.GetWidth();
+ int const height = size.GetHeight();
- if (canvas_size.GetWidth() < 64 || canvas_size.GetHeight() < 0) {
+ if (width < 64 || height < 0) {
return;
}
- glViewport (0, 0, canvas_size.GetWidth(), canvas_size.GetHeight());
+ glViewport (0, 0, width, height);
check_gl_error ("glViewport");
glMatrixMode (GL_PROJECTION);
glLoadIdentity ();
DCPOMATIC_DISABLE_WARNINGS
- gluOrtho2D (0, canvas_size.GetWidth(), canvas_size.GetHeight(), 0);
+ gluOrtho2D (0, width, height, 0);
DCPOMATIC_ENABLE_WARNINGS
check_gl_error ("gluOrtho2d");
glMatrixMode (GL_MODELVIEW);
glEnd ();
}
- if (!_viewer->pad_black() && out_size.width < canvas_size.GetWidth()) {
+ if (!_viewer->pad_black() && out_size.width < width) {
glBegin (GL_QUADS);
/* XXX: these colours are right for GNOME; may need adjusting for other OS */
glColor3ub (240, 240, 240);
glVertex2f (out_size.width, 0);
- glVertex2f (canvas_size.GetWidth(), 0);
- glVertex2f (canvas_size.GetWidth(), canvas_size.GetHeight());
- glVertex2f (out_size.width, canvas_size.GetHeight());
+ glVertex2f (width, 0);
+ glVertex2f (width, height);
+ glVertex2f (out_size.width, height);
glEnd ();
glColor3ub (255, 255, 255);
}
- if (!_viewer->pad_black() && out_size.height < canvas_size.GetHeight()) {
+ if (!_viewer->pad_black() && out_size.height < height) {
glColor3ub (240, 240, 240);
- int const gap = (canvas_size.GetHeight() - out_size.height) / 2;
+ int const gap = (height - out_size.height) / 2;
glBegin (GL_QUADS);
glVertex2f (0, 0);
- glVertex2f (canvas_size.GetWidth(), 0);
- glVertex2f (canvas_size.GetWidth(), gap);
+ glVertex2f (width, 0);
+ glVertex2f (width, gap);
glVertex2f (0, gap);
glEnd ();
glBegin (GL_QUADS);
glVertex2f (0, gap + out_size.height + 1);
- glVertex2f (canvas_size.GetWidth(), gap + out_size.height + 1);
- glVertex2f (canvas_size.GetWidth(), 2 * gap + out_size.height + 2);
+ glVertex2f (width, gap + out_size.height + 1);
+ glVertex2f (width, 2 * gap + out_size.height + 2);
glVertex2f (0, 2 * gap + out_size.height + 2);
glEnd ();
glColor3ub (255, 255, 255);
if (_viewer->outline_content()) {
glColor3ub (255, 0, 0);
glBegin (GL_LINE_LOOP);
- glVertex2f (inter_position.x, inter_position.y + (canvas_size.GetHeight() - out_size.height) / 2);
- glVertex2f (inter_position.x + inter_size.width, inter_position.y + (canvas_size.GetHeight() - out_size.height) / 2);
- glVertex2f (inter_position.x + inter_size.width, inter_position.y + (canvas_size.GetHeight() - out_size.height) / 2 + inter_size.height);
- glVertex2f (inter_position.x, inter_position.y + (canvas_size.GetHeight() - out_size.height) / 2 + inter_size.height);
+ glVertex2f (inter_position.x, inter_position.y + (height - out_size.height) / 2);
+ glVertex2f (inter_position.x + inter_size.width, inter_position.y + (height - out_size.height) / 2);
+ glVertex2f (inter_position.x + inter_size.width, inter_position.y + (height - out_size.height) / 2 + inter_size.height);
+ glVertex2f (inter_position.x, inter_position.y + (height - out_size.height) / 2 + inter_size.height);
glEnd ();
glColor3ub (255, 255, 255);
}
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);
}
GLVideoView::thread ()
try
{
- {
- boost::mutex::scoped_lock lm (_canvas_mutex);
- _context = new wxGLContext (_canvas);
- _canvas->SetCurrent (*_context);
- }
+ start_of_thread ("GLVideoView");
+#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")) {
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 ()
{
projects / dcpomatic.git / blobdiff