#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 <boost/bind.hpp>
#include <iostream>
: 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);
- _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")) {
GLVideoView::~GLVideoView ()
{
- if (_thread) {
- _thread->interrupt ();
- _thread->join ();
- }
+ _thread->interrupt ();
+ _thread->join ();
delete _thread;
glDeleteTextures (1, &_id);
}
+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)
{
}
}
-void
-GLVideoView::paint ()
-{
- /* XXX_b: can't do this yet */
-#if 0
- _viewer->state_timer().set("paint-panel");
- _canvas->SetCurrent (*_context);
- wxPaintDC dc (_canvas);
- draw ();
- _viewer->state_timer().unset();
-#endif
-}
-
void
GLVideoView::update ()
{
if (!_canvas->IsShownOnScreen()) {
return;
}
- /* XXX_b */
-// wxClientDC dc (_canvas);
-// draw ();
+ 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");
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);
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()) {
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);
void
GLVideoView::start ()
{
- _thread = new boost::thread (boost::bind(&GLVideoView::thread, this));
-}
-
-void
-GLVideoView::stop ()
-{
- if (_thread) {
- _thread->interrupt ();
- _thread->join ();
- }
- delete _thread;
- _thread = 0;
-}
+ VideoView::start ();
-bool
-GLVideoView::one_shot () const
-{
- boost::mutex::scoped_lock lm (_one_shot_mutex);
- return _one_shot;
+ boost::mutex::scoped_lock lm (_playing_mutex);
+ _playing = true;
+ _playing_condition.notify_all ();
}
void
-GLVideoView::set_one_shot (bool s)
+GLVideoView::stop ()
{
- boost::mutex::scoped_lock lm (_one_shot_mutex);
- _one_shot = s;
+ boost::mutex::scoped_lock lm (_playing_mutex);
+ _playing = false;
}
void
try
{
/* XXX_b: check all calls and signal emissions in this method & protect them if necessary */
- {
- boost::mutex::scoped_lock lm (_context_mutex);
- _context = new wxGLContext (_canvas);
- _canvas->SetCurrent (*_context);
- }
+ _context = new wxGLContext (_canvas);
+ _canvas->SetCurrent (*_context);
while (true) {
- if (!film() && !one_shot()) {
- /* XXX: this should be an indefinite wait until
- one of our conditions becomes true.
- */
- dcpomatic_sleep_milliseconds (40);
- continue;
- }
-
- set_one_shot (false);
-
- dcpomatic::DCPTime const next = position() + one_video_frame();
-
- if (next >= film()->length()) {
- _viewer->stop ();
- _viewer->emit_finished ();
- continue;
+ boost::mutex::scoped_lock lm (_playing_mutex);
+ while (!_playing && !_one_shot) {
+ _playing_condition.wait (lm);
}
-
- get_next_frame (false);
- {
- boost::mutex::scoped_lock lm (_mutex);
- set_image (_player_video.first->image(bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), false, true));
+ _one_shot = false;
+ lm.unlock ();
+
+ Position<int> 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 ();
+ 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());
}
- {
- boost::mutex::scoped_lock lm (_context_mutex);
- delete _context;
- }
+ delete _context;
}
catch (boost::thread_interrupted& e)
{
return;
}
-wxGLContext *
-GLVideoView::context () const
-{
- boost::mutex::scoped_lock lm (_context_mutex);
- return _context;
-}
-
bool
GLVideoView::display_next_frame (bool non_blocking)
{
- bool const g = get_next_frame (non_blocking);
- set_one_shot (true);
- return g;
+ bool const r = get_next_frame (non_blocking);
+ request_one_shot ();
+ return r;
}
-dcpomatic::DCPTime
-GLVideoView::one_video_frame () const
+void
+GLVideoView::request_one_shot ()
{
- return dcpomatic::DCPTime::from_frames (1, film()->video_frame_rate());
+ 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));
+ }
+}
projects / dcpomatic.git / blobdiff