GLVideoView::GLVideoView (FilmViewer* viewer, wxWindow *parent)
: VideoView (viewer)
+ , _have_storage (false)
, _vsync_enabled (false)
- , _thread (0)
, _playing (false)
, _one_shot (false)
{
GLVideoView::~GLVideoView ()
{
- _thread->interrupt ();
- _thread->join ();
- delete _thread;
+ try {
+ _thread.interrupt ();
+ _thread.join ();
+ } catch (...) {
+
+ }
glDeleteTextures (1, &_id);
}
void
GLVideoView::check_for_butler_errors ()
{
+ if (!_viewer->butler()) {
+ return;
+ }
+
try {
_viewer->butler()->rethrow ();
} catch (DecodeError& e) {
void
GLVideoView::update ()
{
- if (!_canvas->IsShownOnScreen()) {
- return;
+ {
+ boost::mutex::scoped_lock lm (_canvas_mutex);
+ if (!_canvas->IsShownOnScreen()) {
+ return;
+ }
}
request_one_shot ();
}
void
-GLVideoView::draw ()
+GLVideoView::draw (Position<int> inter_position, dcp::Size inter_size)
{
glClear (GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
check_gl_error ("glClear");
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 ();
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 */
if (_viewer->outline_content()) {
glColor3ub (255, 0, 0);
glBegin (GL_LINE_LOOP);
- Position<int> 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);
}
glFlush();
+
+ boost::mutex::scoped_lock lm (_canvas_mutex);
_canvas->SwapBuffers();
}
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);
boost::mutex::scoped_lock lm (_playing_mutex);
_playing = true;
- _playing_condition.notify_all ();
+ _thread_work_condition.notify_all ();
}
void
_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<int> n = time_until_next_frame();
+ if (!n || *n > 5) {
+ break;
+ }
+ get_next_frame (true);
+ add_dropped ();
+ }
+}
+
+
+void
+GLVideoView::set_image_and_draw ()
+{
+ shared_ptr<PlayerVideo> 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
{
- /* 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);
while (!_playing && !_one_shot) {
- _playing_condition.wait (lm);
+ _thread_work_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);
- add_dropped ();
+ 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());
+ 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
{
boost::mutex::scoped_lock lm (_playing_mutex);
_one_shot = true;
- _playing_condition.notify_all ();
+ _thread_work_condition.notify_all ();
}
void
GLVideoView::create ()
{
- if (!_thread) {
- _thread = new boost::thread (boost::bind(&GLVideoView::thread, this));
+ if (!_thread.joinable()) {
+ _thread = boost::thread (boost::bind(&GLVideoView::thread, this));
}
}
projects / dcpomatic.git / blobdiff