X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fgl_video_view.cc;h=d47ad87f48cdfbe788bd9151d04920c7cd5bb0ac;hb=f10e025eba54b0ab4dbe1b3611071b160ca89208;hp=2da16f1df7775b726044c3fd9f0c370e1ac19db1;hpb=166f44ff1b500f684417d660bb349d35383996ee;p=dcpomatic.git

diff --git a/src/wx/gl_video_view.cc b/src/wx/gl_video_view.cc
index 2da16f1df..d47ad87f4 100644
--- 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)
@@ -264,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);
@@ -325,19 +336,26 @@ try
 			}
 
 			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));
 	}
 
 	/* XXX: leaks _context, but that seems preferable to deleting it here