#include "lib/butler.h"
#include "lib/dcpomatic_log.h"
#include "lib/image.h"
+#include "lib/video_filter_graph.h"
+#include "lib/video_filter_graph_set.h"
#include <dcp/util.h>
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
#include <wx/wx.h>
+LIBDCP_ENABLE_WARNINGS
#include <boost/bind/bind.hpp>
SimpleVideoView::SimpleVideoView (FilmViewer* viewer, wxWindow* parent)
: VideoView (viewer)
+ , _rec2020_filter("convert", "convert", "", "colorspace=all=bt709:iall=bt2020")
+ , _rec2020_filter_graph({ _rec2020_filter }, dcp::Fraction(24, 1))
{
_panel = new wxPanel (parent);
auto scale = 1 / dpi_scale_factor (_panel);
dc.SetLogicalScale (scale, scale);
- auto const panel_size = _panel->GetSize ();
+ auto const panel_size = dcp::Size(_panel->GetSize().GetWidth() / scale, _panel->GetSize().GetHeight() / scale);
+ auto pad = pad_colour();
dcp::Size out_size;
if (!_image) {
+ wxBrush b (pad);
+ dc.SetBackground (b);
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));
+ dc.DrawBitmap(frame_bitmap, 0, max(0, (panel_size.height - out_size.height) / 2));
}
- auto pad = pad_colour();
-
- if (out_size.width < panel_size.GetWidth()) {
+ if (out_size.width < panel_size.width) {
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());
+ dc.DrawRectangle(out_size.width, 0, panel_size.width - out_size.width, panel_size.height);
}
- if (out_size.height < panel_size.GetHeight()) {
+ if (out_size.height < panel_size.height) {
wxPen p (pad);
wxBrush b (pad);
dc.SetPen (p);
dc.SetBrush (b);
- 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);
+ 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);
}
if (_viewer->outline_content()) {
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);
+ dc.DrawRectangle(_inter_position.x, _inter_position.y + (panel_size.height - out_size.height) / 2, _inter_size.width, _inter_size.height);
}
auto subs = _viewer->outline_subtitles();
dc.DrawRectangle (subs->x * out_size.width, subs->y * out_size.height, subs->width * out_size.width, subs->height * out_size.height);
}
+ if (_viewer->crop_guess()) {
+ wxPen p (crop_guess_colour(), 2);
+ dc.SetPen (p);
+ dc.SetBrush (*wxTRANSPARENT_BRUSH);
+ auto const crop_guess = _viewer->crop_guess().get();
+ dc.DrawRectangle (
+ _inter_position.x + _inter_size.width * crop_guess.x,
+ _inter_position.y + _inter_size.height * crop_guess.y,
+ _inter_size.width * crop_guess.width,
+ _inter_size.height * crop_guess.height
+ );
+ }
+
_state_timer.unset();
}
_timer.Start (max(1, time_until_next_frame().get_value_or(0)), wxTIMER_ONE_SHOT);
if (_viewer->butler()) {
- _viewer->butler()->rethrow ();
+ try {
+ _viewer->butler()->rethrow();
+ } catch (dcp::FileError& e) {
+ error_dialog(_panel, _("Could not play content"), std_to_wx(e.what()));
+ }
}
}
_state_timer.set ("get image");
- _image = player_video().first->image(bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), VideoRange::FULL, true);
+ auto const pv = player_video();
+ _image = pv.first->image(boost::bind(&PlayerVideo::force, AV_PIX_FMT_RGB24), VideoRange::FULL, true);
+ if (pv.first->colour_conversion() && pv.first->colour_conversion()->about_equal(dcp::ColourConversion::rec2020_to_xyz(), 1e-6)) {
+ _image = Image::ensure_alignment(_rec2020_filter_graph.get(_image->size(), _image->pixel_format())->process(_image).front(), Image::Alignment::COMPACT);
+ }
_state_timer.set ("ImageChanged");
_viewer->image_changed (player_video().first);