X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fsimple_video_view.cc;h=8524c1fe91f559f2b3d1c78a0fe923fee6e8546d;hb=5b10ee366f819c05d69ea8e78c8348eca99721b5;hp=358e4268c37f13407562895c1261d831dd02bfb7;hpb=2b72040260c8b38c8986dc1601e36053115b4914;p=dcpomatic.git diff --git a/src/wx/simple_video_view.cc b/src/wx/simple_video_view.cc index 358e4268c..8524c1fe9 100644 --- a/src/wx/simple_video_view.cc +++ b/src/wx/simple_video_view.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2019 Carl Hetherington + Copyright (C) 2019-2021 Carl Hetherington 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 +#include +LIBDCP_DISABLE_WARNINGS #include +LIBDCP_ENABLE_WARNINGS #include + 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,38 +66,42 @@ 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); - dcp::Size const out_size = _viewer->out_size (); - wxSize const panel_size = _panel->GetSize (); + auto const panel_size = _panel->GetSize (); + auto pad = pad_colour(); - if (!out_size.width || !out_size.height || !_image || out_size != _image->size()) { + 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 appearance = wxSystemSettings::GetAppearance(); - auto const pad_colour = (_viewer->pad_black() || appearance.IsDark()) ? wxColour(0, 0, 0) : wxColour(240, 240, 240); - if (out_size.width < panel_size.GetWidth()) { - wxPen p (pad_colour); - wxBrush b (pad_colour); + 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()); } if (out_size.height < panel_size.GetHeight()) { - wxPen p (pad_colour); - wxBrush b (pad_colour); + wxPen p (pad); + wxBrush b (pad); dc.SetPen (p); dc.SetBrush (b); int const gap = (panel_size.GetHeight() - out_size.height) / 2; @@ -97,23 +110,37 @@ SimpleVideoView::paint () } if (_viewer->outline_content()) { - wxPen p (wxColour (255, 0, 0), 2); + 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); } - optional > subs = _viewer->outline_subtitles(); + auto subs = _viewer->outline_subtitles(); if (subs) { - wxPen p (wxColour(0, 255, 0), 2); + wxPen p (outline_subtitles_colour(), 2); dc.SetPen (p); dc.SetBrush (*wxTRANSPARENT_BRUSH); 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 () { @@ -123,6 +150,7 @@ SimpleVideoView::refresh_panel () _state_timer.unset (); } + void SimpleVideoView::timer () { @@ -131,7 +159,7 @@ SimpleVideoView::timer () } display_next_frame (false); - DCPTime const next = position() + _viewer->one_video_frame(); + auto const next = position() + _viewer->one_video_frame(); if (next >= length()) { _viewer->finished (); @@ -142,10 +170,15 @@ 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())); + } } } + void SimpleVideoView::start () { @@ -153,6 +186,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). @@ -161,7 +195,7 @@ SimpleVideoView::start () VideoView::NextFrameResult SimpleVideoView::display_next_frame (bool non_blocking) { - NextFrameResult const r = get_next_frame (non_blocking); + auto const r = get_next_frame (non_blocking); if (r != SUCCESS) { return r; } @@ -177,11 +211,12 @@ SimpleVideoView::display_next_frame (bool non_blocking) return SUCCESS; } + void SimpleVideoView::update () { if (!player_video().first) { - set_image (shared_ptr()); + _image.reset (); refresh_panel (); return; } @@ -214,9 +249,11 @@ SimpleVideoView::update () _state_timer.set ("get image"); - set_image ( - player_video().first->image(bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), VIDEO_RANGE_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);