X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplayer.cc;h=537a7190606e2e3effe394c356d2dfca9657003b;hb=5c712268c87dd318a6f5357b0d8f7b8a8b7764bb;hp=a7440cb4ffaef40de59a1ca5d5a68259e340c49c;hpb=1938b1b08d38fc199717d1875a61ef05e5b965de;p=dcpomatic.git

diff --git a/src/lib/player.cc b/src/lib/player.cc
index a7440cb4f..537a71906 100644
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -60,8 +60,6 @@
 
 #include "i18n.h"
 
-#define LOG_GENERAL(...) _film->log()->log (String::compose (__VA_ARGS__), LogEntry::TYPE_GENERAL);
-
 using std::list;
 using std::cout;
 using std::min;
@@ -155,8 +153,8 @@ Player::setup_pieces_unlocked ()
 			continue;
 		}
 
-		shared_ptr<Decoder> decoder = decoder_factory (i, _film->log(), _fast);
-		FrameRateChange frc (i->active_video_frame_rate(), _film->video_frame_rate());
+		shared_ptr<Decoder> decoder = decoder_factory (_film, i, _fast);
+		FrameRateChange frc (_film, i);
 
 		if (!decoder) {
 			/* Not something that we can decode; e.g. Atmos content */
@@ -227,13 +225,12 @@ Player::setup_pieces_unlocked ()
 		}
 	}
 
-	_black = Empty (_pieces, _film->length(), bind(&have_video, _1));
-	_silent = Empty (_pieces, _film->length(), bind(&have_audio, _1));
+	_black = Empty (_film, _pieces, bind(&have_video, _1));
+	_silent = Empty (_film, _pieces, bind(&have_audio, _1));
 
 	_last_video_time = DCPTime ();
 	_last_video_eyes = EYES_BOTH;
 	_last_audio_time = DCPTime ();
-	_suspended = false;
 }
 
 void
@@ -249,6 +246,7 @@ Player::playlist_content_change (ChangeType type, int property, bool frequent)
 	} else if (type == CHANGE_TYPE_DONE) {
 		/* A change in our content has gone through.  Re-build our pieces. */
 		setup_pieces ();
+		_suspended = false;
 	} else if (type == CHANGE_TYPE_CANCELLED) {
 		boost::mutex::scoped_lock lm (_mutex);
 		_suspended = false;
@@ -343,7 +341,7 @@ Frame
 Player::dcp_to_content_video (shared_ptr<const Piece> piece, DCPTime t) const
 {
 	DCPTime s = t - piece->content->position ();
-	s = min (piece->content->length_after_trim(), s);
+	s = min (piece->content->length_after_trim(_film), s);
 	s = max (DCPTime(), s + DCPTime (piece->content->trim_start(), piece->frc));
 
 	/* It might seem more logical here to convert s to a ContentTime (using the FrameRateChange)
@@ -368,7 +366,7 @@ Frame
 Player::dcp_to_resampled_audio (shared_ptr<const Piece> piece, DCPTime t) const
 {
 	DCPTime s = t - piece->content->position ();
-	s = min (piece->content->length_after_trim(), s);
+	s = min (piece->content->length_after_trim(_film), s);
 	/* See notes in dcp_to_content_video */
 	return max (DCPTime (), DCPTime (piece->content->trim_start (), piece->frc) + s).frames_floor (_film->audio_frame_rate ());
 }
@@ -386,7 +384,7 @@ ContentTime
 Player::dcp_to_content_time (shared_ptr<const Piece> piece, DCPTime t) const
 {
 	DCPTime s = t - piece->content->position ();
-	s = min (piece->content->length_after_trim(), s);
+	s = min (piece->content->length_after_trim(_film), s);
 	return max (ContentTime (), ContentTime (s, piece->frc) + piece->content->trim_start());
 }
 
@@ -480,7 +478,7 @@ Player::get_reel_assets ()
 
 		scoped_ptr<DCPDecoder> decoder;
 		try {
-			decoder.reset (new DCPDecoder (j, _film->log(), false));
+			decoder.reset (new DCPDecoder (_film, j, false));
 		} catch (...) {
 			return a;
 		}
@@ -554,7 +552,7 @@ Player::pass ()
 		return false;
 	}
 
