Barely-functioning GL playback with new arrangement.

[dcpomatic.git] / src / wx / gl_video_view.cc

diff --git a/src/wx/gl_video_view.cc b/src/wx/gl_video_view.cc
index fefc08849233c3ddea162d5a7c24a9246cbef77a..c69ab210ab5e962c3ea099043c72a4f20640a4f9 100644 (file)
--- a/src/wx/gl_video_view.cc
+++ b/src/wx/gl_video_view.cc
@@ -23,15 +23,28 @@
 #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;
@@ -40,12 +53,41 @@ using boost::optional;
 
 GLVideoView::GLVideoView (FilmViewer* viewer, wxWindow *parent)
        : VideoView (viewer)
+       , _vsync_enabled (false)
+       , _thread (0)
 {
        _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)));
 
+#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);
@@ -53,8 +95,13 @@ GLVideoView::GLVideoView (FilmViewer* viewer, wxWindow *parent)
 
 GLVideoView::~GLVideoView ()
 {
+       if (_thread) {
+               _thread->interrupt ();
+               _thread->join ();
+       }
+       delete _thread;
+
        glDeleteTextures (1, &_id);
-       delete _context;
 }
 
 static void
@@ -69,9 +116,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
@@ -80,8 +132,9 @@ GLVideoView::update ()
        if (!_canvas->IsShownOnScreen()) {
                return;
        }
-       wxClientDC dc (_canvas);
-       draw ();
+       /* XXX_b */
+//     wxClientDC dc (_canvas);
+//     draw ();
 }
 
 void
@@ -100,11 +153,17 @@ GLVideoView::draw ()
        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 ();
 
@@ -125,9 +184,6 @@ GLVideoView::draw ()
                glEnd ();
        }
 
-       glDisable (GL_TEXTURE_2D);
-       check_gl_error ("glDisable GL_TEXTURE_2D");
-
        dcp::Size const out_size = _viewer->out_size ();
        wxSize const canvas_size = _canvas->GetSize ();
 
@@ -191,6 +247,7 @@ GLVideoView::set_image (shared_ptr<const Image> image)
 
        _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");
 
@@ -202,3 +259,62 @@ 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::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 (!_viewer->film() || !_viewer->playing()) {
+                       dcpomatic_sleep_milliseconds (40);
+                       continue;
+               }
+
+               dcpomatic::DCPTime const next = _viewer->position() + _viewer->one_video_frame();
+
+               if (next >= _viewer->film()->length()) {
+                       _viewer->stop ();
+                       _viewer->Finished ();
+                       return;
+               }
+
+               get_next_frame (false);
+               set_image (_player_video.first->image(bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), false, true));
+               draw ();
+               _viewer->_video_position = _player_video.second;
+
+               std::cout << "sleep " << _viewer->time_until_next_frame() << "\n";
+               dcpomatic_sleep_milliseconds (_viewer->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;
+}