X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Fgl_video_view.cc;h=786cee84a3a1afd9a8c19fc19640c7fc5ca433c6;hp=b3f036ded57d30a3949724c447f5e399c7ecf4f0;hb=92a2ca96e61ed040737a395b232cf22e5f3234c1;hpb=e153d7f5dc128d97160e41bdda3c4e4a05c7140b diff --git a/src/wx/gl_video_view.cc b/src/wx/gl_video_view.cc index b3f036ded..786cee84a 100644 --- a/src/wx/gl_video_view.cc +++ b/src/wx/gl_video_view.cc @@ -19,30 +19,83 @@ */ #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; using boost::shared_ptr; using boost::optional; -GLVideoView::GLVideoView (wxWindow *parent) +GLVideoView::GLVideoView (FilmViewer* viewer, wxWindow *parent) + : VideoView (viewer) + , _have_storage (false) + , _vsync_enabled (false) + , _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); @@ -51,8 +104,28 @@ GLVideoView::GLVideoView (wxWindow *parent) GLVideoView::~GLVideoView () { + try { + _thread.interrupt (); + _thread.join (); + } catch (...) { + + } + glDeleteTextures (1, &_id); - delete _context; +} + +void +GLVideoView::check_for_butler_errors () +{ + if (!_viewer->butler()) { + return; + } + + try { + _viewer->butler()->rethrow (); + } catch (DecodeError& e) { + error_dialog (get(), e.what()); + } } static void @@ -64,26 +137,20 @@ check_gl_error (char const * last) } } -void -GLVideoView::paint () -{ - _canvas->SetCurrent (*_context); - wxPaintDC dc (_canvas); - draw (); -} - void GLVideoView::update () { - if (!_canvas->IsShownOnScreen()) { - return; + { + boost::mutex::scoped_lock lm (_canvas_mutex); + 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"); @@ -92,27 +159,39 @@ GLVideoView::draw () 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); - glViewport (0, 0, _canvas->GetSize().x, _canvas->GetSize().y); + wxSize canvas_size; + { + boost::mutex::scoped_lock lm (_canvas_mutex); + canvas_size = _canvas->GetSize (); + } + + if (canvas_size.GetWidth() < 64 || canvas_size.GetHeight() < 0) { + return; + } + + glViewport (0, 0, canvas_size.GetWidth(), canvas_size.GetHeight()); + check_gl_error ("glViewport"); glMatrixMode (GL_PROJECTION); glLoadIdentity (); - gluOrtho2D (0, _canvas->GetSize().x, _canvas->GetSize().y, 0); + gluOrtho2D (0, canvas_size.GetWidth(), canvas_size.GetHeight(), 0); + check_gl_error ("gluOrtho2d"); glMatrixMode (GL_MODELVIEW); glLoadIdentity (); 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); @@ -121,11 +200,63 @@ 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 (); + } + + 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); + 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(); + + boost::mutex::scoped_lock lm (_canvas_mutex); _canvas->SwapBuffers(); } @@ -140,10 +271,21 @@ GLVideoView::set_image (shared_ptr image) 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); - glTexImage2D (GL_TEXTURE_2D, 0, GL_RGB8, _size->width, _size->height, 0, GL_RGB, GL_UNSIGNED_BYTE, image->data()[0]); - check_gl_error ("glTexImage2D"); + check_gl_error ("glPixelStorei"); + 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); @@ -153,3 +295,119 @@ 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; + _thread_work_condition.notify_all (); +} + +void +GLVideoView::stop () +{ + boost::mutex::scoped_lock lm (_playing_mutex); + _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 n = time_until_next_frame(); + if (!n || *n > 5) { + break; + } + get_next_frame (true); + add_dropped (); + } +} + + +void +GLVideoView::set_image_and_draw () +{ + shared_ptr 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 + _canvas->SetCurrent (*_context); + } + + while (true) { + boost::mutex::scoped_lock lm (_playing_mutex); + while (!_playing && !_one_shot) { + _thread_work_condition.wait (lm); + } + lm.unlock (); + + 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().get_value_or(0)); + } + + /* XXX: leaks _context, but that seems preferable to deleting it here + * without also deleting the wxGLCanvas. + */ +} +catch (boost::thread_interrupted& e) +{ + store_current (); +} + +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; + _thread_work_condition.notify_all (); +} + +void +GLVideoView::create () +{ + if (!_thread.joinable()) { + _thread = boost::thread (boost::bind(&GLVideoView::thread, this)); + } +}