X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fsimple_video_view.cc;h=09c17217194bbe0f0423e755bbec2e7070f0a92c;hb=5ee919f413a6c1048aecf83676d42ab3fd94e06e;hp=5dd47ce4c2d545d8716a541b35156e733d00c606;hpb=7bebe412366e9156aa908d054d9fa210cc370f92;p=dcpomatic.git

diff --git a/src/wx/simple_video_view.cc b/src/wx/simple_video_view.cc
index 5dd47ce4c..09c172171 100644
--- a/src/wx/simple_video_view.cc
+++ b/src/wx/simple_video_view.cc
@@ -1,5 +1,5 @@
 /*
-    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.
 
@@ -18,21 +18,28 @@
 
 */
 
-#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 "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>
 
+
 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
@@ -41,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);
 
@@ -57,26 +66,31 @@ SimpleVideoView::SimpleVideoView (FilmViewer* viewer, wxWindow* parent)
 	_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);
 
 	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);
 		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));
 	}
 
-	auto pad = pad_colour();
-
 	if (out_size.width < panel_size.GetWidth()) {
 		wxPen   p (pad);
 		wxBrush b (pad);
@@ -110,9 +124,23 @@ 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();
 }
 
+
 void
 SimpleVideoView::refresh_panel ()
 {
@@ -122,6 +150,7 @@ SimpleVideoView::refresh_panel ()
 	_state_timer.unset ();
 }
 
+
 void
 SimpleVideoView::timer ()
 {
@@ -145,6 +174,7 @@ SimpleVideoView::timer ()
 	}
 }
 
+
 void
 SimpleVideoView::start ()
 {
@@ -152,6 +182,7 @@ 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).
@@ -176,11 +207,12 @@ SimpleVideoView::display_next_frame (bool non_blocking)
 	return SUCCESS;
 }
 
+
 void
 SimpleVideoView::update ()
 {
 	if (!player_video().first) {
-		set_image (shared_ptr<Image>());
+		_image.reset ();
 		refresh_panel ();
 		return;
 	}
@@ -213,9 +245,11 @@ SimpleVideoView::update ()
 
 	_state_timer.set ("get image");
 
-	set_image (
-		player_video().first->image(bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), VideoRange::FULL, false, 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);