X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffilm_viewer.cc;h=bb483f0e235c98cace1283c627bf0957f893ad4c;hb=83416808c0b1ca732e7a186d3811f1ec796fea08;hp=178311ac9bb0f78859c71e9569c2e524831a5eb5;hpb=444e1d4e0062677220d32b78b97a4b730156b514;p=dcpomatic.git diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc index 178311ac9..bb483f0e2 100644 --- a/src/wx/film_viewer.cc +++ b/src/wx/film_viewer.cc @@ -86,16 +86,12 @@ FilmViewer::FilmViewer (wxWindow* p) , _playing (false) , _suspended (0) , _latency_history_count (0) - , _dropped (0) , _closed_captions_dialog (new ClosedCaptionsDialog(p, this)) , _outline_content (false) - , _eyes (EYES_LEFT) , _pad_black (false) #ifdef DCPOMATIC_VARIANT_SWAROOP , _background_image (false) #endif - , _state_timer ("viewer") - , _gets (0) , _idle_get (false) { switch (Config::instance()->video_view_type()) { @@ -122,7 +118,7 @@ FilmViewer::~FilmViewer () /** Ask for ::get() to be called next time we are idle */ void -FilmViewer::request_idle_get () +FilmViewer::request_idle_display_next_frame () { if (_idle_get) { return; @@ -140,7 +136,7 @@ FilmViewer::idle_handler () return; } - if (_video_view->get(true)) { + if (_video_view->display_next_frame(true)) { _idle_get = false; } else { /* get() could not complete quickly so we'll try again later */ @@ -156,22 +152,19 @@ FilmViewer::set_film (shared_ptr film) } _film = film; - _video_position = DCPTime (); - _player_video.first.reset (); - _player_video.second = DCPTime (); - _video_view->set_image (shared_ptr()); + _video_view->clear (); _closed_captions_dialog->clear (); if (!_film) { _player.reset (); recreate_butler (); - refresh_view (); + _video_view->update (); return; } try { - _player.reset (new Player (_film, _film->playlist ())); + _player.reset (new Player(_film)); _player->set_fast (); if (_dcp_decode_reduction) { _player->set_dcp_decode_reduction (_dcp_decode_reduction); @@ -186,8 +179,13 @@ FilmViewer::set_film (shared_ptr film) _player->set_play_referenced (); _film->Change.connect (boost::bind (&FilmViewer::film_change, this, _1, _2)); + _film->LengthChange.connect (boost::bind(&FilmViewer::film_length_change, this)); _player->Change.connect (boost::bind (&FilmViewer::player_change, this, _1, _2, _3)); + film_change (CHANGE_TYPE_DONE, Film::VIDEO_FRAME_RATE); + film_change (CHANGE_TYPE_DONE, Film::THREE_D); + film_length_change (); + /* Keep about 1 second's worth of history samples */ _latency_history_count = _film->audio_frame_rate() / _audio_block_size; @@ -229,24 +227,25 @@ FilmViewer::recreate_butler () } void -FilmViewer::refresh_view () +FilmViewer::set_outline_content (bool o) { - _state_timer.set ("update-view"); + _outline_content = o; _video_view->update (); - _state_timer.unset (); } + void -FilmViewer::set_outline_content (bool o) +FilmViewer::set_outline_subtitles (optional > rect) { - _outline_content = o; - refresh_view (); + _outline_subtitles = rect; + _video_view->update (); } + void FilmViewer::set_eyes (Eyes e) { - _eyes = e; + _video_view->set_eyes (e); slow_refresh (); } @@ -257,7 +256,6 @@ FilmViewer::video_view_sized () if (!quick_refresh()) { slow_refresh (); } - PositionChanged (); } void @@ -301,13 +299,14 @@ FilmViewer::suspend () void FilmViewer::resume () { + DCPOMATIC_ASSERT (_suspended > 0); --_suspended; if (_playing && !_suspended) { if (_audio.isStreamOpen()) { - _audio.setStreamTime (_video_position.seconds()); + _audio.setStreamTime (_video_view->position().seconds()); _audio.startStream (); } - timer (); + _video_view->start (); } } @@ -324,13 +323,23 @@ FilmViewer::start () return; } + /* We are about to set up the audio stream from the position of the video view. + If there is `lazy' seek in progress we need to wait for it to go through so that + _video_view->position() gives us a sensible answer. + */ + while (_idle_get) { + idle_handler (); + } + + /* Take the video view's idea of position as our `playhead' and start the + audio stream (which is the timing reference) there. + */ if (_audio.isStreamOpen()) { - _audio.setStreamTime (_video_position.seconds()); + _audio.setStreamTime (_video_view->position().seconds()); _audio.startStream (); } _playing = true; - _dropped = 0; _video_view->start (); Started (position()); } @@ -348,7 +357,10 @@ FilmViewer::stop () } _playing = false; + _video_view->stop (); Stopped (position()); + + _video_view->rethrow (); return true; } @@ -381,22 +393,35 @@ FilmViewer::player_change (ChangeType type, int property, bool frequent) if (!refreshed) { slow_refresh (); } - PositionChanged (); } void FilmViewer::film_change (ChangeType type, Film::Property p) { - if (type == CHANGE_TYPE_DONE && p == Film::AUDIO_CHANNELS) { + if (type != CHANGE_TYPE_DONE) { + return; + } + + if (p == Film::AUDIO_CHANNELS) { recreate_butler (); + } else if (p == Film::VIDEO_FRAME_RATE) { + _video_view->set_video_frame_rate (_film->video_frame_rate()); + } else if (p == Film::THREE_D) { + _video_view->set_three_d (_film->three_d()); } } +void +FilmViewer::film_length_change () +{ + _video_view->set_length (_film->length()); +} + /** Re-get the current frame slowly by seeking */ void FilmViewer::slow_refresh () { - seek (_video_position, true); + seek (_video_view->position(), true); } /** Try to re-get the current frame quickly by resetting the metadata @@ -406,16 +431,10 @@ FilmViewer::slow_refresh () bool FilmViewer::quick_refresh () { - if (!_player_video.first) { - return false; - } - - if (!_player_video.first->reset_metadata (_film, _player->video_container_size(), _film->frame_size())) { - return false; + if (!_video_view || !_film) { + return true; } - - _video_view->display_player_video (); - return true; + return _video_view->refresh_metadata (_film, _player->video_container_size(), _film->frame_size()); } void @@ -452,7 +471,7 @@ FilmViewer::seek (DCPTime t, bool accurate) } if (t >= _film->length ()) { - t = _film->length (); + t = _film->length() - one_video_frame(); } suspend (); @@ -461,10 +480,15 @@ FilmViewer::seek (DCPTime t, bool accurate) _butler->seek (t, accurate); if (!_playing) { - request_idle_get (); + /* We're not playing, so let the GUI thread get on and + come back later to get the next frame after the seek. + */ + request_idle_display_next_frame (); } else { - /* Make sure we get a frame so that _video_position is set up before we resume */ - while (!get(true)) {} + /* We're going to start playing again straight away + so wait for the seek to finish. + */ + while (!_video_view->display_next_frame(false)) {} } resume (); @@ -475,7 +499,7 @@ FilmViewer::config_changed (Config::Property p) { #ifdef DCPOMATIC_VARIANT_SWAROOP if (p == Config::PLAYER_BACKGROUND_IMAGE) { - refresh_view (); + _video_view->update (); return; } #endif @@ -542,18 +566,24 @@ FilmViewer::uncorrected_time () const return DCPTime::from_seconds (const_cast(&_audio)->getStreamTime()); } - return _video_position; + return _video_view->position(); } -DCPTime -FilmViewer::time () const +optional +FilmViewer::audio_time () const { - if (_audio.isStreamRunning ()) { - return DCPTime::from_seconds (const_cast(&_audio)->getStreamTime ()) - - DCPTime::from_frames (average_latency(), _film->audio_frame_rate()); + if (!_audio.isStreamRunning()) { + return optional(); } - return _video_position; + 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 @@ -626,7 +656,7 @@ FilmViewer::show_closed_captions () void FilmViewer::seek_by (DCPTime by, bool accurate) { - seek (_video_position + by, accurate); + seek (_video_view->position() + by, accurate); } void @@ -634,3 +664,42 @@ 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. + */ +void +FilmViewer::finished () +{ + emit (boost::bind(&FilmViewer::ui_finished, this)); +} + +/** Called by finished() in the UI thread */ +void +FilmViewer::ui_finished () +{ + stop (); + Finished (); +} + +int +FilmViewer::dropped () const +{ + return _video_view->dropped (); +} + + +int +FilmViewer::errored () const +{ + return _video_view->errored (); +} + + +int +FilmViewer::gets () const +{ + return _video_view->gets (); +} + +