From d02e03907214808ce9da9eb9a2267ff577e85559 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 8 May 2017 11:27:14 +0100 Subject: Player is not finished if it's still filling in blank space. --- src/lib/player.cc | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'src/lib/player.cc') diff --git a/src/lib/player.cc b/src/lib/player.cc index 081174acc..392804ee8 100644 --- a/src/lib/player.cc +++ b/src/lib/player.cc @@ -537,13 +537,14 @@ Player::pass () } } + bool filled = false; if (_last_video_time) { - fill_video (DCPTimePeriod (_last_video_time.get(), earliest ? earliest_content : _playlist->length())); + filled = fill_video (DCPTimePeriod (_last_video_time.get(), earliest ? earliest_content : _playlist->length())); } else if (_last_seek_time) { - fill_video (DCPTimePeriod (_last_seek_time.get(), _last_seek_time.get() + one_video_frame ())); + filled = fill_video (DCPTimePeriod (_last_seek_time.get(), _last_seek_time.get() + one_video_frame ())); } - if (!earliest) { + if (!earliest && !filled) { return true; } @@ -934,10 +935,11 @@ Player::resampler (shared_ptr content, AudioStreamPtr stream return r; } -void +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) { @@ -945,8 +947,10 @@ Player::fill_video (DCPTimePeriod period) } else { emit_video (black_player_video_frame(), j); } + filled = true; } } + return filled; } void -- cgit v1.2.3