#ifdef DCPOMATIC_LINUX
#include <GL/glu.h>
#include <GL/glext.h>
-#include <GL/glxext.h>
#endif
#ifdef DCPOMATIC_WINDOWS
using boost::shared_ptr;
using boost::optional;
+
+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)
+ , _have_storage (false)
, _vsync_enabled (false)
- , _thread (0)
, _playing (false)
, _one_shot (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 ()
{
- _thread->interrupt ();
- _thread->join ();
- delete _thread;
+ boost::this_thread::disable_interruption dis;
+
+ try {
+ _thread.interrupt ();
+ _thread.join ();
+ } catch (...) {}
glDeleteTextures (1, &_id);
}
void
GLVideoView::check_for_butler_errors ()
{
+ if (!_viewer->butler()) {
+ return;
+ }
+
try {
_viewer->butler()->rethrow ();
} catch (DecodeError& e) {
}
}
-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 (!_thread.joinable()) {
+ _thread = boost::thread (boost::bind(&GLVideoView::thread, this));
+ }
+
{
boost::mutex::scoped_lock lm (_canvas_mutex);
if (!_canvas->IsShownOnScreen()) {
glMatrixMode (GL_PROJECTION);
glLoadIdentity ();
+DCPOMATIC_DISABLE_WARNINGS
gluOrtho2D (0, canvas_size.GetWidth(), canvas_size.GetHeight(), 0);
+DCPOMATIC_ENABLE_WARNINGS
check_gl_error ("gluOrtho2d");
glMatrixMode (GL_MODELVIEW);
glLoadIdentity ();
}
glFlush();
+ check_gl_error ("glFlush");
boost::mutex::scoped_lock lm (_canvas_mutex);
_canvas->SwapBuffers();
DCPOMATIC_ASSERT (image->pixel_format() == AV_PIX_FMT_RGB24);
DCPOMATIC_ASSERT (!image->aligned());
+ if (image->size() != _size) {
+ _have_storage = false;
+ }
+
_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");
+ if (_have_storage) {
+ glTexSubImage2D (GL_TEXTURE_2D, 0, 0, 0, _size->width, _size->height, GL_RGB, GL_UNSIGNED_BYTE, image->data()[0]);
+ check_gl_error ("glTexSubImage2D");
+ } else {
+ glTexImage2D (GL_TEXTURE_2D, 0, GL_RGB8, _size->width, _size->height, 0, GL_RGB, GL_UNSIGNED_BYTE, image->data()[0]);
+ _have_storage = true;
+ check_gl_error ("glTexImage2D");
+ }
glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
boost::mutex::scoped_lock lm (_playing_mutex);
_playing = true;
- _playing_condition.notify_all ();
+ _thread_work_condition.notify_all ();
}
void
_playing = false;
}
+
+void
+GLVideoView::thread_playing ()
+{
+ if (length() != dcpomatic::DCPTime()) {
+ dcpomatic::DCPTime const next = position() + one_video_frame();
+
+ if (next >= length()) {
+ _viewer->finished ();
+ return;
+ }
+
+ get_next_frame (false);
+ set_image_and_draw ();
+ }
+
+ while (true) {
+ optional<int> n = time_until_next_frame();
+ if (!n || *n > 5) {
+ break;
+ }
+ get_next_frame (true);
+ add_dropped ();
+ }
+}
+
+
+void
+GLVideoView::set_image_and_draw ()
+{
+ shared_ptr<PlayerVideo> pv = player_video().first;
+ if (pv) {
+ set_image (pv->image(bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), false, true));
+ draw (pv->inter_position(), pv->inter_size());
+ }
+}
+
+
void
GLVideoView::thread ()
try
{
{
boost::mutex::scoped_lock lm (_canvas_mutex);
- _context = new wxGLContext (_canvas); //local
+ _context = new wxGLContext (_canvas);
_canvas->SetCurrent (*_context);
}
+
+#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);
while (!_playing && !_one_shot) {
- _playing_condition.wait (lm);
+ _thread_work_condition.wait (lm);
}
- _one_shot = false;
lm.unlock ();
- Position<int> inter_position;
- dcp::Size inter_size;
- if (length() != dcpomatic::DCPTime()) {
- dcpomatic::DCPTime const next = position() + one_video_frame();
-
- if (next >= length()) {
- _viewer->finished ();
- continue;
- }
-
- get_next_frame (false);
- shared_ptr<PlayerVideo> pv = player_video().first;
- set_image (pv->image(bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), false, true));
- inter_position = pv->inter_position();
- inter_size = pv->inter_size();
- }
- draw (inter_position, inter_size);
-
- while (time_until_next_frame() < 5) {
- get_next_frame (true);
- add_dropped ();
+ if (_playing) {
+ thread_playing ();
+ } else if (_one_shot) {
+ _one_shot = false;
+ set_image_and_draw ();
}
boost::this_thread::interruption_point ();
- dcpomatic_sleep_milliseconds (time_until_next_frame());
+ dcpomatic_sleep_milliseconds (time_until_next_frame().get_value_or(0));
}
/* XXX: leaks _context, but that seems preferable to deleting it here
{
boost::mutex::scoped_lock lm (_playing_mutex);
_one_shot = true;
- _playing_condition.notify_all ();
+ _thread_work_condition.notify_all ();
}
-void
-GLVideoView::create ()
-{
- if (!_thread) {
- _thread = new boost::thread (boost::bind(&GLVideoView::thread, this));
- }
-}
projects / dcpomatic.git / blobdiff