X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffilm_viewer.cc;h=e8c3b8c71363292bccd5cbd8c1dea57bf26f0990;hb=1d2a51bdc8315fa7283be329669860e435a1513f;hp=0b6fcd7b353b1fb6cc869c21b6880a1967ad2f76;hpb=7c33cdd95a23ff784c0e0731a9d1444ce9bb8f09;p=dcpomatic.git

diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index 0b6fcd7b3..e8c3b8c71 100644
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -47,6 +47,7 @@
 #include "lib/config.h"
 #include "lib/compose.hpp"
 #include "lib/dcpomatic_log.h"
+#include "lib/text_content.h"
 extern "C" {
 #include <libavutil/pixfmt.h>
 }
@@ -64,10 +65,13 @@ using std::list;
 using std::bad_alloc;
 using std::make_pair;
 using std::exception;
-using boost::shared_ptr;
-using boost::dynamic_pointer_cast;
-using boost::weak_ptr;
+using std::shared_ptr;
+using std::dynamic_pointer_cast;
+using std::weak_ptr;
 using boost::optional;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 using dcp::Size;
 using namespace dcpomatic;
 
@@ -86,16 +90,9 @@ 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 +119,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,11 +137,11 @@ FilmViewer::idle_handler ()
 		return;
 	}
 
-	if (_video_view->get(true)) {
-		_idle_get = false;
-	} else {
+	if (_video_view->display_next_frame(true) == VideoView::AGAIN) {
 		/* get() could not complete quickly so we'll try again later */
 		signal_manager->when_idle (boost::bind(&FilmViewer::idle_handler, this));
+	} else {
+		_idle_get = false;
 	}
 }
 
@@ -156,22 +153,19 @@ FilmViewer::set_film (shared_ptr<Film> film)
 	}
 
 	_film = film;
-	_video_position = DCPTime ();
-	_player_video.first.reset ();
-	_player_video.second = DCPTime ();
 
-	_video_view->set_image (shared_ptr<Image>());
+	_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,11 +180,19 @@ FilmViewer::set_film (shared_ptr<Film> film)
 	_player->set_play_referenced ();
 
 	_film->Change.connect (boost::bind (&FilmViewer::film_change, this, _1, _2));
+	_film->ContentChange.connect (boost::bind(&FilmViewer::content_change, this, _1, _3));
+	_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;
 
+	_closed_captions_dialog->update_tracks (_film);
+
 	recreate_butler ();
 
 	calculate_sizes ();
@@ -210,10 +212,12 @@ FilmViewer::recreate_butler ()
 
 	_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
 			)
@@ -223,85 +227,31 @@ FilmViewer::recreate_butler ()
 		_butler->disable_audio ();
 	}
 
-	_closed_captions_dialog->set_film_and_butler (_film, _butler);
+	_closed_captions_dialog->set_butler (_butler);
 
 	resume ();
 }
 
 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::display_player_video ()
-{
-	if (!_player_video.first) {
-		_video_view->set_image (shared_ptr<Image>());
-		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)
+FilmViewer::set_outline_subtitles (optional<dcpomatic::Rect<double> > 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 ();
 }
 
@@ -312,7 +262,6 @@ FilmViewer::video_view_sized ()
 	if (!quick_refresh()) {
 		slow_refresh ();
 	}
-	PositionChanged ();
 }
 
 void
@@ -356,13 +305,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 ();
 	}
 }
 
