Stop invalid dates causing boost::posix_time to raise exceptions.

[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 ce152787a971fc31cc7e3ecdc29c54350e19764e..d47ad87f48cdfbe788bd9151d04920c7cd5bb0ac 100644 (file)
--- a/src/wx/gl_video_view.cc
+++ b/src/wx/gl_video_view.cc
@@ -55,6 +55,7 @@ using boost::optional;
 
 GLVideoView::GLVideoView (FilmViewer* viewer, wxWindow *parent)
        : VideoView (viewer)
+       , _have_storage (false)
        , _vsync_enabled (false)
        , _thread (0)
        , _playing (false)
@@ -133,8 +134,11 @@ check_gl_error (char const * last)
 void
 GLVideoView::update ()
 {
-       if (!_canvas->IsShownOnScreen()) {
-               return;
+       {
+               boost::mutex::scoped_lock lm (_canvas_mutex);
+               if (!_canvas->IsShownOnScreen()) {
+                       return;
+               }
        }
        request_one_shot ();
 }
@@ -155,16 +159,22 @@ GLVideoView::draw (Position<int> inter_position, dcp::Size inter_size)
        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) {
+       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->GetSize().x, _canvas->GetSize().y);
+       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 ();
@@ -197,8 +207,6 @@ GLVideoView::draw (Position<int> inter_position, dcp::Size inter_size)
                glEnd ();
        }
 
-       wxSize const canvas_size = _canvas->GetSize ();
-
        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 */
@@ -241,6 +249,8 @@ GLVideoView::draw (Position<int> inter_position, dcp::Size inter_size)
        }
 
        glFlush();
+
+       boost::mutex::scoped_lock lm (_canvas_mutex);
        _canvas->SwapBuffers();
 }
 
@@ -255,11 +265,21 @@ GLVideoView::set_image (shared_ptr<const Image> 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);
        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);
@@ -291,9 +311,11 @@ 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);
+       {
+               boost::mutex::scoped_lock lm (_canvas_mutex);
+               _context = new wxGLContext (_canvas); //local
+               _canvas->SetCurrent (*_context);
+       }
 
        while (true) {
                boost::mutex::scoped_lock lm (_playing_mutex);
@@ -309,34 +331,40 @@ try
                        dcpomatic::DCPTime const next = position() + one_video_frame();
 
                        if (next >= length()) {
-                               _viewer->stop ();
-                               _viewer->emit_finished ();
+                               _viewer->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();
+                       shared_ptr<PlayerVideo> pv = player_video().first;
+                       if (pv) {
+                               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) {
+               while (true) {
+                       optional<int> n = time_until_next_frame();
+                       if (!n || *n > 5) {
+                               break;
+                       }
                        get_next_frame (true);
                        add_dropped ();
                }
 
                boost::this_thread::interruption_point ();
-               dcpomatic_sleep_milliseconds (time_until_next_frame());
+               dcpomatic_sleep_milliseconds (time_until_next_frame().get_value_or(0));
        }
 
-       delete _context;
+       /* XXX: leaks _context, but that seems preferable to deleting it here
+        * without also deleting the wxGLCanvas.
+        */
 }
 catch (boost::thread_interrupted& e)
 {
-       /* XXX_b: store exceptions here */
-       delete _context;
-       return;
+       store_current ();
 }
 
 bool