*/
-SimpleVideoView::SimpleVideoView (wxWindow* parent)
+#include "simple_video_view.h"
+#include "film_viewer.h"
+#include "wx_util.h"
+#include "closed_captions_dialog.h"
+#include "lib/image.h"
+#include "lib/dcpomatic_log.h"
+#include "lib/butler.h"
+#include <dcp/util.h>
+#include <wx/wx.h>
+#include <boost/bind.hpp>
+
+using std::max;
+using std::string;
+using boost::optional;
+using boost::shared_ptr;
+using namespace dcpomatic;
+
+SimpleVideoView::SimpleVideoView (FilmViewer* viewer, wxWindow* parent)
+ : VideoView (viewer)
{
_panel = new wxPanel (parent);
_panel->SetBackgroundStyle (wxBG_STYLE_PAINT);
_panel->SetBackgroundColour (*wxBLACK);
- _panel->Bind (wxEVT_PAINT, boost::bind (&SimpleVideoView::paint_panel, this));
- _panel->Bind (wxEVT_SIZE, boost::bind (&SimpleVideoView::panel_sized, this, _1));
+ _panel->Bind (wxEVT_PAINT, boost::bind (&SimpleVideoView::paint, this));
+ _panel->Bind (wxEVT_SIZE, boost::bind(boost::ref(Sized)));
+
+ _timer.Bind (wxEVT_TIMER, boost::bind(&SimpleVideoView::timer, this));
}
void
-SimpleVideoView::paint_panel ()
+SimpleVideoView::paint ()
{
+ _viewer->state_timer().set("paint-panel");
wxPaintDC dc (_panel);
+ dcp::Size const out_size = _viewer->out_size ();
+ wxSize const panel_size = _panel->GetSize ();
+
#ifdef DCPOMATIC_VARIANT_SWAROOP
- if (_background_image) {
+ if (_viewer->background_image()) {
dc.Clear ();
- maybe_draw_background_image (dc);
- _state_timer.unset ();
+ optional<boost::filesystem::path> bg = Config::instance()->player_background_image();
+ if (bg) {
+ wxImage image (std_to_wx(bg->string()));
+ wxBitmap bitmap (image);
+ dc.DrawBitmap (bitmap, max(0, (panel_size.GetWidth() - image.GetSize().GetWidth()) / 2), max(0, (panel_size.GetHeight() - image.GetSize().GetHeight()) / 2));
+ }
return;
}
#endif
- if (!_out_size.width || !_out_size.height || !_film || !_frame || _out_size != _frame->size()) {
+ if (!out_size.width || !out_size.height || !_image || out_size != _image->size()) {
dc.Clear ();
} else {
- wxImage frame (_out_size.width, _out_size.height, _frame->data()[0], true);
+ wxImage frame (out_size.width, out_size.height, _image->data()[0], true);
wxBitmap frame_bitmap (frame);
- dc.DrawBitmap (frame_bitmap, 0, max(0, (_panel_size.height - _out_size.height) / 2));
+ dc.DrawBitmap (frame_bitmap, 0, max(0, (panel_size.GetHeight() - out_size.height) / 2));
#ifdef DCPOMATIC_VARIANT_SWAROOP
DCPTime const period = DCPTime::from_seconds(Config::instance()->player_watermark_period() * 60);
- int64_t n = _video_position.get() / period.get();
+ int64_t n = _viewer->position().get() / period.get();
DCPTime from(n * period.get());
DCPTime to = from + DCPTime::from_seconds(Config::instance()->player_watermark_duration() / 1000.0);
- if (from <= _video_position && _video_position <= to) {
+ if (from <= _viewer->position() && _viewer->position() <= to) {
if (!_in_watermark) {
_in_watermark = true;
- _watermark_x = rand() % _panel_size.width;
- _watermark_y = rand() % _panel_size.height;
+ _watermark_x = rand() % panel_size.GetWidth();
+ _watermark_y = rand() % panel_size.GetHeight();
}
dc.SetTextForeground(*wxWHITE);
string wm = Config::instance()->player_watermark_theatre();
#endif
}
- if (_out_size.width < _panel_size.width) {
+ if (out_size.width < panel_size.GetWidth()) {
/* XXX: these colours are right for GNOME; may need adjusting for other OS */
- wxPen p (_pad_black ? wxColour(0, 0, 0) : wxColour(240, 240, 240));
- wxBrush b (_pad_black ? wxColour(0, 0, 0) : wxColour(240, 240, 240));
+ wxPen p (_viewer->pad_black() ? wxColour(0, 0, 0) : wxColour(240, 240, 240));
+ wxBrush b (_viewer->pad_black() ? wxColour(0, 0, 0) : wxColour(240, 240, 240));
dc.SetPen (p);
dc.SetBrush (b);
- dc.DrawRectangle (_out_size.width, 0, _panel_size.width - _out_size.width, _panel_size.height);
+ dc.DrawRectangle (out_size.width, 0, panel_size.GetWidth() - out_size.width, panel_size.GetHeight());
}
- if (_out_size.height < _panel_size.height) {
- wxPen p (_pad_black ? wxColour(0, 0, 0) : wxColour(240, 240, 240));
- wxBrush b (_pad_black ? wxColour(0, 0, 0) : wxColour(240, 240, 240));
+ if (out_size.height < panel_size.GetHeight()) {
+ wxPen p (_viewer->pad_black() ? wxColour(0, 0, 0) : wxColour(240, 240, 240));
+ wxBrush b (_viewer->pad_black() ? wxColour(0, 0, 0) : wxColour(240, 240, 240));
dc.SetPen (p);
dc.SetBrush (b);
- int const gap = (_panel_size.height - _out_size.height) / 2;
- dc.DrawRectangle (0, 0, _panel_size.width, gap);
- dc.DrawRectangle (0, gap + _out_size.height + 1, _panel_size.width, gap + 1);
+ int const gap = (panel_size.GetHeight() - out_size.height) / 2;
+ dc.DrawRectangle (0, 0, panel_size.GetWidth(), gap);
+ dc.DrawRectangle (0, gap + out_size.height + 1, panel_size.GetWidth(), gap + 1);
}
- if (_outline_content) {
+ if (_viewer->outline_content()) {
+ Position<int> inter_position = _viewer->inter_position ();
+ dcp::Size inter_size = _viewer->inter_size ();
wxPen p (wxColour (255, 0, 0), 2);
dc.SetPen (p);
dc.SetBrush (*wxTRANSPARENT_BRUSH);
- dc.DrawRectangle (_inter_position.x, _inter_position.y + (_panel_size.height - _out_size.height) / 2, _inter_size.width, _inter_size.height);
+ dc.DrawRectangle (inter_position.x, inter_position.y + (panel_size.GetHeight() - out_size.height) / 2, inter_size.width, inter_size.height);
+ }
+ _viewer->state_timer().unset();
+}
+
+void
+SimpleVideoView::update ()
+{
+ _panel->Refresh ();
+ _panel->Update ();
+}
+
+void
+SimpleVideoView::timer ()
+{
+ if (!_viewer->film() || !_viewer->playing()) {
+ return;
+ }
+
+ get (false);
+ DCPTime const next = _viewer->position() + _viewer->one_video_frame();
+
+ if (next >= _viewer->film()->length()) {
+ _viewer->stop ();
+ _viewer->Finished ();
+ return;
+ }
+
+ LOG_DEBUG_PLAYER("%1 -> %2; delay %3", next.seconds(), _viewer->time().seconds(), max((next.seconds() - _viewer->time().seconds()) * 1000, 1.0));
+ _timer.Start (_viewer->time_until_next_frame(), wxTIMER_ONE_SHOT);
+
+ if (_viewer->butler()) {
+ _viewer->butler()->rethrow ();
+ }
+}
+
+void
+SimpleVideoView::start ()
+{
+ timer ();
+}
+
+/** Try to get a frame from the butler and display it.
+ * @param lazy true to return false quickly if no video is available quickly (i.e. we are waiting for the butler).
+ * false to ask the butler to block until it has video (unless it is suspended).
+ * @return true on success, false if we did nothing because it would have taken too long.
+ */
+bool
+SimpleVideoView::get (bool lazy)
+{
+ bool r = get_next_frame (lazy);
+ if (!r) {
+ if (lazy) {
+ /* No video available; return saying we failed */
+ return false;
+ } else {
+ /* Player was suspended; come back later */
+ signal_manager->when_idle (boost::bind(&SimpleVideoView::get, this, false));
+ return false;
+ }
}
+
+ display_player_video ();
+ _viewer->PositionChanged ();
+
+ return true;
}
void
-SimpleVideoView::panel_sized (wxSizeEvent& ev)
+SimpleVideoView::display_player_video ()
{
- _panel_size.width = ev.GetSize().GetWidth();
- _panel_size.height = ev.GetSize().GetHeight();
+ if (!_player_video.first) {
+ set_image (shared_ptr<Image>());
+ _viewer->refresh_view ();
+ return;
+ }
- calculate_sizes ();
- if (!quick_refresh()) {
- slow_refresh ();
+ if (_viewer->playing() && (_viewer->time() - _player_video.second) > _viewer->one_video_frame()) {
+ /* Too late; just drop this frame before we try to get its image (which will be the time-consuming
+ part if this frame is J2K).
+ */
+ _viewer->_video_position = _player_video.second;
+ ++_viewer->_dropped;
+ return;
}
- PositionChanged ();
+
+ /* In an ideal world, what we would do here is:
+ *
+ * 1. convert to XYZ exactly as we do in the DCP creation path.
+ * 2. convert back to RGB for the preview display, compensating
+ * for the monitor etc. etc.
+ *
+ * but this is inefficient if the source is RGB. Since we don't
+ * (currently) care too much about the precise accuracy of the preview's
+ * colour mapping (and we care more about its speed) we try to short-
+ * circuit this "ideal" situation in some cases.
+ *
+ * The content's specified colour conversion indicates the colourspace
+ * which the content is in (according to the user).
+ *
+ * PlayerVideo::image (bound to PlayerVideo::force) will take the source
+ * image and convert it (from whatever the user has said it is) to RGB.
+ */
+
+ _viewer->_state_timer.set ("get image");
+
+ set_image (
+ _player_video.first->image(bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), false, true)
+ );
+
+ _viewer->_state_timer.set ("ImageChanged");
+ _viewer->ImageChanged (_player_video.first);
+ _viewer->_state_timer.unset ();
+
+ _viewer->_video_position = _player_video.second;
+ _viewer->_inter_position = _player_video.first->inter_position ();
+ _viewer->_inter_size = _player_video.first->inter_size ();
+
+ _viewer->refresh_view ();
+
+ _viewer->_closed_captions_dialog->update (_viewer->time());
}
projects / dcpomatic.git / blobdiff