-	if (_playlist->length() == DCPTime()) {
+	if (_playlist->length(_film) == DCPTime()) {
 		/* Special case of an empty Film; just give one black frame */
 		emit_video (black_player_video_frame(EYES_BOTH), DCPTime());
 		return true;
@@ -571,7 +569,7 @@ Player::pass ()
 		}
 
 		DCPTime const t = content_time_to_dcp (i, max(i->decoder->position(), i->content->trim_start()));
-		if (t > i->content->end()) {
+		if (t > i->content->end(_film)) {
 			i->done = true;
 		} else {
 
@@ -621,11 +619,10 @@ Player::pass ()
 		DCPTimePeriod period (_silent.period_at_position());
 		if (_last_audio_time) {
 			/* Sometimes the thing that happened last finishes fractionally before
-			   this silence.  Bodge the start time of the silence to fix it.  I'm
-			   not sure if this is the right solution --- maybe the last thing should
-			   be padded `forward' rather than this thing padding `back'.
+			   or after this silence.  Bodge the start time of the silence to fix it.
 			*/
-			period.from = min(period.from, *_last_audio_time);
+			DCPOMATIC_ASSERT (labs(period.from.get() - _last_audio_time->get()) < 2);
+			period.from = *_last_audio_time;
 		}
 		if (period.duration() > one_video_frame()) {
 			period.to = period.from + one_video_frame();
@@ -735,7 +732,7 @@ Player::video (weak_ptr<Piece> wp, ContentVideo video)
 		return;
 	}
 
-	FrameRateChange frc(piece->content->active_video_frame_rate(), _film->video_frame_rate());
+	FrameRateChange frc (_film, piece->content);
 	if (frc.skip && (video.frame % 2) == 1) {
 		return;
 	}
@@ -754,44 +751,48 @@ Player::video (weak_ptr<Piece> wp, ContentVideo video)
 	/* Fill gaps that we discover now that we have some video which needs to be emitted.
 	   This is where we need to fill to.
 	*/
-	DCPTime fill_to = min (time, piece->content->end());
+	DCPTime fill_to = min (time, piece->content->end(_film));
 
 	if (_last_video_time) {
 		DCPTime fill_from = max (*_last_video_time, piece->content->position());
-		LastVideoMap::const_iterator last = _last_video.find (wp);
-		if (_film->three_d()) {
-			Eyes fill_to_eyes = video.eyes;
-			if (fill_to_eyes == EYES_BOTH) {
-				fill_to_eyes = EYES_LEFT;
-			}
-			if (fill_to == piece->content->end()) {
-				/* Don't fill after the end of the content */
-				fill_to_eyes = EYES_LEFT;
-			}
-			DCPTime j = fill_from;
-			Eyes eyes = _last_video_eyes.get_value_or(EYES_LEFT);
-			if (eyes == EYES_BOTH) {
-				eyes = EYES_LEFT;
-			}
-			while (j < fill_to || eyes != fill_to_eyes) {
-				if (last != _last_video.end()) {
-					shared_ptr<PlayerVideo> copy = last->second->shallow_copy();
-					copy->set_eyes (eyes);
-					emit_video (copy, j);
-				} else {
-					emit_video (black_player_video_frame(eyes), j);
+
+		/* Fill if we have more than half a frame to do */
+		if ((fill_to - fill_from) > one_video_frame() / 2) {
+			LastVideoMap::const_iterator last = _last_video.find (wp);
+			if (_film->three_d()) {
+				Eyes fill_to_eyes = video.eyes;
+				if (fill_to_eyes == EYES_BOTH) {
+					fill_to_eyes = EYES_LEFT;
 				}
-				if (eyes == EYES_RIGHT) {
-					j += one_video_frame();
+				if (fill_to == piece->content->end(_film)) {
+					/* Don't fill after the end of the content */
+					fill_to_eyes = EYES_LEFT;
 				}
-				eyes = increment_eyes (eyes);
-			}
-		} else {
-			for (DCPTime j = fill_from; j < fill_to; j += one_video_frame()) {
-				if (last != _last_video.end()) {
-					emit_video (last->second, j);
-				} else {
-					emit_video (black_player_video_frame(EYES_BOTH), j);
+				DCPTime j = fill_from;
+				Eyes eyes = _last_video_eyes.get_value_or(EYES_LEFT);
+				if (eyes == EYES_BOTH) {
+					eyes = EYES_LEFT;
+				}
+				while (j < fill_to || eyes != fill_to_eyes) {
+					if (last != _last_video.end()) {
+						shared_ptr<PlayerVideo> copy = last->second->shallow_copy();
+						copy->set_eyes (eyes);
+						emit_video (copy, j);
+					} else {
+						emit_video (black_player_video_frame(eyes), j);
+					}
+					if (eyes == EYES_RIGHT) {
+						j += one_video_frame();
+					}
+					eyes = increment_eyes (eyes);
+				}
+			} else {
+				for (DCPTime j = fill_from; j < fill_to; j += one_video_frame()) {
+					if (last != _last_video.end()) {
+						emit_video (last->second, j);
+					} else {
+						emit_video (black_player_video_frame(EYES_BOTH), j);
+					}
 				}
 			}
 		}
@@ -801,7 +802,7 @@ Player::video (weak_ptr<Piece> wp, ContentVideo video)
 		new PlayerVideo (
 			video.image,
 			piece->content->video->crop (),
-			piece->content->video->fade (video.frame),
+			piece->content->video->fade (_film, video.frame),
 			piece->content->video->scale().size (
 				piece->content->video, _video_container_size, _film->frame_size ()
 				),
@@ -816,7 +817,7 @@ Player::video (weak_ptr<Piece> wp, ContentVideo video)
 
 	DCPTime t = time;
 	for (int i = 0; i < frc.repeat; ++i) {
-		if (t < piece->content->end()) {
+		if (t < piece->content->end(_film)) {
 			emit_video (_last_video[wp], t);
 		}
 		t += one_video_frame ();
@@ -839,7 +840,7 @@ Player::audio (weak_ptr<Piece> wp, AudioStreamPtr stream, ContentAudio content_a
 	/* Compute time in the DCP */
 	DCPTime time = resampled_audio_to_dcp (piece, content_audio.frame);
 	/* And the end of this block in the DCP */
-	DCPTime end = time + DCPTime::from_frames(content_audio.audio->frames(), content->resampled_frame_rate());
+	DCPTime end = time + DCPTime::from_frames(content_audio.audio->frames(), content->resampled_frame_rate(_film));
 
 	/* Remove anything that comes before the start or after the end of the content */
 	if (time < piece->content->position()) {
@@ -850,11 +851,11 @@ Player::audio (weak_ptr<Piece> wp, AudioStreamPtr stream, ContentAudio content_a
 		}
 		content_audio.audio = cut.first;
 		time = cut.second;
-	} else if (time > piece->content->end()) {
+	} else if (time > piece->content->end(_film)) {
 		/* Discard it all */
 		return;
-	} else if (end > piece->content->end()) {
-		Frame const remaining_frames = DCPTime(piece->content->end() - time).frames_round(_film->audio_frame_rate());
+	} else if (end > piece->content->end(_film)) {
+		Frame const remaining_frames = DCPTime(piece->content->end(_film) - time).frames_round(_film->audio_frame_rate());
 		if (remaining_frames == 0) {
 			return;
 		}
@@ -933,7 +934,7 @@ Player::plain_text_start (weak_ptr<Piece> wp, weak_ptr<const TextContent> wc, Co
 	PlayerText ps;
 	DCPTime const from (content_time_to_dcp (piece, subtitle.from()));
 
-	if (from > piece->content->end()) {
+	if (from > piece->content->end(_film)) {
 		return;
 	}
 
@@ -984,7 +985,7 @@ Player::subtitle_stop (weak_ptr<Piece> wp, weak_ptr<const TextContent> wc, Conte
 
 	DCPTime const dcp_to = content_time_to_dcp (piece, to);
 
-	if (dcp_to > piece->content->end()) {
+	if (dcp_to > piece->content->end(_film)) {
 		return;
 	}
 
@@ -1026,7 +1027,7 @@ Player::seek (DCPTime time, bool accurate)
 			/* Before; seek to the start of the content */
 			i->decoder->seek (dcp_to_content_time (i, i->content->position()), accurate);
 			i->done = false;
-		} else if (i->content->position() <= time && time < i->content->end()) {
+		} else if (i->content->position() <= time && time < i->content->end(_film)) {
 			/* During; seek to position */
 			i->decoder->seek (dcp_to_content_time (i, time), accurate);
 			i->done = false;
@@ -1095,13 +1096,13 @@ void
 Player::emit_audio (shared_ptr<AudioBuffers> data, DCPTime time)
 {
 	/* Log if the assert below is about to fail */
-	if (_last_audio_time && time != *_last_audio_time) {
+	if (_last_audio_time && labs(time.get() - _last_audio_time->get()) > 1) {
 		_film->log()->log(String::compose("Out-of-sequence emit %1 vs %2", to_string(time), to_string(*_last_audio_time)), LogEntry::TYPE_WARNING);
 	}
 
-	/* This audio must follow on from the previous */
-	DCPOMATIC_ASSERT (!_last_audio_time || time == *_last_audio_time);
-	Audio (data, time);
+	/* This audio must follow on from the previous, allowing for half a sample (at 48kHz) leeway */
+	DCPOMATIC_ASSERT (!_last_audio_time || labs(time.get() - _last_audio_time->get()) < 2);
+	Audio (data, time, _film->audio_frame_rate());
 	_last_audio_time = time + DCPTime::from_frames (data->frames(), _film->audio_frame_rate());
 }