X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Fsimple_video_view.cc;h=a31d823a99682d9f5dd0e87f6a0f64f9ced9cd62;hp=524106b6769fd2f7be9b89647d3439d86fbb94e0;hb=ecc74ec418e060fa163d25d08a62a6e81eece114;hpb=ec1df37a1940063dc0dbc45ad2dab638bdc92c0d diff --git a/src/wx/simple_video_view.cc b/src/wx/simple_video_view.cc index 524106b67..a31d823a9 100644 --- a/src/wx/simple_video_view.cc +++ b/src/wx/simple_video_view.cc @@ -20,12 +20,24 @@ #include "simple_video_view.h" #include "film_viewer.h" +#include "wx_util.h" +#include "closed_captions_dialog.h" #include "lib/image.h" +#include "lib/dcpomatic_log.h" +#include "lib/butler.h" #include #include -#include +#include using std::max; +using std::string; +using boost::optional; +using std::shared_ptr; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif +using namespace dcpomatic; + SimpleVideoView::SimpleVideoView (FilmViewer* viewer, wxWindow* parent) : VideoView (viewer) @@ -41,21 +53,16 @@ SimpleVideoView::SimpleVideoView (FilmViewer* viewer, wxWindow* parent) _panel->Bind (wxEVT_PAINT, boost::bind (&SimpleVideoView::paint, this)); _panel->Bind (wxEVT_SIZE, boost::bind(boost::ref(Sized))); + + _timer.Bind (wxEVT_TIMER, boost::bind(&SimpleVideoView::timer, this)); } void SimpleVideoView::paint () { + _state_timer.set("paint-panel"); wxPaintDC dc (_panel); -#ifdef DCPOMATIC_VARIANT_SWAROOP - if (viewer->background_image()) { - dc.Clear (); - maybe_draw_background_image (dc); - return; - } -#endif - dcp::Size const out_size = _viewer->out_size (); wxSize const panel_size = _panel->GetSize (); @@ -66,42 +73,21 @@ SimpleVideoView::paint () 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)); - -#ifdef DCPOMATIC_VARIANT_SWAROOP - XXX - DCPTime const period = DCPTime::from_seconds(Config::instance()->player_watermark_period() * 60); - int64_t n = _video_position.get() / period.get(); - DCPTime from(n * period.get()); - DCPTime to = from + DCPTime::from_seconds(Config::instance()->player_watermark_duration() / 1000.0); - if (from <= _video_position && _video_position <= to) { - if (!_in_watermark) { - _in_watermark = true; - _watermark_x = rand() % _panel_size.width; - _watermark_y = rand() % _panel_size.height; - } - dc.SetTextForeground(*wxWHITE); - string wm = Config::instance()->player_watermark_theatre(); - boost::posix_time::ptime t = boost::posix_time::second_clock::local_time(); - wm += "\n" + boost::posix_time::to_iso_extended_string(t); - dc.DrawText(std_to_wx(wm), _watermark_x, _watermark_y); - } else { - _in_watermark = false; - } -#endif } + auto const pad_colour = (_viewer->pad_black() || gui_is_dark()) ? wxColour(0, 0, 0) : wxColour(240, 240, 240); + if (out_size.width < panel_size.GetWidth()) { - /* XXX: these colours are right for GNOME; may need adjusting for other OS */ - wxPen p (_viewer->pad_black() ? wxColour(0, 0, 0) : wxColour(240, 240, 240)); - wxBrush b (_viewer->pad_black() ? wxColour(0, 0, 0) : wxColour(240, 240, 240)); + wxPen p (pad_colour); + wxBrush b (pad_colour); 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 (_viewer->pad_black() ? wxColour(0, 0, 0) : wxColour(240, 240, 240)); - wxBrush b (_viewer->pad_black() ? wxColour(0, 0, 0) : wxColour(240, 240, 240)); + wxPen p (pad_colour); + wxBrush b (pad_colour); dc.SetPen (p); dc.SetBrush (b); int const gap = (panel_size.GetHeight() - out_size.height) / 2; @@ -110,18 +96,133 @@ SimpleVideoView::paint () } if (_viewer->outline_content()) { - Position inter_position = _viewer->inter_position (); - dcp::Size inter_size = _viewer->inter_size (); wxPen p (wxColour (255, 0, 0), 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); + dc.DrawRectangle (_inter_position.x, _inter_position.y + (panel_size.GetHeight() - out_size.height) / 2, _inter_size.width, _inter_size.height); } + + auto subs = _viewer->outline_subtitles(); + if (subs) { + wxPen p (wxColour(0, 255, 0), 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); + } + + _state_timer.unset(); } void -SimpleVideoView::update () +SimpleVideoView::refresh_panel () { + _state_timer.set ("refresh-panel"); _panel->Refresh (); _panel->Update (); + _state_timer.unset (); +} + +void +SimpleVideoView::timer () +{ + if (!_viewer->playing()) { + return; + } + + display_next_frame (false); + auto const next = position() + _viewer->one_video_frame(); + + if (next >= length()) { + _viewer->finished (); + return; + } + + LOG_DEBUG_VIDEO_VIEW("%1 -> %2; delay %3", next.seconds(), _viewer->time().seconds(), max((next.seconds() - _viewer->time().seconds()) * 1000, 1.0)); + _timer.Start (max(1, time_until_next_frame().get_value_or(0)), wxTIMER_ONE_SHOT); + + if (_viewer->butler()) { + _viewer->butler()->rethrow (); + } +} + +void +SimpleVideoView::start () +{ + VideoView::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). + * @return true on success, false if we did nothing because it would have taken too long. + */ +VideoView::NextFrameResult +SimpleVideoView::display_next_frame (bool non_blocking) +{ + auto const r = get_next_frame (non_blocking); + if (r != SUCCESS) { + return r; + } + + update (); + + try { + _viewer->butler()->rethrow (); + } catch (DecodeError& e) { + error_dialog (get(), e.what()); + } + + return SUCCESS; +} + +void +SimpleVideoView::update () +{ + if (!player_video().first) { + set_image (shared_ptr()); + refresh_panel (); + return; + } + + if (_viewer->playing() && (_viewer->time() - player_video().second) > one_video_frame()) { + /* Too late; just drop this frame before we try to get its image (which will be the time-consuming + part if this frame is J2K). + */ + add_dropped (); + return; + } + + /* In an ideal world, what we would do here is: + * + * 1. convert to XYZ exactly as we do in the DCP creation path. + * 2. convert back to RGB for the preview display, compensating + * for the monitor etc. etc. + * + * but this is inefficient if the source is RGB. Since we don't + * (currently) care too much about the precise accuracy of the preview's + * colour mapping (and we care more about its speed) we try to short- + * circuit this "ideal" situation in some cases. + * + * The content's specified colour conversion indicates the colourspace + * which the content is in (according to the user). + * + * PlayerVideo::image (bound to PlayerVideo::force) will take the source + * image and convert it (from whatever the user has said it is) to RGB. + */ + + _state_timer.set ("get image"); + + set_image ( + player_video().first->image(bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), VideoRange::FULL, false, true) + ); + + _state_timer.set ("ImageChanged"); + _viewer->image_changed (player_video().first); + _state_timer.unset (); + + _inter_position = player_video().first->inter_position (); + _inter_size = player_video().first->inter_size (); + + refresh_panel (); }