X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Ffilm_viewer.cc;h=78efc77f655b97073cdd133badc66fc58fa225c3;hp=5af2d7462b76dd7820c28a683bf3905d2b92f84d;hb=7c730205e50014347bd96ab9735346d0b5922798;hpb=a8e31120a793f09ab56cc2847d76944ba698ba95 diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc index 5af2d7462..78efc77f6 100644 --- a/src/wx/film_viewer.cc +++ b/src/wx/film_viewer.cc @@ -28,6 +28,7 @@ #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" @@ -78,9 +79,7 @@ rtaudio_callback (void* out, void *, unsigned int frames, double, RtAudioStreamS } FilmViewer::FilmViewer (wxWindow* p) - /* XXX: make this configurable */ - : _video_view (new GLVideoView(p)) - , _coalesce_player_changes (false) + : _coalesce_player_changes (false) , _audio (DCPOMATIC_RTAUDIO_API) , _audio_channels (0) , _audio_block_size (1024) @@ -92,15 +91,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) { - /* XXX: maybe this should be proxied through the VideoView */ - _video_view->get()->Bind (wxEVT_SIZE, boost::bind (&FilmViewer::video_view_sized, this)); - _timer.Bind (wxEVT_TIMER, boost::bind (&FilmViewer::timer, this)); + 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; + } + + _video_view->Sized.connect (boost::bind(&FilmViewer::video_view_sized, this)); + _timer.Bind (wxEVT_TIMER, boost::bind(&FilmViewer::timer, this)); set_film (shared_ptr ()); @@ -113,6 +120,33 @@ 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; + 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) { @@ -125,14 +159,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; } @@ -184,14 +217,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)); @@ -207,30 +252,36 @@ FilmViewer::recreate_butler () } void -FilmViewer::refresh_panel () +FilmViewer::refresh_view () { - /* XXX */ - - /* - _state_timer.set ("refresh-panel"); - _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 && @@ -239,17 +290,24 @@ 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; } @@ -282,9 +340,9 @@ FilmViewer::display_player_video () _state_timer.set ("get image"); - /* XXX: do we need to store _frame? */ - _frame = _player_video.first->image (bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), false, true); - _video_view->set_image (_frame); + _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); @@ -294,7 +352,7 @@ FilmViewer::display_player_video () _inter_position = _player_video.first->inter_position (); _inter_size = _player_video.first->inter_size (); - refresh_panel (); + refresh_view (); _closed_captions_dialog->update (time()); } @@ -306,8 +364,7 @@ FilmViewer::timer () return; } - get (); - PositionChanged (); + get (false); DCPTime const next = _video_position + one_video_frame(); if (next >= _film->length()) { @@ -324,33 +381,11 @@ FilmViewer::timer () } } -bool -#ifdef DCPOMATIC_VARIANT_SWAROOP -XXX -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::set_outline_content (bool o) { _outline_content = o; - refresh_panel (); + refresh_view (); } void @@ -396,10 +431,6 @@ FilmViewer::calculate_sizes () _out_size.width = max (64, _out_size.width); _out_size.height = max (64, _out_size.height); - /* Make OpenGL happy; XXX: only do this in GLVideoView? Is the round-to-4 constraint a thing? */ - _out_size.width &= ~3; - _out_size.height &= ~3; - _player->set_video_container_size (_out_size); } @@ -551,13 +582,11 @@ FilmViewer::seek (DCPTime t, bool accurate) _closed_captions_dialog->clear (); _butler->seek (t, accurate); - get (); + request_idle_get (); if (was_running) { start (); } - - PositionChanged (); } void @@ -565,7 +594,7 @@ FilmViewer::config_changed (Config::Property p) { #ifdef DCPOMATIC_VARIANT_SWAROOP if (p == Config::PLAYER_BACKGROUND_IMAGE) { - refresh_panel (); + refresh_view (); return; } #endif