Don't show an error when cancelling subtitle analysis.

[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 f866bd4a895a6789df53f5ba4d4da1bb04a3ac4e..09c17217194bbe0f0423e755bbec2e7070f0a92c 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);
 
@@ -72,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);
@@ -84,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);
@@ -240,7 +245,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);