/*
- Copyright (C) 2019 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2019-2021 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
*/
-#include "simple_video_view.h"
+
+#include "closed_captions_dialog.h"
#include "film_viewer.h"
+#include "simple_video_view.h"
#include "wx_util.h"
-#include "closed_captions_dialog.h"
-#include "lib/image.h"
-#include "lib/dcpomatic_log.h"
#include "lib/butler.h"
+#include "lib/dcpomatic_log.h"
+#include "lib/image.h"
#include <dcp/util.h>
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
#include <wx/wx.h>
+LIBDCP_ENABLE_WARNINGS
#include <boost/bind/bind.hpp>
+
using std::max;
+using std::shared_ptr;
using std::string;
using boost::optional;
-using std::shared_ptr;
#if BOOST_VERSION >= 106100
using namespace boost::placeholders;
#endif
_timer.Bind (wxEVT_TIMER, boost::bind(&SimpleVideoView::timer, this));
}
+
void
SimpleVideoView::paint ()
{
_state_timer.set("paint-panel");
wxPaintDC dc (_panel);
+ auto scale = 1 / dpi_scale_factor (_panel);
+ dc.SetLogicalScale (scale, scale);
- dcp::Size const out_size = _viewer->out_size ();
- wxSize const panel_size = _panel->GetSize ();
+ auto const panel_size = _panel->GetSize ();
- if (!out_size.width || !out_size.height || !_image || out_size != _image->size()) {
+ dcp::Size out_size;
+ if (!_image) {
dc.Clear ();
} else {
-
+ DCPOMATIC_ASSERT (_image->alignment() == Image::Alignment::COMPACT);
+ out_size = _image->size();
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.GetHeight() - out_size.height) / 2));
}
-#ifdef DCPOMATIC_OSX
- auto appearance = wxSystemSettings::GetAppearance();
- auto dark = appearance.IsDark();
-#else
- auto dark = false;
-#endif
-
- auto const pad_colour = (_viewer->pad_black() || dark) ? wxColour(0, 0, 0) : wxColour(240, 240, 240);
+ auto pad = pad_colour();
if (out_size.width < panel_size.GetWidth()) {
- wxPen p (pad_colour);
- wxBrush b (pad_colour);
+ wxPen p (pad);
+ wxBrush b (pad);
dc.SetPen (p);
dc.SetBrush (b);
dc.DrawRectangle (out_size.width, 0, panel_size.GetWidth() - out_size.width, panel_size.GetHeight());
}
if (out_size.height < panel_size.GetHeight()) {
- wxPen p (pad_colour);
- wxBrush b (pad_colour);
+ wxPen p (pad);
+ wxBrush b (pad);
dc.SetPen (p);
dc.SetBrush (b);
int const gap = (panel_size.GetHeight() - out_size.height) / 2;
}
if (_viewer->outline_content()) {
- wxPen p (wxColour (255, 0, 0), 2);
+ wxPen p (outline_content_colour(), 2);
dc.SetPen (p);
dc.SetBrush (*wxTRANSPARENT_BRUSH);
dc.DrawRectangle (_inter_position.x, _inter_position.y + (panel_size.GetHeight() - out_size.height) / 2, _inter_size.width, _inter_size.height);
}
- optional<dcpomatic::Rect<double> > subs = _viewer->outline_subtitles();
+ auto subs = _viewer->outline_subtitles();
if (subs) {
- wxPen p (wxColour(0, 255, 0), 2);
+ wxPen p (outline_subtitles_colour(), 2);
dc.SetPen (p);
dc.SetBrush (*wxTRANSPARENT_BRUSH);
dc.DrawRectangle (subs->x * out_size.width, subs->y * out_size.height, subs->width * out_size.width, subs->height * out_size.height);
_state_timer.unset();
}
+
void
SimpleVideoView::refresh_panel ()
{
_state_timer.unset ();
}
+
void
SimpleVideoView::timer ()
{
}
display_next_frame (false);
- DCPTime const next = position() + _viewer->one_video_frame();
+ auto const next = position() + _viewer->one_video_frame();
if (next >= length()) {
_viewer->finished ();
}
}
+
void
SimpleVideoView::start ()
{
timer ();
}
+
/** Try to get a frame from the butler and display it.
* @param non_blocking 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).
VideoView::NextFrameResult
SimpleVideoView::display_next_frame (bool non_blocking)
{
- NextFrameResult const r = get_next_frame (non_blocking);
+ auto const r = get_next_frame (non_blocking);
if (r != SUCCESS) {
return r;
}
return SUCCESS;
}
+
void
SimpleVideoView::update ()
{
if (!player_video().first) {
- set_image (shared_ptr<Image>());
+ _image.reset ();
refresh_panel ();
return;
}
_state_timer.set ("get image");
- set_image (
- player_video().first->image(bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), VideoRange::FULL, false, true)
- );
+ _image = player_video().first->image(boost::bind(&PlayerVideo::force, AV_PIX_FMT_RGB24), VideoRange::FULL, true);
_state_timer.set ("ImageChanged");
_viewer->image_changed (player_video().first);