X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffilm_viewer.cc;h=31093cb0a8581de14087867cbc22608c64d1dc40;hb=89780827d5d6ec9127eae0108d10f71dc79d1a72;hp=9dbb0091a348270bed8a211d92818f7d11cdf71d;hpb=c76b1fd7fe41a7e371ae1fe1dad21c87a19839f1;p=dcpomatic.git diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc index 9dbb0091a..31093cb0a 100644 --- a/src/wx/film_viewer.cc +++ b/src/wx/film_viewer.cc @@ -122,7 +122,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 +140,7 @@ FilmViewer::idle_handler () return; } - if (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,11 +156,8 @@ 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) { @@ -186,6 +183,7 @@ 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)); /* Keep about 1 second's worth of history samples */ @@ -236,104 +234,6 @@ FilmViewer::refresh_view () _state_timer.unset (); } -/** 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 (!lazy, &e); - if (!_player_video.first && e == Butler::AGAIN) { - 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 && - _film->three_d() && - _eyes != _player_video.first->eyes() && - _player_video.first->eyes() != EYES_BOTH - ); - - 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) { - _video_view->set_image (shared_ptr()); - refresh_view (); - return; - } - - 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). - */ - _video_position = _player_video.second; - ++_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"); - - _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_view (); - - _closed_captions_dialog->update (time()); -} - void FilmViewer::set_outline_content (bool o) { @@ -355,7 +255,6 @@ FilmViewer::video_view_sized () if (!quick_refresh()) { slow_refresh (); } - PositionChanged (); } void @@ -402,10 +301,10 @@ FilmViewer::resume () --_suspended; if (_playing && !_suspended) { if (_audio.isStreamOpen()) { - _audio.setStreamTime (_video_position.seconds()); + _audio.setStreamTime (_video_view->position().seconds()); _audio.startStream (); } - timer (); + _video_view->start (); } } @@ -423,13 +322,13 @@ FilmViewer::start () } if (_audio.isStreamOpen()) { - _audio.setStreamTime (_video_position.seconds()); + _audio.setStreamTime (_video_view->position().seconds()); _audio.startStream (); } - _playing = true; _dropped = 0; - _video_view->timer (); + _playing = true; + _video_view->start (); Started (position()); } @@ -446,6 +345,7 @@ FilmViewer::stop () } _playing = false; + _video_view->stop (); Stopped (position()); return true; } @@ -479,22 +379,33 @@ 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()); } } +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 @@ -504,15 +415,15 @@ FilmViewer::slow_refresh () bool FilmViewer::quick_refresh () { - if (!_player_video.first) { + if (!_video_view->_player_video.first) { return false; } - if (!_player_video.first->reset_metadata (_film, _player->video_container_size(), _film->frame_size())) { + if (!_video_view->_player_video.first->reset_metadata (_film, _player->video_container_size(), _film->frame_size())) { return false; } - display_player_video (); + _video_view->display_player_video (); return true; } @@ -559,10 +470,9 @@ FilmViewer::seek (DCPTime t, bool accurate) _butler->seek (t, accurate); if (!_playing) { - request_idle_get (); + 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)) {} + while (!_video_view->display_next_frame(false)) {} } resume (); @@ -640,7 +550,18 @@ FilmViewer::uncorrected_time () const return DCPTime::from_seconds (const_cast(&_audio)->getStreamTime()); } - return _video_position; + return _video_view->position(); +} + +optional +FilmViewer::audio_time () const +{ + if (!_audio.isStreamRunning()) { + return optional(); + } + + return DCPTime::from_seconds (const_cast(&_audio)->getStreamTime ()) - + DCPTime::from_frames (average_latency(), _film->audio_frame_rate()); } DCPTime @@ -651,7 +572,7 @@ FilmViewer::time () const DCPTime::from_frames (average_latency(), _film->audio_frame_rate()); } - return _video_position; + return _video_view->position(); } int @@ -724,7 +645,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 @@ -732,3 +653,11 @@ FilmViewer::set_pad_black (bool p) { _pad_black = p; } + +/* May be called from a non-UI thread */ +void +FilmViewer::emit_finished () +{ + emit (boost::bind(boost::ref(Finished))); +} +