X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Fgl_video_view.cc;h=a0f83db6d4390dfba4d056d5d4eb13da67048164;hp=ce17c03297c14b6c694a6232e17a95077a79da61;hb=95fd93f5b1432b5230be76f1521216b472744514;hpb=a8e31120a793f09ab56cc2847d76944ba698ba95 diff --git a/src/wx/gl_video_view.cc b/src/wx/gl_video_view.cc index ce17c0329..a0f83db6d 100644 --- a/src/wx/gl_video_view.cc +++ b/src/wx/gl_video_view.cc @@ -19,6 +19,7 @@ */ #include "gl_video_view.h" +#include "film_viewer.h" #include "lib/image.h" #include "lib/dcpomatic_assert.h" #include "lib/exceptions.h" @@ -28,19 +29,62 @@ #ifdef DCPOMATIC_OSX #include #include -#else +#include +#include +#endif + +#ifdef DCPOMATIC_LINUX +#include +#include +#include +#endif + +#ifdef DCPOMATIC_WINDOWS #include #include +#include #endif using std::cout; using boost::shared_ptr; +using boost::optional; -GLVideoView::GLVideoView (wxWindow *parent) +GLVideoView::GLVideoView (FilmViewer* viewer, wxWindow *parent) + : VideoView (viewer) + , _vsync_enabled (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, _1)); + _canvas->Bind (wxEVT_PAINT, boost::bind(&GLVideoView::paint, this)); + _canvas->Bind (wxEVT_SIZE, boost::bind(boost::ref(Sized))); + +#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); @@ -51,11 +95,10 @@ GLVideoView::~GLVideoView () { glDeleteTextures (1, &_id); delete _context; - delete _canvas; } static void -check_gl_error (char const * last) + check_gl_error (char const * last) { GLenum const e = glGetError (); if (e != GL_NO_ERROR) { @@ -64,10 +107,28 @@ check_gl_error (char const * last) } void -GLVideoView::paint (wxPaintEvent &) +GLVideoView::paint () { + _viewer->state_timer().set("paint-panel"); _canvas->SetCurrent (*_context); wxPaintDC dc (_canvas); + draw (); + _viewer->state_timer().unset(); +} + +void +GLVideoView::update () +{ + if (!_canvas->IsShownOnScreen()) { + return; + } + wxClientDC dc (_canvas); + draw (); +} + +void +GLVideoView::draw () +{ glClear (GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); check_gl_error ("glClear"); @@ -75,19 +136,23 @@ GLVideoView::paint (wxPaintEvent &) check_gl_error ("glClearColor"); glEnable (GL_TEXTURE_2D); check_gl_error ("glEnable GL_TEXTURE_2D"); - glEnable (GL_COLOR_MATERIAL); - check_gl_error ("glEnable GL_COLOR_MATERIAL"); glEnable (GL_BLEND); check_gl_error ("glEnable GL_BLEND"); glDisable (GL_DEPTH_TEST); check_gl_error ("glDisable GL_DEPTH_TEST"); glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); + if (_canvas->GetSize().x < 64 || _canvas->GetSize().y < 0) { + return; + } + glViewport (0, 0, _canvas->GetSize().x, _canvas->GetSize().y); + check_gl_error ("glViewport"); glMatrixMode (GL_PROJECTION); glLoadIdentity (); gluOrtho2D (0, _canvas->GetSize().x, _canvas->GetSize().y, 0); + check_gl_error ("gluOrtho2d"); glMatrixMode (GL_MODELVIEW); glLoadIdentity (); @@ -108,6 +173,52 @@ GLVideoView::paint (wxPaintEvent &) glEnd (); } + dcp::Size const out_size = _viewer->out_size (); + wxSize const canvas_size = _canvas->GetSize (); + + if (!_viewer->pad_black() && out_size.width < canvas_size.GetWidth()) { + 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()); + glEnd (); + glColor3ub (255, 255, 255); + } + + if (!_viewer->pad_black() && out_size.height < canvas_size.GetHeight()) { + glColor3ub (240, 240, 240); + int const gap = (canvas_size.GetHeight() - out_size.height) / 2; + glBegin (GL_QUADS); + glVertex2f (0, 0); + glVertex2f (canvas_size.GetWidth(), 0); + glVertex2f (canvas_size.GetWidth(), 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 (0, 2 * gap + out_size.height + 2); + glEnd (); + glColor3ub (255, 255, 255); + } + + if (_viewer->outline_content()) { + glColor3ub (255, 0, 0); + glBegin (GL_LINE_LOOP); + Position inter_position = _viewer->inter_position (); + dcp::Size inter_size = _viewer->inter_size (); + 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); + glEnd (); + glColor3ub (255, 255, 255); + } + glFlush(); _canvas->SwapBuffers(); } @@ -115,14 +226,17 @@ GLVideoView::paint (wxPaintEvent &) void GLVideoView::set_image (shared_ptr image) { - /* XXX: put this somewhere sensible */ - cout << glGetString (GL_VERSION) << "\n"; + if (!image) { + _size = optional(); + return; + } DCPOMATIC_ASSERT (image->pixel_format() == AV_PIX_FMT_RGB24); DCPOMATIC_ASSERT (!image->aligned()); _size = image->size (); glPixelStorei (GL_UNPACK_ALIGNMENT, 1); + check_gl_error ("glPixelStorei"); glTexImage2D (GL_TEXTURE_2D, 0, GL_RGB8, _size->width, _size->height, 0, GL_RGB, GL_UNSIGNED_BYTE, image->data()[0]); check_gl_error ("glTexImage2D"); @@ -133,6 +247,4 @@ GLVideoView::set_image (shared_ptr image) glTexParameterf (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); glTexParameterf (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); check_gl_error ("glTexParameterf"); - - _canvas->Refresh (); }