X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fgl_video_view.cc;h=ce152787a971fc31cc7e3ecdc29c54350e19764e;hb=6a3d9962dc774becf50dd92f0cca90c536343eda;hp=39d418cbfc3d2af18baa8b31c99092e6af280e98;hpb=1e2ff3aad2e6feabc7d725f64e41feb0b5ba9439;p=dcpomatic.git diff --git a/src/wx/gl_video_view.cc b/src/wx/gl_video_view.cc index 39d418cbf..ce152787a 100644 --- a/src/wx/gl_video_view.cc +++ b/src/wx/gl_video_view.cc @@ -20,18 +20,33 @@ #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 #include #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; @@ -40,11 +55,47 @@ using boost::optional; 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_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); @@ -53,12 +104,25 @@ GLVideoView::GLVideoView (FilmViewer* viewer, wxWindow *parent) 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) { @@ -66,26 +130,17 @@ static void } } -void -GLVideoView::paint () -{ - _canvas->SetCurrent (*_context); - wxPaintDC dc (_canvas); - draw (); -} - void GLVideoView::update () { if (!_canvas->IsShownOnScreen()) { return; } - wxClientDC dc (_canvas); - draw (); + request_one_shot (); } void -GLVideoView::draw () +GLVideoView::draw (Position inter_position, dcp::Size inter_size) { glClear (GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); check_gl_error ("glClear"); @@ -116,9 +171,11 @@ GLVideoView::draw () 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); @@ -127,11 +184,19 @@ GLVideoView::draw () 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()) { @@ -167,8 +232,6 @@ GLVideoView::draw () 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); @@ -206,3 +269,96 @@ GLVideoView::set_image (shared_ptr image) glTexParameterf (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); check_gl_error ("glTexParameterf"); } + +void +GLVideoView::start () +{ + VideoView::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 (); + + Position inter_position; + dcp::Size inter_size; + 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)); + inter_position = player_video().first->inter_position(); + inter_size = player_video().first->inter_size(); + } + draw (inter_position, inter_size); + + while (time_until_next_frame() < 5) { + get_next_frame (true); + add_dropped (); + } + + 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)); + } +}