X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplayer.cc;h=b5a96163182b458acf00a58661be273251ceab60;hb=d324fc102df00d6dc62614938f78cf983a101dd4;hp=a235d16229bdd616303eb0df3ea02b07f34b1d65;hpb=e24d0def5b4e6c1825620b032af9f63c9eb78693;p=dcpomatic.git

diff --git a/src/lib/player.cc b/src/lib/player.cc
index a235d1622..b5a961631 100644
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -55,6 +55,8 @@ public:
 		: content (c)
 		, video_position (c->position ())
 		, audio_position (c->position ())
+		, repeat_to_do (0)
+		, repeat_done (0)
 	{}
 	
 	Piece (shared_ptr<Content> c, shared_ptr<Decoder> d)
@@ -63,11 +65,51 @@ public:
 		, video_position (c->position ())
 		, audio_position (c->position ())
 	{}
+
+	/** Set this piece to repeat a video frame a given number of times */
+	void set_repeat (IncomingVideo video, int num)
+	{
+		repeat_video = video;
+		repeat_to_do = num;
+		repeat_done = 0;
+	}
+
+	void reset_repeat ()
+	{
+		repeat_video.image.reset ();
+		repeat_to_do = 0;
+		repeat_done = 0;
+	}
+
+	bool repeating () const
+	{
+		return repeat_done != repeat_to_do;
+	}
+
+	void repeat (Player* player)
+	{
+		player->process_video (
+			repeat_video.weak_piece,
+			repeat_video.image,
+			repeat_video.eyes,
+			repeat_done > 0,
+			repeat_video.frame,
+			(repeat_done + 1) * (TIME_HZ / player->_film->video_frame_rate ())
+			);
+
+		++repeat_done;
+	}
 	
 	shared_ptr<Content> content;
 	shared_ptr<Decoder> decoder;
+	/** Time of the last video we emitted relative to the start of the DCP */
 	Time video_position;
+	/** Time of the last audio we emitted relative to the start of the DCP */
 	Time audio_position;
+
+	IncomingVideo repeat_video;
+	int repeat_to_do;
+	int repeat_done;
 };
 
 Player::Player (shared_ptr<const Film> f, shared_ptr<const Playlist> p)
@@ -119,7 +161,10 @@ Player::pass ()
 			continue;
 		}
 
