X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffilm_viewer.cc;h=2c90b86095278c9bd19b81831e27f3d82123909b;hb=6e99da2707e0af449d1aeec06a43de9af19cfa36;hp=14737d0094626d3775c2a6b05a5bcd58b7cde67c;hpb=a7a8cd74f2f32de8b708c78cc8bc9c0cf17d60f5;p=dcpomatic.git diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc index 14737d009..2c90b8609 100644 --- a/src/wx/film_viewer.cc +++ b/src/wx/film_viewer.cc @@ -59,19 +59,15 @@ extern "C" { #include #include -using std::string; -using std::pair; -using std::min; -using std::max; -using std::cout; -using std::list; + using std::bad_alloc; -using std::make_pair; -using std::exception; -using std::shared_ptr; +using std::cout; using std::dynamic_pointer_cast; +using std::make_shared; +using std::max; +using std::shared_ptr; +using std::string; using std::vector; -using std::weak_ptr; using boost::optional; #if BOOST_VERSION >= 106100 using namespace boost::placeholders; @@ -79,6 +75,7 @@ using namespace boost::placeholders; using dcp::Size; using namespace dcpomatic; + static int rtaudio_callback (void* out, void *, unsigned int frames, double, RtAudioStreamStatus, void* data) @@ -86,42 +83,40 @@ rtaudio_callback (void* out, void *, unsigned int frames, double, RtAudioStreamS return reinterpret_cast(data)->audio_callback (out, frames); } + FilmViewer::FilmViewer (wxWindow* p) - : _coalesce_player_changes (false) - , _audio (DCPOMATIC_RTAUDIO_API) - , _audio_channels (0) - , _audio_block_size (1024) - , _playing (false) - , _suspended (0) - , _latency_history_count (0) + : _audio (DCPOMATIC_RTAUDIO_API) , _closed_captions_dialog (new ClosedCaptionsDialog(p, this)) - , _outline_content (false) - , _pad_black (false) - , _idle_get (false) { +#if wxCHECK_VERSION(3, 1, 0) switch (Config::instance()->video_view_type()) { case Config::VIDEO_VIEW_OPENGL: - _video_view = new GLVideoView (this, p); + _video_view = std::make_shared(this, p); break; case Config::VIDEO_VIEW_SIMPLE: - _video_view = new SimpleVideoView (this, p); + _video_view = std::make_shared(this, p); break; } +#else + _video_view = std::make_shared(this, p); +#endif _video_view->Sized.connect (boost::bind(&FilmViewer::video_view_sized, this)); - _video_view->TooManyDropped.connect (boost::bind(&FilmViewer::too_many_frames_dropped, this)); + _video_view->TooManyDropped.connect (boost::bind(boost::ref(TooManyDropped))); - set_film (shared_ptr ()); + set_film (shared_ptr()); - _config_changed_connection = Config::instance()->Changed.connect (bind (&FilmViewer::config_changed, this, _1)); + _config_changed_connection = Config::instance()->Changed.connect(bind(&FilmViewer::config_changed, this, _1)); config_changed (Config::SOUND_OUTPUT); } + FilmViewer::~FilmViewer () { stop (); } + /** Ask for ::get() to be called next time we are idle */ void FilmViewer::request_idle_display_next_frame () @@ -135,6 +130,7 @@ FilmViewer::request_idle_display_next_frame () signal_manager->when_idle (boost::bind(&FilmViewer::idle_handler, this)); } + void FilmViewer::idle_handler () { @@ -150,6 +146,7 @@ FilmViewer::idle_handler () } } + void FilmViewer::set_film (shared_ptr film) { @@ -170,7 +167,7 @@ FilmViewer::set_film (shared_ptr film) } try { - _player.reset (new Player(_film)); + _player = make_shared(_film, _optimise_for_j2k ? Image::Alignment::COMPACT : Image::Alignment::PADDED); _player->set_fast (); if (_dcp_decode_reduction) { _player->set_dcp_decode_reduction (_dcp_decode_reduction); @@ -203,6 +200,7 @@ FilmViewer::set_film (shared_ptr film) slow_refresh (); } + void FilmViewer::recreate_butler () { @@ -214,17 +212,22 @@ FilmViewer::recreate_butler () return; } - _butler.reset( - new Butler( - _film, - _player, - Config::instance()->audio_mapping(_audio_channels), - _audio_channels, - bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), - VideoRange::FULL, - false, - true - ) +#if wxCHECK_VERSION(3, 1, 0) + auto const j2k_gl_optimised = dynamic_pointer_cast(_video_view) && _optimise_for_j2k; +#else + auto const j2k_gl_optimised = false; +#endif + + _butler = std::make_shared( + _film, + _player, + Config::instance()->audio_mapping(_audio_channels), + _audio_channels, + bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), + VideoRange::FULL, + j2k_gl_optimised ? Image::Alignment::COMPACT : Image::Alignment::PADDED, + true, + j2k_gl_optimised ); if (!Config::instance()->sound() && !_audio.isStreamOpen()) { @@ -236,6 +239,7 @@ FilmViewer::recreate_butler () resume (); } + void FilmViewer::set_outline_content (bool o) { @@ -245,7 +249,7 @@ FilmViewer::set_outline_content (bool o) void -FilmViewer::set_outline_subtitles (optional > rect) +FilmViewer::set_outline_subtitles (optional> rect) { _outline_subtitles = rect; _video_view->update (); @@ -259,6 +263,7 @@ FilmViewer::set_eyes (Eyes e) slow_refresh (); } + void FilmViewer::video_view_sized () { @@ -268,6 +273,7 @@ FilmViewer::video_view_sized () } } + void FilmViewer::calculate_sizes () { @@ -275,28 +281,30 @@ FilmViewer::calculate_sizes () return; } - Ratio const * container = _film->container (); + auto const container = _film->container (); - float const view_ratio = float(_video_view->get()->GetSize().x) / _video_view->get()->GetSize().y; - float const film_ratio = container ? container->ratio () : 1.78; + auto const view_ratio = float(_video_view->get()->GetSize().x) / _video_view->get()->GetSize().y; + auto const film_ratio = container ? container->ratio () : 1.78; + dcp::Size out_size; if (view_ratio < film_ratio) { /* panel is less widscreen than the film; clamp width */ - _out_size.width = _video_view->get()->GetSize().x; - _out_size.height = lrintf (_out_size.width / film_ratio); + 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 = _video_view->get()->GetSize().y; - _out_size.width = lrintf (_out_size.height * film_ratio); + out_size.height = _video_view->get()->GetSize().y; + out_size.width = lrintf (out_size.height * film_ratio); } /* Catch silly values */ - _out_size.width = max (64, _out_size.width); - _out_size.height = max (64, _out_size.height); + out_size.width = max (64, out_size.width); + out_size.height = max (64, out_size.height); - _player->set_video_container_size (_out_size); + _player->set_video_container_size (out_size); } + void FilmViewer::suspend () { @@ -306,6 +314,7 @@ FilmViewer::suspend () } } + void FilmViewer::resume () { @@ -320,6 +329,7 @@ FilmViewer::resume () } } + void FilmViewer::start () { @@ -327,7 +337,7 @@ FilmViewer::start () return; } - optional v = PlaybackPermitted (); + auto v = PlaybackPermitted (); if (v && !*v) { /* Computer says no */ return; @@ -346,17 +356,26 @@ FilmViewer::start () */ if (_audio.isStreamOpen()) { _audio.setStreamTime (_video_view->position().seconds()); - _audio.startStream (); + try { + _audio.startStream (); + } catch (RtAudioError& e) { + _audio_channels = 0; + error_dialog ( + _video_view->get(), + _("There was a problem starting audio playback. Please try another audio output device in Preferences."), std_to_wx(e.what()) + ); + } } _playing = true; /* Calling start() below may directly result in Stopped being emitted, and if that * happens we want it to come after the Started signal, so do that first. */ - Started (position()); + Started (); _video_view->start (); } + bool FilmViewer::stop () { @@ -371,12 +390,13 @@ FilmViewer::stop () _playing = false; _video_view->stop (); - Stopped (position()); + Stopped (); _video_view->rethrow (); return true; } + void FilmViewer::player_change (ChangeType type, int property, bool frequent) { @@ -392,6 +412,7 @@ FilmViewer::player_change (ChangeType type, int property, bool frequent) player_change ({property}); } + void FilmViewer::player_change (vector properties) { @@ -403,7 +424,8 @@ FilmViewer::player_change (vector properties) for (auto i: properties) { if ( i == VideoContentProperty::CROP || - i == VideoContentProperty::SCALE || + i == VideoContentProperty::CUSTOM_RATIO || + i == VideoContentProperty::CUSTOM_SIZE || i == VideoContentProperty::FADE_IN || i == VideoContentProperty::FADE_OUT || i == VideoContentProperty::COLOUR_CONVERSION || @@ -427,6 +449,7 @@ FilmViewer::player_change (vector properties) } } + void FilmViewer::film_change (ChangeType type, Film::Property p) { @@ -445,12 +468,14 @@ FilmViewer::film_change (ChangeType type, Film::Property p) } } + void FilmViewer::film_length_change () { _video_view->set_length (_film->length()); } + /** Re-get the current frame slowly by seeking */ void FilmViewer::slow_refresh () @@ -458,6 +483,7 @@ FilmViewer::slow_refresh () seek (_video_view->position(), true); } + /** Try to re-get the current frame quickly by resetting the metadata * in the PlayerVideo that we used last time. * @return true if this was possible, false if not. @@ -471,15 +497,17 @@ FilmViewer::quick_refresh () return _video_view->reset_metadata (_film, _player->video_container_size()); } + void FilmViewer::seek (shared_ptr content, ContentTime t, bool accurate) { - optional dt = _player->content_time_to_dcp (content, t); + auto dt = _player->content_time_to_dcp (content, t); if (dt) { seek (*dt, accurate); } } + void FilmViewer::set_coalesce_player_changes (bool c) { @@ -491,6 +519,7 @@ FilmViewer::set_coalesce_player_changes (bool c) } } + void FilmViewer::seek (DCPTime t, bool accurate) { @@ -498,11 +527,11 @@ FilmViewer::seek (DCPTime t, bool accurate) return; } - if (t < DCPTime ()) { + if (t < DCPTime()) { t = DCPTime (); } - if (t >= _film->length ()) { + if (t >= _film->length()) { t = _film->length() - one_video_frame(); } @@ -526,6 +555,7 @@ FilmViewer::seek (DCPTime t, bool accurate) resume (); } + void FilmViewer::config_changed (Config::Property p) { @@ -584,38 +614,42 @@ FilmViewer::config_changed (Config::Property p) } } + DCPTime FilmViewer::uncorrected_time () const { - if (_audio.isStreamRunning ()) { + if (_audio.isStreamRunning()) { return DCPTime::from_seconds (const_cast(&_audio)->getStreamTime()); } return _video_view->position(); } + optional FilmViewer::audio_time () const { if (!_audio.isStreamRunning()) { - return optional(); + return {}; } return DCPTime::from_seconds (const_cast(&_audio)->getStreamTime ()) - DCPTime::from_frames (average_latency(), _film->audio_frame_rate()); } + DCPTime FilmViewer::time () const { return audio_time().get_value_or(_video_view->position()); } + int FilmViewer::audio_callback (void* out_p, unsigned int frames) { while (true) { - optional t = _butler->get_audio (reinterpret_cast (out_p), frames); + auto t = _butler->get_audio (Butler::Behaviour::NON_BLOCKING, reinterpret_cast (out_p), frames); if (!t || DCPTime(uncorrected_time() - *t) < one_video_frame()) { /* There was an underrun or this audio is on time; carry on */ break; @@ -634,6 +668,7 @@ FilmViewer::audio_callback (void* out_p, unsigned int frames) return 0; } + Frame FilmViewer::average_latency () const { @@ -650,6 +685,7 @@ FilmViewer::average_latency () const return total / _latency_history.size(); } + void FilmViewer::set_dcp_decode_reduction (optional reduction) { @@ -659,18 +695,21 @@ FilmViewer::set_dcp_decode_reduction (optional reduction) } } + optional FilmViewer::dcp_decode_reduction () const { return _dcp_decode_reduction; } + DCPTime FilmViewer::one_video_frame () const { return DCPTime::from_frames (1, _film ? _film->video_frame_rate() : 24); } + /** Open a dialog box showing our film's closed captions */ void FilmViewer::show_closed_captions () @@ -678,18 +717,21 @@ FilmViewer::show_closed_captions () _closed_captions_dialog->Show(); } + void FilmViewer::seek_by (DCPTime by, bool accurate) { seek (_video_view->position() + by, accurate); } + void FilmViewer::set_pad_black (bool p) { _pad_black = p; } + /** Called when a player has finished the current film. * May be called from a non-UI thread. */ @@ -699,6 +741,7 @@ FilmViewer::finished () emit (boost::bind(&FilmViewer::ui_finished, this)); } + /** Called by finished() in the UI thread */ void FilmViewer::ui_finished () @@ -707,6 +750,7 @@ FilmViewer::ui_finished () Finished (); } + int FilmViewer::dropped () const { @@ -736,20 +780,9 @@ FilmViewer::image_changed (shared_ptr pv) void -FilmViewer::too_many_frames_dropped () +FilmViewer::set_optimise_for_j2k (bool o) { - if (!Config::instance()->nagged(Config::NAG_TOO_MANY_DROPPED_FRAMES)) { - stop (); - } - - bool shown = NagDialog::maybe_nag ( - panel(), - Config::NAG_TOO_MANY_DROPPED_FRAMES, - _("The player is dropping a lot of frames, so playback may not be accurate.\n\n" - "This does not necessarily mean that the DCP you are playing is defective!\n\n" - "You may be able to improve player performance by:\n" - "• choosing 'decode at half resolution' or 'decode at quarter resolution' from the View menu\n" - "• using a more powerful computer.\n" - ) - ); + _optimise_for_j2k = o; + _video_view->set_optimise_for_j2k (o); } +