X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Ffilm_viewer.cc;h=9b01cd394bdee06f65e30915e381f7f3a1b6f8cd;hp=b728f6b2a0a47c8a69d54a69f0b5761260b5fe42;hb=c8db1d4012217ec295d2a77581cf0661543dc9af;hpb=b8cd038b2f5e6d521b3593c4f6024bf1cd287670 diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc index b728f6b2a..9b01cd394 100644 --- a/src/wx/film_viewer.cc +++ b/src/wx/film_viewer.cc @@ -27,6 +27,8 @@ #include "playhead_to_frame_dialog.h" #include "wx_util.h" #include "closed_captions_dialog.h" +#include "gl_video_view.h" +#include "simple_video_view.h" #include "lib/film.h" #include "lib/ratio.h" #include "lib/util.h" @@ -67,6 +69,7 @@ using boost::dynamic_pointer_cast; using boost::weak_ptr; using boost::optional; using dcp::Size; +using namespace dcpomatic; static int @@ -76,12 +79,12 @@ rtaudio_callback (void* out, void *, unsigned int frames, double, RtAudioStreamS } FilmViewer::FilmViewer (wxWindow* p) - : _panel (new wxPanel (p)) - , _coalesce_player_changes (false) + : _coalesce_player_changes (false) , _audio (DCPOMATIC_RTAUDIO_API) , _audio_channels (0) , _audio_block_size (1024) , _playing (false) + , _suspended (0) , _latency_history_count (0) , _dropped (0) , _closed_captions_dialog (new ClosedCaptionsDialog(p, this)) @@ -89,20 +92,23 @@ FilmViewer::FilmViewer (wxWindow* p) , _eyes (EYES_LEFT) , _pad_black (false) #ifdef DCPOMATIC_VARIANT_SWAROOP - , _in_watermark (false) , _background_image (false) #endif + , _state_timer ("viewer") + , _gets (0) + , _idle_get (false) { -#ifndef __WXOSX__ - _panel->SetDoubleBuffered (true); -#endif - - _panel->SetBackgroundStyle (wxBG_STYLE_PAINT); - _panel->SetBackgroundColour (*wxBLACK); + switch (Config::instance()->video_view_type()) { + case Config::VIDEO_VIEW_OPENGL: + _video_view = new GLVideoView (this, p); + break; + case Config::VIDEO_VIEW_SIMPLE: + _video_view = new SimpleVideoView (this, p); + break; + } - _panel->Bind (wxEVT_PAINT, boost::bind (&FilmViewer::paint_panel, this)); - _panel->Bind (wxEVT_SIZE, boost::bind (&FilmViewer::panel_sized, this, _1)); - _timer.Bind (wxEVT_TIMER, boost::bind (&FilmViewer::timer, this)); + _video_view->Sized.connect (boost::bind(&FilmViewer::video_view_sized, this)); + _timer.Bind (wxEVT_TIMER, boost::bind(&FilmViewer::timer, this)); set_film (shared_ptr ()); @@ -115,6 +121,34 @@ FilmViewer::~FilmViewer () stop (); } +/** Ask for ::get() to be called next time we are idle */ +void +FilmViewer::request_idle_get () +{ + if (_idle_get) { + return; + } + + _idle_get = true; + DCPOMATIC_ASSERT (signal_manager); + signal_manager->when_idle (boost::bind(&FilmViewer::idle_handler, this)); +} + +void +FilmViewer::idle_handler () +{ + if (!_idle_get) { + return; + } + + if (get(true)) { + _idle_get = false; + } else { + /* get() could not complete quickly so we'll try again later */ + signal_manager->when_idle (boost::bind(&FilmViewer::idle_handler, this)); + } +} + void FilmViewer::set_film (shared_ptr film) { @@ -127,14 +161,13 @@ FilmViewer::set_film (shared_ptr film) _player_video.first.reset (); _player_video.second = DCPTime (); - _frame.reset (); + _video_view->set_image (shared_ptr()); _closed_captions_dialog->clear (); if (!_film) { _player.reset (); recreate_butler (); - _frame.reset (); - refresh_panel (); + refresh_view (); return; } @@ -145,7 +178,7 @@ FilmViewer::set_film (shared_ptr film) _player->set_dcp_decode_reduction (_dcp_decode_reduction); } } catch (bad_alloc &) { - error_dialog (_panel, _("There is not enough free memory to do that.")); + error_dialog (_video_view->get(), _("There is not enough free memory to do that.")); _film.reset (); return; } @@ -168,10 +201,11 @@ FilmViewer::set_film (shared_ptr film) void FilmViewer::recreate_butler () { - bool const was_running = stop (); + suspend (); _butler.reset (); if (!_film) { + resume (); return; } @@ -186,14 +220,26 @@ FilmViewer::recreate_butler () Map so that Lt = L(-3dB) + Ls(-3dB) + C(-6dB) + Lfe(-10dB) Rt = R(-3dB) + Rs(-3dB) + C(-6dB) + Lfe(-10dB) */ - map.set (dcp::LEFT, 0, 1 / sqrt(2)); // L -> Lt - map.set (dcp::RIGHT, 1, 1 / sqrt(2)); // R -> Rt - map.set (dcp::CENTRE, 0, 1 / 2.0); // C -> Lt - map.set (dcp::CENTRE, 1, 1 / 2.0); // C -> Rt - map.set (dcp::LFE, 0, 1 / sqrt(10)); // Lfe -> Lt - map.set (dcp::LFE, 1, 1 / sqrt(10)); // Lfe -> Rt - map.set (dcp::LS, 0, 1 / sqrt(2)); // Ls -> Lt - map.set (dcp::RS, 1, 1 / sqrt(2)); // Rs -> Rt + if (_film->audio_channels() > 0) { + map.set (dcp::LEFT, 0, 1 / sqrt(2)); // L -> Lt + } + if (_film->audio_channels() > 1) { + map.set (dcp::RIGHT, 1, 1 / sqrt(2)); // R -> Rt + } + if (_film->audio_channels() > 2) { + map.set (dcp::CENTRE, 0, 1 / 2.0); // C -> Lt + map.set (dcp::CENTRE, 1, 1 / 2.0); // C -> Rt + } + if (_film->audio_channels() > 3) { + map.set (dcp::LFE, 0, 1 / sqrt(10)); // Lfe -> Lt + map.set (dcp::LFE, 1, 1 / sqrt(10)); // Lfe -> Rt + } + if (_film->audio_channels() > 4) { + map.set (dcp::LS, 0, 1 / sqrt(2)); // Ls -> Lt + } + if (_film->audio_channels() > 5) { + map.set (dcp::RS, 1, 1 / sqrt(2)); // Rs -> Rt + } } _butler.reset (new Butler(_player, map, _audio_channels, bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), false, true)); @@ -203,29 +249,40 @@ FilmViewer::recreate_butler () _closed_captions_dialog->set_film_and_butler (_film, _butler); - if (was_running) { - start (); - } + resume (); } void -FilmViewer::refresh_panel () +FilmViewer::refresh_view () { - _panel->Refresh (); - _panel->Update (); + _state_timer.set ("update-view"); + _video_view->update (); + _state_timer.unset (); } -void -FilmViewer::get () +/** Try to get a frame from the butler and display it. + * @param lazy 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. + */ +bool +FilmViewer::get (bool lazy) { DCPOMATIC_ASSERT (_butler); + ++_gets; do { Butler::Error e; - _player_video = _butler->get_video (&e); + _player_video = _butler->get_video (!lazy, &e); if (!_player_video.first && e == Butler::AGAIN) { - signal_manager->when_idle (boost::bind(&FilmViewer::get, this)); - return; + if (lazy) { + /* No video available; return saying we failed */ + return false; + } else { + /* Player was suspended; come back later */ + signal_manager->when_idle (boost::bind(&FilmViewer::get, this, false)); + return false; + } } } while ( _player_video.first && @@ -234,21 +291,28 @@ FilmViewer::get () _player_video.first->eyes() != EYES_BOTH ); - _butler->rethrow (); + try { + _butler->rethrow (); + } catch (DecodeError& e) { + error_dialog (_video_view->get(), e.what()); + } display_player_video (); + PositionChanged (); + + return true; } void FilmViewer::display_player_video () { if (!_player_video.first) { - _frame.reset (); - refresh_panel (); + _video_view->set_image (shared_ptr()); + refresh_view (); return; } - if (_playing && (time() - _player_video.second) > one_video_frame()) { + if (_playing && !_suspended && (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). */ @@ -275,15 +339,21 @@ FilmViewer::display_player_video () * image and convert it (from whatever the user has said it is) to RGB. */ - _frame = _player_video.first->image (bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), false, true); + _state_timer.set ("get image"); + + _video_view->set_image ( + _player_video.first->image(bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), false, true) + ); + _state_timer.set ("ImageChanged"); ImageChanged (_player_video.first); + _state_timer.unset (); _video_position = _player_video.second; _inter_position = _player_video.first->inter_position (); _inter_size = _player_video.first->inter_size (); - refresh_panel (); + refresh_view (); _closed_captions_dialog->update (time()); } @@ -291,12 +361,11 @@ FilmViewer::display_player_video () void FilmViewer::timer () { - if (!_film || !_playing) { + if (!_film || !_playing || _suspended) { return; } - get (); - PositionChanged (); + get (false); DCPTime const next = _video_position + one_video_frame(); if (next >= _film->length()) { @@ -313,102 +382,11 @@ FilmViewer::timer () } } -bool -#ifdef DCPOMATIC_VARIANT_SWAROOP -FilmViewer::maybe_draw_background_image (wxPaintDC& dc) -{ - optional bg = Config::instance()->player_background_image(); - if (bg) { - wxImage image (std_to_wx(bg->string())); - wxBitmap bitmap (image); - dc.DrawBitmap (bitmap, max(0, (_panel_size.width - image.GetSize().GetWidth()) / 2), max(0, (_panel_size.height - image.GetSize().GetHeight()) / 2)); - return true; - } - - return false; -} -#else -FilmViewer::maybe_draw_background_image (wxPaintDC &) -{ - return false; -} -#endif - -void -FilmViewer::paint_panel () -{ - wxPaintDC dc (_panel); - -#ifdef DCPOMATIC_VARIANT_SWAROOP - if (_background_image) { - dc.Clear (); - maybe_draw_background_image (dc); - return; - } -#endif - - if (!_out_size.width || !_out_size.height || !_film || !_frame || _out_size != _frame->size()) { - dc.Clear (); - } else { - - wxImage frame (_out_size.width, _out_size.height, _frame->data()[0], true); - wxBitmap frame_bitmap (frame); - dc.DrawBitmap (frame_bitmap, 0, max(0, (_panel_size.height - _out_size.height) / 2)); - -#ifdef DCPOMATIC_VARIANT_SWAROOP - 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 - } - - if (_out_size.width < _panel_size.width) { - /* XXX: these colours are right for GNOME; may need adjusting for other OS */ - wxPen p (_pad_black ? wxColour(0, 0, 0) : wxColour(240, 240, 240)); - wxBrush b (_pad_black ? wxColour(0, 0, 0) : wxColour(240, 240, 240)); - dc.SetPen (p); - dc.SetBrush (b); - dc.DrawRectangle (_out_size.width, 0, _panel_size.width - _out_size.width, _panel_size.height); - } - - if (_out_size.height < _panel_size.height) { - wxPen p (_pad_black ? wxColour(0, 0, 0) : wxColour(240, 240, 240)); - wxBrush b (_pad_black ? wxColour(0, 0, 0) : wxColour(240, 240, 240)); - dc.SetPen (p); - dc.SetBrush (b); - int const gap = (_panel_size.height - _out_size.height) / 2; - dc.DrawRectangle (0, 0, _panel_size.width, gap); - dc.DrawRectangle (0, gap + _out_size.height + 1, _panel_size.width, gap); - } - - if (_outline_content) { - wxPen p (wxColour (255, 0, 0), 2); - dc.SetPen (p); - dc.SetBrush (*wxTRANSPARENT_BRUSH); - dc.DrawRectangle (_inter_position.x, _inter_position.y + (_panel_size.height - _out_size.height) / 2, _inter_size.width, _inter_size.height); - } -} - void FilmViewer::set_outline_content (bool o) { _outline_content = o; - refresh_panel (); + refresh_view (); } void @@ -419,11 +397,8 @@ FilmViewer::set_eyes (Eyes e) } void -FilmViewer::panel_sized (wxSizeEvent& ev) +FilmViewer::video_view_sized () { - _panel_size.width = ev.GetSize().GetWidth(); - _panel_size.height = ev.GetSize().GetHeight(); - calculate_sizes (); if (!quick_refresh()) { slow_refresh (); @@ -440,16 +415,16 @@ FilmViewer::calculate_sizes () Ratio const * container = _film->container (); - float const panel_ratio = _panel_size.ratio (); + float const view_ratio = float(_video_view->get()->GetSize().x) / _video_view->get()->GetSize().y; float const film_ratio = container ? container->ratio () : 1.78; - if (panel_ratio < film_ratio) { + if (view_ratio < film_ratio) { /* panel is less widscreen than the film; clamp width */ - _out_size.width = _panel_size.width; + _out_size.width = _video_view->get()->GetSize().x; _out_size.height = lrintf (_out_size.width / film_ratio); } else { /* panel is more widescreen than the film; clamp height */ - _out_size.height = _panel_size.height; + _out_size.height = _video_view->get()->GetSize().y; _out_size.width = lrintf (_out_size.height * film_ratio); } @@ -460,6 +435,28 @@ FilmViewer::calculate_sizes () _player->set_video_container_size (_out_size); } +void +FilmViewer::suspend () +{ + ++_suspended; + if (_audio.isStreamRunning()) { + _audio.abortStream(); + } +} + +void +FilmViewer::resume () +{ + --_suspended; + if (_playing && !_suspended) { + if (_audio.isStreamOpen()) { + _audio.setStreamTime (_video_position.seconds()); + _audio.startStream (); + } + timer (); + } +} + void FilmViewer::start () { @@ -604,17 +601,19 @@ FilmViewer::seek (DCPTime t, bool accurate) t = _film->length (); } - bool const was_running = stop (); + suspend (); _closed_captions_dialog->clear (); _butler->seek (t, accurate); - get (); - if (was_running) { - start (); + if (!_playing) { + request_idle_get (); + } else { + /* Make sure we get a frame so that _video_position is set up before we resume */ + while (!get(true)) {} } - PositionChanged (); + resume (); } void @@ -622,7 +621,7 @@ FilmViewer::config_changed (Config::Property p) { #ifdef DCPOMATIC_VARIANT_SWAROOP if (p == Config::PLAYER_BACKGROUND_IMAGE) { - refresh_panel (); + refresh_view (); return; } #endif @@ -665,7 +664,7 @@ FilmViewer::config_changed (Config::Property p) } catch (RtAudioError& e) { #endif error_dialog ( - _panel, + _video_view->get(), _("Could not set up audio output. There will be no audio during the preview."), std_to_wx(e.what()) ); }