X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplayer.cc;h=9e0561a7051dbc2fb8be976a118b93eddbc49b76;hb=2537a2d959a5872c2e75b322022a7679d24c7e60;hp=a1adee0b0d08727c7362fdf8218a96e9821f8256;hpb=d3364ecd9b9a4675cfccf87b4ffc93ea604d9e45;p=dcpomatic.git

diff --git a/src/lib/player.cc b/src/lib/player.cc
index a1adee0b0..9e0561a70 100644
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -109,7 +109,7 @@ Player::setup_pieces ()
 			continue;
 		}
 
-		shared_ptr<Decoder> decoder = decoder_factory (i, _film->log());
+		shared_ptr<Decoder> decoder = decoder_factory (i, _film->log(), _fast);
 		FrameRateChange frc (i->active_video_frame_rate(), _film->video_frame_rate());
 
 		if (!decoder) {
@@ -127,7 +127,10 @@ Player::setup_pieces ()
 
 		shared_ptr<DCPDecoder> dcp = dynamic_pointer_cast<DCPDecoder> (decoder);
 		if (dcp && _play_referenced) {
-			dcp->set_decode_referenced ();
+			if (_play_referenced) {
+				dcp->set_decode_referenced ();
+			}
+			dcp->set_forced_reduction (_dcp_decode_reduction);
 		}
 
 		shared_ptr<Piece> piece (new Piece (i, decoder, frc));
@@ -148,6 +151,7 @@ Player::setup_pieces ()
 		}
 	}
 
+	_stream_states.clear ();
 	BOOST_FOREACH (shared_ptr<Piece> i, _pieces) {
 		if (i->content->audio) {
 			BOOST_FOREACH (AudioStreamPtr j, i->content->audio->streams()) {
@@ -156,8 +160,8 @@ Player::setup_pieces ()
 		}
 	}
 
-	_black = Empty (_film, bind(&Content::video, _1));
-	_silent = Empty (_film, bind(&Content::audio, _1));
+	_black = Empty (_film->content(), _film->length(), bind(&Content::video, _1));
+	_silent = Empty (_film->content(), _film->length(), bind(&Content::audio, _1));
 
 	_last_video_time = DCPTime ();
 	_last_audio_time = DCPTime ();
@@ -342,8 +346,8 @@ DCPTime
 Player::content_video_to_dcp (shared_ptr<const Piece> piece, Frame f) const
 {
 	/* See comment in dcp_to_content_video */
-	DCPTime const d = DCPTime::from_frames (f * piece->frc.factor(), piece->frc.dcp) - DCPTime (piece->content->trim_start (), piece->frc);
-	return max (DCPTime (), d + piece->content->position ());
+	DCPTime const d = DCPTime::from_frames (f * piece->frc.factor(), piece->frc.dcp) - DCPTime(piece->content->trim_start(), piece->frc);
+	return d + piece->content->position();
 }
 
 Frame
@@ -422,6 +426,7 @@ Player::set_always_burn_subtitles (bool burn)
 	_always_burn_subtitles = burn;
 }
 
+/** Sets up the player to be faster, possibly at the expense of quality */
 void
 Player::set_fast ()
 {
@@ -449,7 +454,7 @@ Player::get_reel_assets ()
 
 		scoped_ptr<DCPDecoder> decoder;
 		try {
-			decoder.reset (new DCPDecoder (j, _film->log()));
+			decoder.reset (new DCPDecoder (j, _film->log(), false));
 		} catch (...) {
 			return a;
 		}
@@ -591,14 +596,15 @@ Player::pass ()
 	list<pair<shared_ptr<AudioBuffers>, DCPTime> > audio = _audio_merger.pull (pull_to);
 	for (list<pair<shared_ptr<AudioBuffers>, DCPTime> >::iterator i = audio.begin(); i != audio.end(); ++i) {
 		if (_last_audio_time && i->second < *_last_audio_time) {
-			/* There has been an accurate seek and we have received some audio before the seek time;
-			   discard it.
-			*/
+			/* This new data comes before the last we emitted (or the last seek); discard it */
 			pair<shared_ptr<AudioBuffers>, DCPTime> cut = discard_audio (i->first, i->second, *_last_audio_time);
 			if (!cut.first) {
 				continue;
 			}
 			*i = cut;
+		} else if (_last_audio_time && i->second > *_last_audio_time) {
+			/* There's a gap between this data and the last we emitted; fill with silence */
+			fill_audio (DCPTimePeriod (*_last_audio_time, i->second));
 		}
 
 		emit_audio (i->first, i->second);
@@ -645,9 +651,8 @@ Player::video (weak_ptr<Piece> wp, ContentVideo video)
 		return;
 	}
 
-	/* Time and period of the frame we will emit */
+	/* Time of the first frame we will emit */
 	DCPTime const time = content_video_to_dcp (piece, video.frame);
-	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 (
@@ -687,7 +692,11 @@ Player::video (weak_ptr<Piece> wp, ContentVideo video)
 			)
 		);
 
-	emit_video (_last_video[wp], time);
+	DCPTime t = time;
+	for (int i = 0; i < frc.repeat; ++i) {
+		emit_video (_last_video[wp], t);
+		t += one_video_frame ();
+	}
 }
 
 void
@@ -847,6 +856,10 @@ Player::subtitle_stop (weak_ptr<Piece> wp, ContentTime to)
 void
 Player::seek (DCPTime time, bool accurate)
 {
+	if (!_have_valid_pieces) {
+		setup_pieces ();
+	}
+
 	if (_audio_processor) {
 		_audio_processor->flush ();
 	}
@@ -947,3 +960,15 @@ Player::discard_audio (shared_ptr<const AudioBuffers> audio, DCPTime time, DCPTi
 	cut->copy_from (audio.get(), remaining_frames, discard_frames, 0);
 	return make_pair(cut, time + discard_time);
 }
+
+void
+Player::set_dcp_decode_reduction (optional<int> reduction)
+{
+	if (reduction == _dcp_decode_reduction) {
+		return;
+	}
+
+	_dcp_decode_reduction = reduction;
+	_have_valid_pieces = false;
+	Changed (false);
+}