Fix build.

[dcpomatic.git] / src / wx / simple_video_view.cc

diff --git a/src/wx/simple_video_view.cc b/src/wx/simple_video_view.cc
index 00d81ab47a4d89f89e552b55ab017348e7220363..8524c1fe91f559f2b3d1c78a0fe923fee6e8546d 100644 (file)
--- a/src/wx/simple_video_view.cc
+++ b/src/wx/simple_video_view.cc
@@ -26,6 +26,8 @@
 #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
@@ -46,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);
 
@@ -166,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()));
+               }
        }
 }
 
@@ -241,7 +249,11 @@ SimpleVideoView::update ()
 
        _state_timer.set ("get image");
 
-       _image = player_video().first->image(boost::bind(&PlayerVideo::force, 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);