@@ -379,15 +329,28 @@ 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 ();
+	/* 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());
+	_video_view->start ();
 }
 
 bool
@@ -403,7 +366,10 @@ FilmViewer::stop ()
 	}
 
 	_playing = false;
+	_video_view->stop ();
 	Stopped (position());
+
+	_video_view->rethrow ();
 	return true;
 }
 
@@ -436,22 +402,37 @@ 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());
+	} else if (p == Film::CONTENT) {
+		_closed_captions_dialog->update_tracks (_film);
 	}
 }
 
+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
@@ -461,16 +442,10 @@ FilmViewer::slow_refresh ()
 bool
 FilmViewer::quick_refresh ()
 {
-	if (!_player_video.first) {
-		return false;
+	if (!_video_view || !_film || !_player) {
+		return true;
 	}
-
-	if (!_player_video.first->reset_metadata (_film, _player->video_container_size(), _film->frame_size())) {
-		return false;
-	}
-
-	display_player_video ();
-	return true;
+	return _video_view->reset_metadata (_film, _player->video_container_size());
 }
 
 void
@@ -488,7 +463,7 @@ FilmViewer::set_coalesce_player_changes (bool c)
 	_coalesce_player_changes = c;
 
 	if (!c) {
-		BOOST_FOREACH (int i, _pending_player_changes) {
+		for (auto i: _pending_player_changes) {
 			player_change (CHANGE_TYPE_DONE, i, false);
 		}
 		_pending_player_changes.clear ();
@@ -507,7 +482,7 @@ FilmViewer::seek (DCPTime t, bool accurate)
 	}
 
 	if (t >= _film->length ()) {
-		t = _film->length ();
+		t = _film->length() - one_video_frame();
 	}
 
 	suspend ();
@@ -516,10 +491,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) == VideoView::AGAIN) {}
 	}
 
 	resume ();
@@ -528,13 +508,6 @@ FilmViewer::seek (DCPTime t, bool accurate)
 void
 FilmViewer::config_changed (Config::Property p)
 {
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-	if (p == Config::PLAYER_BACKGROUND_IMAGE) {
-		refresh_view ();
-		return;
-	}
-#endif
-
 	if (p == Config::AUDIO_MAPPING) {
 		recreate_butler ();
 		return;
@@ -552,8 +525,12 @@ FilmViewer::config_changed (Config::Property p)
 		unsigned int st = 0;
 		if (Config::instance()->sound_output()) {
 			while (st < _audio.getDeviceCount()) {
-				if (_audio.getDeviceInfo(st).name == Config::instance()->sound_output().get()) {
-					break;
+				try {
+					if (_audio.getDeviceInfo(st).name == Config::instance()->sound_output().get()) {
+						break;
+					}
+				} catch (RtAudioError&) {
+					/* Something went wrong with that device so we don't want to use it anyway */
 				}
 				++st;
 			}
@@ -564,19 +541,15 @@ FilmViewer::config_changed (Config::Property p)
 			st = _audio.getDefaultOutputDevice();
 		}
 
-		_audio_channels = _audio.getDeviceInfo(st).outputChannels;
-
-		RtAudio::StreamParameters sp;
-		sp.deviceId = st;
-		sp.nChannels = _audio_channels;
-		sp.firstChannel = 0;
 		try {
+			_audio_channels = _audio.getDeviceInfo(st).outputChannels;
+			RtAudio::StreamParameters sp;
+			sp.deviceId = st;
+			sp.nChannels = _audio_channels;
+			sp.firstChannel = 0;
 			_audio.openStream (&sp, 0, RTAUDIO_FLOAT32, 48000, &_audio_block_size, &rtaudio_callback, this);
-#ifdef DCPOMATIC_USE_RTERROR
-		} catch (RtError& e) {
-#else
 		} catch (RtAudioError& e) {
-#endif
+			_audio_channels = 0;
 			error_dialog (
 				_video_view->get(),
 				_("Could not set up audio output.  There will be no audio during the preview."), std_to_wx(e.what())
@@ -597,18 +570,24 @@ FilmViewer::uncorrected_time () const
 		return DCPTime::from_seconds (const_cast<RtAudio*>(&_audio)->getStreamTime());
 	}
 
-	return _video_position;
+	return _video_view->position();
 }
 
-DCPTime
-FilmViewer::time () const
+optional<DCPTime>
+FilmViewer::audio_time () const
 {
-	if (_audio.isStreamRunning ()) {
-		return DCPTime::from_seconds (const_cast<RtAudio*>(&_audio)->getStreamTime ()) -
-			DCPTime::from_frames (average_latency(), _film->audio_frame_rate());
+	if (!_audio.isStreamRunning()) {
+		return optional<DCPTime>();
 	}
 
-	return _video_position;
+	return DCPTime::from_seconds (const_cast<RtAudio*>(&_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
@@ -643,7 +622,7 @@ FilmViewer::average_latency () const
         }
 
         Frame total = 0;
-        BOOST_FOREACH (Frame i, _latency_history) {
+        for (auto i: _latency_history) {
                 total += i;
         }
 
@@ -681,7 +660,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
@@ -689,3 +668,61 @@ 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 ();
+}
+
+
+void
+FilmViewer::content_change (ChangeType type, int property)
+{
+	if (type != CHANGE_TYPE_DONE) {
+		return;
+	}
+
+	if (property == TextContentProperty::USE || property == TextContentProperty::TYPE || property == TextContentProperty::DCP_TRACK) {
+		_closed_captions_dialog->update_tracks (_film);
+	}
+}
+
+
+void
+FilmViewer::image_changed (shared_ptr<PlayerVideo> pv)
+{
+	emit (boost::bind(boost::ref(ImageChanged), pv));
+}
+