X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fsimple_video_view.cc;h=8524c1fe91f559f2b3d1c78a0fe923fee6e8546d;hb=1900aff395ecace8bfa8bd367a2e0327f4d2736d;hp=f4ff9a4ebaea4da93ef57ba8d714953247eca46b;hpb=54255e8a535d08055e526888a6d4d2f4aa68c203;p=dcpomatic.git

diff --git a/src/wx/simple_video_view.cc b/src/wx/simple_video_view.cc
index f4ff9a4eb..8524c1fe9 100644
--- a/src/wx/simple_video_view.cc
+++ b/src/wx/simple_video_view.cc
@@ -26,8 +26,13 @@
 #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>
 
 
@@ -43,6 +48,8 @@ using namespace dcpomatic;
 
 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);
 
@@ -69,9 +76,12 @@ SimpleVideoView::paint ()
 	dc.SetLogicalScale (scale, scale);
 
 	auto const panel_size = _panel->GetSize ();
+	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);
@@ -81,8 +91,6 @@ SimpleVideoView::paint ()
 		dc.DrawBitmap (frame_bitmap, 0, max(0, (panel_size.GetHeight() - out_size.height) / 2));
 	}
 
-	auto pad = pad_colour();
-
 	if (out_size.width < panel_size.GetWidth()) {
 		wxPen   p (pad);
 		wxBrush b (pad);
@@ -116,6 +124,19 @@ SimpleVideoView::paint ()
 		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();
 }
 
@@ -149,7 +170,11 @@ SimpleVideoView::timer ()
 	_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()));
+		}
 	}
 }
 
@@ -224,7 +249,11 @@ SimpleVideoView::update ()
 
 	_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);