#include "gl_video_view.h"
#include "film_viewer.h"
+#include "wx_util.h"
#include "lib/image.h"
#include "lib/dcpomatic_assert.h"
#include "lib/exceptions.h"
+#include "lib/cross.h"
+#include "lib/player_video.h"
+#include "lib/butler.h"
#include <boost/bind.hpp>
#include <iostream>
GLVideoView::GLVideoView (FilmViewer* viewer, wxWindow *parent)
: VideoView (viewer)
, _vsync_enabled (false)
+ , _thread (0)
+ , _playing (false)
+ , _one_shot (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));
_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")) {
#ifdef DCPOMATIC_WINDOWS
if (_canvas->IsExtensionSupported("WGL_EXT_swap_control")) {
/* Enable vsync */
- wglSwapIntervalEXT (1);
- _vsync_enabled = true;
+ PFNWGLSWAPINTERVALEXTPROC swap = (PFNWGLSWAPINTERVALEXTPROC) wglGetProcAddress("wglSwapIntervalEXT");
+ if (swap) {
+ swap (1);
+ _vsync_enabled = true;
+ }
}
#endif
GLVideoView::~GLVideoView ()
{
+ _thread->interrupt ();
+ _thread->join ();
+ delete _thread;
+
glDeleteTextures (1, &_id);
- delete _context;
+}
+
+void
+GLVideoView::check_for_butler_errors ()
+{
+ try {
+ _viewer->butler()->rethrow ();
+ } catch (DecodeError& e) {
+ error_dialog (get(), e.what());
+ }
}
static void
- check_gl_error (char const * last)
+check_gl_error (char const * last)
{
GLenum const e = glGetError ();
if (e != GL_NO_ERROR) {
void
GLVideoView::paint ()
{
- _viewer->state_timer().set("paint-panel");
- _canvas->SetCurrent (*_context);
- wxPaintDC dc (_canvas);
- draw ();
- _viewer->state_timer().unset();
+ request_one_shot ();
}
void
if (!_canvas->IsShownOnScreen()) {
return;
}
- wxClientDC dc (_canvas);
- draw ();
+ /* XXX_b */
+// wxClientDC dc (_canvas);
+// draw ();
}
void
glTranslatef (0, 0, 0);
+ dcp::Size const out_size = _viewer->out_size ();
+
if (_size) {
+ /* Render our image (texture) */
glBegin (GL_QUADS);
-
glTexCoord2f (0, 1);
glVertex2f (0, _size->height);
glTexCoord2f (1, 1);
glVertex2f (_size->width, 0);
glTexCoord2f (0, 0);
glVertex2f (0, 0);
-
+ glEnd ();
+ } else {
+ /* No image, so just fill with black */
+ glBegin (GL_QUADS);
+ glColor3ub (0, 0, 0);
+ glVertex2f (0, 0);
+ glVertex2f (out_size.width, 0);
+ glVertex2f (out_size.width, out_size.height);
+ glVertex2f (0, out_size.height);
+ glVertex2f (0, 0);
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()) {
glTexParameterf (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
check_gl_error ("glTexParameterf");
}
+
+void
+GLVideoView::start ()
+{
+ boost::mutex::scoped_lock lm (_playing_mutex);
+ _playing = true;
+ _playing_condition.notify_all ();
+}
+
+void
+GLVideoView::stop ()
+{
+ boost::mutex::scoped_lock lm (_playing_mutex);
+ _playing = false;
+}
+
+void
+GLVideoView::thread ()
+try
+{
+ /* XXX_b: check all calls and signal emissions in this method & protect them if necessary */
+ _context = new wxGLContext (_canvas);
+ _canvas->SetCurrent (*_context);
+
+ while (true) {
+ boost::mutex::scoped_lock lm (_playing_mutex);
+ while (!_playing && !_one_shot) {
+ _playing_condition.wait (lm);
+ }
+ _one_shot = false;
+ lm.unlock ();
+
+ if (length() != dcpomatic::DCPTime()) {
+ dcpomatic::DCPTime const next = position() + one_video_frame();
+
+ if (next >= length()) {
+ _viewer->stop ();
+ _viewer->emit_finished ();
+ continue;
+ }
+
+ get_next_frame (false);
+ set_image (player_video().first->image(bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), false, true));
+ }
+ draw ();
+
+ while (time_until_next_frame() < 5) {
+ get_next_frame (true);
+ }
+
+ boost::this_thread::interruption_point ();
+ dcpomatic_sleep_milliseconds (time_until_next_frame());
+ }
+
+ delete _context;
+}
+catch (boost::thread_interrupted& e)
+{
+ /* XXX_b: store exceptions here */
+ delete _context;
+ return;
+}
+
+bool
+GLVideoView::display_next_frame (bool non_blocking)
+{
+ bool const r = get_next_frame (non_blocking);
+ request_one_shot ();
+ return r;
+}
+
+void
+GLVideoView::request_one_shot ()
+{
+ boost::mutex::scoped_lock lm (_playing_mutex);
+ _one_shot = true;
+ _playing_condition.notify_all ();
+}
+
+void
+GLVideoView::create ()
+{
+ if (!_thread) {
+ _thread = new boost::thread (boost::bind(&GLVideoView::thread, this));
+ }
+}