-		if (_video && dynamic_pointer_cast<VideoDecoder> ((*i)->decoder)) {
+		shared_ptr<VideoDecoder> vd = dynamic_pointer_cast<VideoDecoder> ((*i)->decoder);
+		shared_ptr<AudioDecoder> ad = dynamic_pointer_cast<AudioDecoder> ((*i)->decoder);
+
+		if (_video && vd) {
 			if ((*i)->video_position < earliest_t) {
 				earliest_t = (*i)->video_position;
 				earliest = *i;
@@ -127,7 +172,7 @@ Player::pass ()
 			}
 		}
 
-		if (_audio && dynamic_pointer_cast<AudioDecoder> ((*i)->decoder)) {
+		if (_audio && ad && ad->has_audio ()) {
 			if ((*i)->audio_position < earliest_t) {
 				earliest_t = (*i)->audio_position;
 				earliest = *i;
@@ -146,7 +191,11 @@ Player::pass ()
 		if (earliest_t > _video_position) {
 			emit_black ();
 		} else {
-			earliest->decoder->pass ();
+			if (earliest->repeating ()) {
+				earliest->repeat (this);
+			} else {
+				earliest->decoder->pass ();
+			}
 		}
 		break;
 
@@ -172,30 +221,38 @@ Player::pass ()
 	}
 
 	if (_audio) {
-		Time audio_done_up_to = TIME_MAX;
+		boost::optional<Time> audio_done_up_to;
 		for (list<shared_ptr<Piece> >::iterator i = _pieces.begin(); i != _pieces.end(); ++i) {
+			if ((*i)->decoder->done ()) {
+				continue;
+			}
+
 			if (dynamic_pointer_cast<AudioDecoder> ((*i)->decoder)) {
-				audio_done_up_to = min (audio_done_up_to, (*i)->audio_position);
+				audio_done_up_to = min (audio_done_up_to.get_value_or (TIME_MAX), (*i)->audio_position);
 			}
 		}
 
-		TimedAudioBuffers<Time> tb = _audio_merger.pull (audio_done_up_to);
-		Audio (tb.audio, tb.time);
-		_audio_position += _film->audio_frames_to_time (tb.audio->frames ());
+		if (audio_done_up_to) {
+			TimedAudioBuffers<Time> tb = _audio_merger.pull (audio_done_up_to.get ());
+			Audio (tb.audio, tb.time);
+			_audio_position += _film->audio_frames_to_time (tb.audio->frames ());
+		}
 	}
 		
 	return false;
 }
 
+/** @param extra Amount of extra time to add to the content frame's time (for repeat) */
 void
-Player::process_video (weak_ptr<Piece> weak_piece, shared_ptr<const Image> image, Eyes eyes, bool same, VideoContent::Frame frame)
+Player::process_video (weak_ptr<Piece> weak_piece, shared_ptr<const Image> image, Eyes eyes, bool same, VideoContent::Frame frame, Time extra)
 {
 	/* Keep a note of what came in so that we can repeat it if required */
-	_last_process_video.weak_piece = weak_piece;
-	_last_process_video.image = image;
-	_last_process_video.eyes = eyes;
-	_last_process_video.same = same;
-	_last_process_video.frame = frame;
+	_last_incoming_video.weak_piece = weak_piece;
+	_last_incoming_video.image = image;
+	_last_incoming_video.eyes = eyes;
+	_last_incoming_video.same = same;
+	_last_incoming_video.frame = frame;
+	_last_incoming_video.extra = extra;
 	
 	shared_ptr<Piece> piece = weak_piece.lock ();
 	if (!piece) {
@@ -225,7 +282,7 @@ Player::process_video (weak_ptr<Piece> weak_piece, shared_ptr<const Image> image
 	
 	work_image = work_image->scale (image_size, _film->scaler(), PIX_FMT_RGB24, true);
 
-	Time time = content->position() + relative_time - content->trim_start ();
+	Time time = content->position() + relative_time + extra - content->trim_start ();
 	    
 	if (_film->with_subtitles () && _out_subtitle.image && time >= _out_subtitle.from && time <= _out_subtitle.to) {
 		work_image->alpha_blend (_out_subtitle.image, _out_subtitle.position);
@@ -245,16 +302,14 @@ Player::process_video (weak_ptr<Piece> weak_piece, shared_ptr<const Image> image
 #endif
 
 	Video (work_image, eyes, content->colour_conversion(), same, time);
-	time += TIME_HZ / _film->video_frame_rate();
-
-	if (frc.repeat) {
-		Video (work_image, eyes, content->colour_conversion(), true, time);
-		time += TIME_HZ / _film->video_frame_rate();
-	}
 
+	time += TIME_HZ / _film->video_frame_rate();
 	_last_emit_was_black = false;
-
 	_video_position = piece->video_position = time;
+
+	if (frc.repeat > 1 && !piece->repeating ()) {
+		piece->set_repeat (_last_incoming_video, frc.repeat - 1);
+	}
 }
 
 void
@@ -289,7 +344,7 @@ Player::process_audio (weak_ptr<Piece> weak_piece, shared_ptr<const AudioBuffers
 		return;
 	}
 
-	Time time = content->position() + (content->audio_delay() * TIME_HZ / 1000) + relative_time;
+	Time time = content->position() + (content->audio_delay() * TIME_HZ / 1000) + relative_time - content->trim_start ();
 	
 	/* Remap channels */
 	shared_ptr<AudioBuffers> dcp_mapped (new AudioBuffers (_film->audio_channels(), audio->frames()));
@@ -361,24 +416,25 @@ Player::seek (Time t, bool accurate)
 		if (!vc) {
 			continue;
 		}
-		
+
+		/* s is the offset of t from the start position of this content */
 		Time s = t - vc->position ();
 		s = max (static_cast<Time> (0), s);
 		s = min (vc->length_after_trim(), s);
 
+		/* Hence set the piece positions to the `global' time */
 		(*i)->video_position = (*i)->audio_position = vc->position() + s;
 
-		FrameRateConversion frc (vc->video_frame_rate(), _film->video_frame_rate());
-		/* Here we are converting from time (in the DCP) to a frame number in the content.
-		   Hence we need to use the DCP's frame rate and the double/skip correction, not
-		   the source's rate.
-		*/
-		VideoContent::Frame f = (s + vc->trim_start ()) * _film->video_frame_rate() / (frc.factor() * TIME_HZ);
-		dynamic_pointer_cast<VideoDecoder>((*i)->decoder)->seek (f, accurate);
+		/* And seek the decoder */
+		dynamic_pointer_cast<VideoDecoder>((*i)->decoder)->seek (
+			vc->time_to_content_video_frames (s + vc->trim_start ()), accurate
+			);
+
+		(*i)->reset_repeat ();
 	}
 
 	_video_position = _audio_position = t;
-	
+
 	/* XXX: don't seek audio because we don't need to... */
 }
 
@@ -402,10 +458,11 @@ Player::setup_pieces ()
 		if (fc) {
 			shared_ptr<FFmpegDecoder> fd (new FFmpegDecoder (_film, fc, _video, _audio));
 			
-			fd->Video.connect (bind (&Player::process_video, this, piece, _1, _2, _3, _4));
-			fd->Audio.connect (bind (&Player::process_audio, this, piece, _1, _2));
-			fd->Subtitle.connect (bind (&Player::process_subtitle, this, piece, _1, _2, _3, _4));
+			fd->Video.connect (bind (&Player::process_video, this, weak_ptr<Piece> (piece), _1, _2, _3, _4, 0));
+			fd->Audio.connect (bind (&Player::process_audio, this, weak_ptr<Piece> (piece), _1, _2));
+			fd->Subtitle.connect (bind (&Player::process_subtitle, this, weak_ptr<Piece> (piece), _1, _2, _3, _4));
 
+			fd->seek (fc->time_to_content_video_frames (fc->trim_start ()), true);
 			piece->decoder = fd;
 		}
 		
@@ -423,7 +480,7 @@ Player::setup_pieces ()
 
 			if (!id) {
 				id.reset (new StillImageDecoder (_film, ic));
-				id->Video.connect (bind (&Player::process_video, this, piece, _1, _2, _3, _4));
+				id->Video.connect (bind (&Player::process_video, this, weak_ptr<Piece> (piece), _1, _2, _3, _4, 0));
 			}
 
 			piece->decoder = id;
@@ -435,7 +492,7 @@ Player::setup_pieces ()
 
 			if (!md) {
 				md.reset (new MovingImageDecoder (_film, mc));
-				md->Video.connect (bind (&Player::process_video, this, piece, _1, _2, _3, _4));
+				md->Video.connect (bind (&Player::process_video, this, weak_ptr<Piece> (piece), _1, _2, _3, _4, 0));
 			}
 
 			piece->decoder = md;
@@ -444,7 +501,7 @@ Player::setup_pieces ()
 		shared_ptr<const SndfileContent> sc = dynamic_pointer_cast<const SndfileContent> (*i);
 		if (sc) {
 			shared_ptr<AudioDecoder> sd (new SndfileDecoder (_film, sc));
-			sd->Audio.connect (bind (&Player::process_audio, this, piece, _1, _2));
+			sd->Audio.connect (bind (&Player::process_audio, this, weak_ptr<Piece> (piece), _1, _2));
 
 			piece->decoder = sd;
 		}
@@ -479,6 +536,10 @@ Player::content_changed (weak_ptr<Content> w, int property, bool frequent)
 		property == VideoContentProperty::VIDEO_RATIO
 		) {
 		
+		Changed (frequent);
+
+	} else if (property == ContentProperty::PATH) {
+
 		Changed (frequent);
 	}
 }
@@ -509,6 +570,12 @@ Player::resampler (shared_ptr<AudioContent> c, bool create)
 	if (!create) {
 		return shared_ptr<Resampler> ();
 	}
+
+	_film->log()->log (
+		String::compose (
+			"Creating new resampler for %1 to %2 with %3 channels", c->content_audio_frame_rate(), c->output_audio_frame_rate(), c->audio_channels()
+			)
+		);
 	
 	shared_ptr<Resampler> r (new Resampler (c->content_audio_frame_rate(), c->output_audio_frame_rate(), c->audio_channels()));
 	_resamplers[c] = r;
@@ -521,7 +588,7 @@ Player::emit_black ()
 #ifdef DCPOMATIC_DEBUG
 	_last_video.reset ();
 #endif
-	
+
 	Video (_black_frame, EYES_BOTH, ColourConversion(), _last_emit_was_black, _video_position);
 	_video_position += _film->video_frames_to_time (1);
 	_last_emit_was_black = true;
@@ -616,19 +683,24 @@ Player::update_subtitle ()
 	_out_subtitle.to = _in_subtitle.to + piece->content->position ();
 }
 
-/** Re-emit the last frame that was emitted, using current settings for crop, ratio, scaler and subtitles */
-void
+/** Re-emit the last frame that was emitted, using current settings for crop, ratio, scaler and subtitles.
+ *  @return false if this could not be done.
+ */
+bool
 Player::repeat_last_video ()
 {
-	if (!_last_process_video.image) {
-		return;
+	if (!_last_incoming_video.image) {
+		return false;
 	}
 
 	process_video (
-		_last_process_video.weak_piece,
-		_last_process_video.image,
-		_last_process_video.eyes,
-		_last_process_video.same,
-		_last_process_video.frame
+		_last_incoming_video.weak_piece,
+		_last_incoming_video.image,
+		_last_incoming_video.eyes,
+		_last_incoming_video.same,
+		_last_incoming_video.frame,
+		_last_incoming_video.extra
 		);
+
+	return true;
 }