Fix up black-filling logic.

3 files changed, 37 insertions, 36 deletions

diff --git a/src/lib/decoder.cc b/src/lib/decoder.cc
index fef5e2a99..1b281f718 100644
--- a/src/lib/decoder.cc
+++ b/src/lib/decoder.cc
@@ -28,6 +28,7 @@
 using std::cout;
 using boost::optional;
 
+/** @return Earliest time of content that the next pass() will emit */
 ContentTime
 Decoder::position () const
 {
diff --git a/src/lib/player.cc b/src/lib/player.cc
index 392804ee8..11440ec5e 100644
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -87,6 +87,7 @@ Player::Player (shared_ptr<const Film> film, shared_ptr<const Playlist> playlist
 	, _always_burn_subtitles (false)
 	, _fast (false)
 	, _play_referenced (false)
+	, _last_seek_accurate (true)
 	, _audio_merger (_film->audio_frame_rate())
 {
 	_film_changed_connection = _film->Changed.connect (bind (&Player::film_changed, this, _1));
@@ -537,14 +538,24 @@ Player::pass ()
 		}
 	}
 
-	bool filled = false;
+	DCPTime fill_towards = earliest ? earliest_content : _playlist->length();
+
+	optional<DCPTime> fill_from;
 	if (_last_video_time) {
-		filled = fill_video (DCPTimePeriod (_last_video_time.get(), earliest ? earliest_content : _playlist->length()));
-	} else if (_last_seek_time) {
-		filled = fill_video (DCPTimePeriod (_last_seek_time.get(), _last_seek_time.get() + one_video_frame ()));
+		/* No seek; fill towards the next thing that might happen (or the end of the playlist) */
+		fill_from = _last_video_time;
+	} else if (_last_seek_time && !_playlist->video_content_at(_last_seek_time.get())) {
+		/* Seek into an empty area; fill from the seek time */
+		fill_from = _last_seek_time;
+	}
+
+	if (fill_from && ((fill_towards - fill_from.get())) > one_video_frame()) {
+		emit_video (black_player_video_frame(), fill_from.get());
+	} else if (_playlist->length() == DCPTime()) {
+		emit_video (black_player_video_frame(), DCPTime());
 	}
 
-	if (!earliest && !filled) {
+	if (!earliest && !fill_from) {
 		return true;
 	}
 
@@ -624,7 +635,10 @@ Player::video (weak_ptr<Piece> wp, ContentVideo video)
 	DCPTimePeriod const period (time, time + one_video_frame());
 
 	/* Discard if it's outside the content's period or if it's before the last accurate seek */
-	if (time < piece->content->position() || time >= piece->content->end() || (_last_video_time && time < _last_video_time)) {
+	if (
+		time < piece->content->position() ||
+		time >= piece->content->end() ||
+		(_last_seek_time && _last_seek_accurate && time < _last_seek_time.get())) {
 		return;
 	}
 
@@ -633,7 +647,16 @@ Player::video (weak_ptr<Piece> wp, ContentVideo video)
 	*/
 
 	if (_last_video_time) {
-		fill_video (DCPTimePeriod (_last_video_time.get(), time));
+		/* XXX: this may not work for 3D */
+		BOOST_FOREACH (DCPTimePeriod i, subtract(DCPTimePeriod (_last_video_time.get(), time), _no_video)) {
+			for (DCPTime j = i.from; j < i.to; j += one_video_frame()) {
+				if (_last_video) {
+					emit_video (shared_ptr<PlayerVideo> (new PlayerVideo (*_last_video)), j);
+				} else {
+					emit_video (black_player_video_frame(), j);
+				}
+			}
+		}
 	}
 
 	_last_video.reset (
@@ -897,15 +920,10 @@ Player::seek (DCPTime time, bool accurate)
 		}
 	}
 
-	if (accurate) {
-		_last_video_time = time;
-		_last_audio_time = time;
-	} else {
-		_last_video_time = optional<DCPTime> ();
-		_last_audio_time = optional<DCPTime> ();
-	}
-
+	_last_video_time = optional<DCPTime> ();
+	_last_audio_time = optional<DCPTime> ();
 	_last_seek_time = time;
+	_last_seek_accurate = accurate;
 }
 
 shared_ptr<Resampler>
@@ -935,24 +953,6 @@ Player::resampler (shared_ptr<const AudioContent> content, AudioStreamPtr stream
 	return r;
 }
 
-bool
-Player::fill_video (DCPTimePeriod period)
-{
-	/* XXX: this may not work for 3D */
-	bool filled = false;
-	BOOST_FOREACH (DCPTimePeriod i, subtract(period, _no_video)) {
-		for (DCPTime j = i.from; j < i.to; j += one_video_frame()) {
-			if (_playlist->video_content_at(j) && _last_video) {
-				emit_video (shared_ptr<PlayerVideo> (new PlayerVideo (*_last_video)), j);
-			} else {
-				emit_video (black_player_video_frame(), j);
-			}
-			filled = true;
-		}
-	}
-	return filled;
-}
-
 void
 Player::emit_video (shared_ptr<PlayerVideo> pv, DCPTime time)
 {
diff --git a/src/lib/player.h b/src/lib/player.h
index 7cffa1f11..ffc578c71 100644
--- a/src/lib/player.h
+++ b/src/lib/player.h
@@ -110,7 +110,6 @@ private:
 	void subtitle_stop (boost::weak_ptr<Piece>, ContentTime);
 	boost::shared_ptr<Resampler> resampler (boost::shared_ptr<const AudioContent> content, AudioStreamPtr stream, bool create);
 	DCPTime one_video_frame () const;
-	bool fill_video (DCPTimePeriod period);
 	void fill_audio (DCPTimePeriod period);
 	void audio_flush (boost::shared_ptr<Piece>, AudioStreamPtr stream);
 	void audio_transform (boost::shared_ptr<AudioContent> content, AudioStreamPtr stream, ContentAudio content_audio, DCPTime time);
@@ -146,11 +145,12 @@ private:
 
 	/** Last PlayerVideo that was emitted */
 	boost::shared_ptr<PlayerVideo> _last_video;
-	/** Time just after the last video frame we emitted, or the last seek time */
+	/** Time just after the last video frame we emitted, or empty if we have just seeked */
 	boost::optional<DCPTime> _last_video_time;
-	/** Time just after the last audio frame we emitted, or the last seek time */
+	/** Time just after the last audio frame we emitted, or empty if we have just seeked */
 	boost::optional<DCPTime> _last_audio_time;
 	boost::optional<DCPTime> _last_seek_time;
+	bool _last_seek_accurate;
 
 	AudioMerger _audio_merger;