X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplayer.cc;h=cacb42651b1656d706773a7b335c21c054af2458;hb=5625ba9542e38504e87799dd655be5071161fb1f;hp=1ab164d867f216f80c44bb0dd8c4e5c24fd9b0ad;hpb=d9362bdd24f01e4c833e89d63ac3816f36eae36e;p=dcpomatic.git

diff --git a/src/lib/player.cc b/src/lib/player.cc
index 1ab164d86..cacb42651 100644
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -22,8 +22,8 @@
 #include "film.h"
 #include "ffmpeg_decoder.h"
 #include "ffmpeg_content.h"
-#include "still_image_decoder.h"
-#include "still_image_content.h"
+#include "image_decoder.h"
+#include "image_content.h"
 #include "sndfile_decoder.h"
 #include "sndfile_content.h"
 #include "subtitle_content.h"
@@ -31,6 +31,7 @@
 #include "job.h"
 #include "image.h"
 #include "ratio.h"
+#include "resampler.h"
 #include "log.h"
 #include "scaler.h"
 
@@ -45,46 +46,69 @@ using boost::shared_ptr;
 using boost::weak_ptr;
 using boost::dynamic_pointer_cast;
 
-//#define DEBUG_PLAYER 1
-
 class Piece
 {
 public:
 	Piece (shared_ptr<Content> c)
 		: content (c)
-		, video_position (c->start ())
-		, audio_position (c->start ())
+		, video_position (c->position ())
+		, audio_position (c->position ())
+		, repeat_to_do (0)
+		, repeat_done (0)
 	{}
 	
 	Piece (shared_ptr<Content> c, shared_ptr<Decoder> d)
 		: content (c)
 		, decoder (d)
-		, video_position (c->start ())
-		, audio_position (c->start ())
+		, 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;
-};
 
-#ifdef DEBUG_PLAYER
-std::ostream& operator<<(std::ostream& s, Piece const & p)
-{
-	if (dynamic_pointer_cast<FFmpegContent> (p.content)) {
-		s << "\tffmpeg	   ";
-	} else if (dynamic_pointer_cast<StillImageContent> (p.content)) {
-		s << "\tstill image";
-	} else if (dynamic_pointer_cast<SndfileContent> (p.content)) {
-		s << "\tsndfile	   ";
-	}
-	
-	s << " at " << p.content->start() << " until " << p.content->end();
-	
-	return s;
-}
-#endif	
+	IncomingVideo repeat_video;
+	int repeat_to_do;
+	int repeat_done;
+};
 
 Player::Player (shared_ptr<const Film> f, shared_ptr<const Playlist> p)
 	: _film (f)
@@ -94,12 +118,13 @@ Player::Player (shared_ptr<const Film> f, shared_ptr<const Playlist> p)
 	, _have_valid_pieces (false)
 	, _video_position (0)
 	, _audio_position (0)
-	, _audio_buffers (f->audio_channels(), 0)
+	, _audio_merger (f->audio_channels(), bind (&Film::time_to_audio_frames, f.get(), _1), bind (&Film::audio_frames_to_time, f.get(), _1))
+	, _last_emit_was_black (false)
 {
-	_playlist->Changed.connect (bind (&Player::playlist_changed, this));
-	_playlist->ContentChanged.connect (bind (&Player::content_changed, this, _1, _2, _3));
-	_film->Changed.connect (bind (&Player::film_changed, this, _1));
-	set_video_container_size (_film->container()->size (_film->full_frame ()));
+	_playlist_changed_connection = _playlist->Changed.connect (bind (&Player::playlist_changed, this));
+	_playlist_content_changed_connection = _playlist->ContentChanged.connect (bind (&Player::content_changed, this, _1, _2, _3));
+	_film_changed_connection = _film->Changed.connect (bind (&Player::film_changed, this, _1));
+	set_video_container_size (fit_ratio_within (_film->container()->ratio (), _film->full_frame ()));
 }
 
 void
@@ -119,13 +144,8 @@ Player::pass ()
 {
 	if (!_have_valid_pieces) {
 		setup_pieces ();
-		_have_valid_pieces = true;
 	}
 
-#ifdef DEBUG_PLAYER
-	cout << "= PASS\n";
-#endif	
-
 	Time earliest_t = TIME_MAX;
 	shared_ptr<Piece> earliest;
 	enum {
@@ -138,7 +158,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;
@@ -146,7 +169,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;
@@ -156,10 +179,6 @@ Player::pass ()
 	}
 
 	if (!earliest) {
-#ifdef DEBUG_PLAYER
-		cout << "no earliest piece.\n";
-#endif		
-		
 		flush ();
 		return true;
 	}
@@ -167,43 +186,71 @@ Player::pass ()
 	switch (type) {
 	case VIDEO:
 		if (earliest_t > _video_position) {
-#ifdef DEBUG_PLAYER
-			cout << "no video here; emitting black frame (earliest=" << earliest_t << ", video_position=" << _video_position << ").\n";
-#endif
 			emit_black ();
 		} else {
-#ifdef DEBUG_PLAYER
-			cout << "Pass " << *earliest << "\n";
-#endif			
-			earliest->decoder->pass ();
+			if (earliest->repeating ()) {
+				earliest->repeat (this);
+			} else {
+				earliest->decoder->pass ();
+			}
 		}
 		break;
 
 	case AUDIO:
 		if (earliest_t > _audio_position) {
-#ifdef DEBUG_PLAYER
-			cout << "no audio here; emitting silence.\n";
-#endif
 			emit_silence (_film->time_to_audio_frames (earliest_t - _audio_position));
 		} else {
-#ifdef DEBUG_PLAYER
-			cout << "Pass " << *earliest << "\n";
-#endif			
 			earliest->decoder->pass ();
+
+			if (earliest->decoder->done()) {
+				shared_ptr<AudioContent> ac = dynamic_pointer_cast<AudioContent> (earliest->content);
+				assert (ac);
+				shared_ptr<Resampler> re = resampler (ac, false);
+				if (re) {
+					shared_ptr<const AudioBuffers> b = re->flush ();
+					if (b->frames ()) {
+						process_audio (earliest, b, ac->audio_length ());
+					}
+				}
+			}
 		}
 		break;
 	}
 
-#ifdef DEBUG_PLAYER
-	cout << "\tpost pass " << _video_position << " " << _audio_position << "\n";
-#endif	
+	if (_audio) {
+		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.get_value_or (TIME_MAX), (*i)->audio_position);
+			}
+		}
+
+		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_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) {
 		return;
@@ -217,40 +264,47 @@ Player::process_video (weak_ptr<Piece> weak_piece, shared_ptr<const Image> image
 		return;
 	}
 
-	shared_ptr<Image> work_image = image->crop (content->crop(), true);
-
-	libdcp::Size const image_size = content->ratio()->size (_video_container_size);
-	
-	work_image = work_image->scale_and_convert_to_rgb (image_size, _film->scaler(), true);
+	Time const relative_time = (frame * frc.factor() * TIME_HZ / _film->video_frame_rate());
+	if (content->trimmed (relative_time)) {
+		return;
+	}
 
-	Time time = content->start() + (frame * frc.factor() * TIME_HZ / _film->video_frame_rate());
+	Time const time = content->position() + relative_time + extra - content->trim_start ();
+	float const ratio = content->ratio() ? content->ratio()->ratio() : content->video_size_after_crop().ratio();
+	libdcp::Size const image_size = fit_ratio_within (ratio, _video_container_size);
+
+	shared_ptr<PlayerImage> pi (
+		new PlayerImage (
+			image,
+			content->crop(),
+			image_size,
+			_video_container_size,
+			_film->scaler()
+			)
+		);
 	
 	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);
-	}
 
-	if (image_size != _video_container_size) {
-		assert (image_size.width <= _video_container_size.width);
-		assert (image_size.height <= _video_container_size.height);
-		shared_ptr<Image> im (new Image (PIX_FMT_RGB24, _video_container_size, true));
-		im->make_black ();
-		im->copy (work_image, Position<int> ((_video_container_size.width - image_size.width) / 2, (_video_container_size.height - image_size.height) / 2));
-		work_image = im;
-	}
+		Position<int> const container_offset (
+			(_video_container_size.width - image_size.width) / 2,
+			(_video_container_size.height - image_size.width) / 2
+			);
 
+		pi->set_subtitle (_out_subtitle.image, _out_subtitle.position + container_offset);
+	}
+					    
 #ifdef DCPOMATIC_DEBUG
 	_last_video = piece->content;
 #endif
 
-	Video (work_image, eyes, same, time);
-	time += TIME_HZ / _film->video_frame_rate();
+	Video (pi, eyes, content->colour_conversion(), same, time);
 
-	if (frc.repeat) {
-		Video (work_image, eyes, true, time);
-		time += TIME_HZ / _film->video_frame_rate();
-	}
+	_last_emit_was_black = false;
+	_video_position = piece->video_position = (time + TIME_HZ / _film->video_frame_rate());
 
-	_video_position = piece->video_position = time;
+	if (frc.repeat > 1 && !piece->repeating ()) {
+		piece->set_repeat (_last_incoming_video, frc.repeat - 1);
+	}
 }
 
 void
@@ -264,6 +318,29 @@ Player::process_audio (weak_ptr<Piece> weak_piece, shared_ptr<const AudioBuffers
 	shared_ptr<AudioContent> content = dynamic_pointer_cast<AudioContent> (piece->content);
 	assert (content);
 
+	/* Gain */
+	if (content->audio_gain() != 0) {
+		shared_ptr<AudioBuffers> gain (new AudioBuffers (audio));
+		gain->apply_gain (content->audio_gain ());
+		audio = gain;
+	}
+
+	/* Resample */
+	if (content->content_audio_frame_rate() != content->output_audio_frame_rate()) {
+		shared_ptr<Resampler> r = resampler (content, true);
+		pair<shared_ptr<const AudioBuffers>, AudioContent::Frame> ro = r->run (audio, frame);
+		audio = ro.first;
+		frame = ro.second;
+	}
+	
+	Time const relative_time = _film->audio_frames_to_time (frame);
+
+	if (content->trimmed (relative_time)) {
+		return;
+	}
+
+	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()));
 	dcp_mapped->make_silent ();
@@ -276,10 +353,6 @@ Player::process_audio (weak_ptr<Piece> weak_piece, shared_ptr<const AudioBuffers
 
 	audio = dcp_mapped;
 
-	Time time = content->start()
-		+ _film->audio_frames_to_time (frame)
-		+ (content->audio_delay() * TIME_HZ / 1000);
-
 	/* We must cut off anything that comes before the start of all time */
 	if (time < 0) {
 		int const frames = - time * _film->audio_frame_rate() / TIME_HZ;
@@ -294,57 +367,24 @@ Player::process_audio (weak_ptr<Piece> weak_piece, shared_ptr<const AudioBuffers
 		time = 0;
 	}
 
-	/* The time of this audio may indicate that some of our buffered audio is not going to
-	   be added to any more, so it can be emitted.
-	*/
-
-	if (time > _audio_position) {
-		/* We can emit some audio from our buffers; this is how many frames */
-		OutputAudioFrame const N = _film->time_to_audio_frames (time - _audio_position);
-		if (N > _audio_buffers.frames()) {
-			/* We need some extra silence before whatever is in the buffers */
-			_audio_buffers.ensure_size (N);
-			_audio_buffers.move (0, N - _audio_buffers.frames(), _audio_buffers.frames ());
-			_audio_buffers.make_silent (0, _audio_buffers.frames());
-			_audio_buffers.set_frames (N);
-		}
-		assert (N <= _audio_buffers.frames());
-
-		/* XXX: not convinced that a copy is necessary here */
-		shared_ptr<AudioBuffers> emit (new AudioBuffers (_audio_buffers.channels(), N));
-		emit->copy_from (&_audio_buffers, N, 0, 0);
-		Audio (emit, _audio_position);
-		_audio_position = piece->audio_position = _audio_position + _film->audio_frames_to_time (N);
-
-		/* And remove it from our buffers */
-		if (_audio_buffers.frames() > N) {
-			_audio_buffers.move (N, 0, _audio_buffers.frames() - N);
-		}
-		_audio_buffers.set_frames (_audio_buffers.frames() - N);
-	}
-
-	/* Now accumulate the new audio into our buffers */
-	_audio_buffers.ensure_size (_audio_buffers.frames() + audio->frames());
-	_audio_buffers.accumulate_frames (audio.get(), 0, 0, audio->frames ());
-	_audio_buffers.set_frames (_audio_buffers.frames() + audio->frames());
+	_audio_merger.push (audio, time);
+	piece->audio_position += _film->audio_frames_to_time (audio->frames ());
 }
 
 void
 Player::flush ()
 {
-	if (_audio_buffers.frames() > 0) {
-		shared_ptr<AudioBuffers> emit (new AudioBuffers (_audio_buffers.channels(), _audio_buffers.frames()));
-		emit->copy_from (&_audio_buffers, _audio_buffers.frames(), 0, 0);
-		Audio (emit, _audio_position);
-		_audio_position += _film->audio_frames_to_time (_audio_buffers.frames ());
-		_audio_buffers.set_frames (0);
+	TimedAudioBuffers<Time> tb = _audio_merger.flush ();
+	if (_audio && tb.audio) {
+		Audio (tb.audio, tb.time);
+		_audio_position += _film->audio_frames_to_time (tb.audio->frames ());
 	}
 
-	while (_video_position < _audio_position) {
+	while (_video && _video_position < _audio_position) {
 		emit_black ();
 	}
 
-	while (_audio_position < _video_position) {
+	while (_audio && _audio_position < _video_position) {
 		emit_silence (_film->time_to_audio_frames (_video_position - _audio_position));
 	}
 	
@@ -359,7 +399,6 @@ Player::seek (Time t, bool accurate)
 {
 	if (!_have_valid_pieces) {
 		setup_pieces ();
-		_have_valid_pieces = true;
 	}
 
 	if (_pieces.empty ()) {
@@ -371,24 +410,25 @@ Player::seek (Time t, bool accurate)
 		if (!vc) {
 			continue;
 		}
-		
-		Time s = t - vc->start ();
+
+		/* 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(), 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;
 
-		(*i)->video_position = (*i)->audio_position = vc->start() + s;
+		/* And seek the decoder */
+		dynamic_pointer_cast<VideoDecoder>((*i)->decoder)->seek (
+			vc->time_to_content_video_frames (s + vc->trim_start ()), accurate
+			);
 
-		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 * _film->video_frame_rate() / (frc.factor() * TIME_HZ);
-		dynamic_pointer_cast<VideoDecoder>((*i)->decoder)->seek (f, accurate);
+		(*i)->reset_repeat ();
 	}
 
 	_video_position = _audio_position = t;
-	
+
 	/* XXX: don't seek audio because we don't need to... */
 }
 
@@ -412,37 +452,38 @@ 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;
 		}
 		
-		shared_ptr<const StillImageContent> ic = dynamic_pointer_cast<const StillImageContent> (*i);
+		shared_ptr<const ImageContent> ic = dynamic_pointer_cast<const ImageContent> (*i);
 		if (ic) {
-			shared_ptr<StillImageDecoder> id;
+			bool reusing = false;
 			
-			/* See if we can re-use an old StillImageDecoder */
+			/* See if we can re-use an old ImageDecoder */
 			for (list<shared_ptr<Piece> >::const_iterator j = old_pieces.begin(); j != old_pieces.end(); ++j) {
-				shared_ptr<StillImageDecoder> imd = dynamic_pointer_cast<StillImageDecoder> ((*j)->decoder);
+				shared_ptr<ImageDecoder> imd = dynamic_pointer_cast<ImageDecoder> ((*j)->decoder);
 				if (imd && imd->content() == ic) {
-					id = imd;
+					piece = *j;
+					reusing = true;
 				}
 			}
 
-			if (!id) {
-				id.reset (new StillImageDecoder (_film, ic));
-				id->Video.connect (bind (&Player::process_video, this, piece, _1, _2, _3, _4));
+			if (!reusing) {
+				shared_ptr<ImageDecoder> id (new ImageDecoder (_film, ic));
+				id->Video.connect (bind (&Player::process_video, this, weak_ptr<Piece> (piece), _1, _2, _3, _4, 0));
+				piece->decoder = id;
 			}
-
-			piece->decoder = id;
 		}
 
 		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;
 		}
@@ -450,12 +491,7 @@ Player::setup_pieces ()
 		_pieces.push_back (piece);
 	}
 
-#ifdef DEBUG_PLAYER
-	cout << "=== Player setup:\n";
-	for (list<shared_ptr<Piece> >::iterator i = _pieces.begin(); i != _pieces.end(); ++i) {
-		cout << *(i->get()) << "\n";
-	}
-#endif	
+	_have_valid_pieces = true;
 }
 
 void
@@ -467,17 +503,25 @@ Player::content_changed (weak_ptr<Content> w, int property, bool frequent)
 	}
 
 	if (
-		property == ContentProperty::START || property == ContentProperty::LENGTH ||
-		property == VideoContentProperty::VIDEO_CROP || property == VideoContentProperty::VIDEO_RATIO
+		property == ContentProperty::POSITION || property == ContentProperty::LENGTH ||
+		property == ContentProperty::TRIM_START || property == ContentProperty::TRIM_END ||
+		property == VideoContentProperty::VIDEO_FRAME_TYPE 
 		) {
 		
 		_have_valid_pieces = false;
 		Changed (frequent);
 
 	} else if (property == SubtitleContentProperty::SUBTITLE_OFFSET || property == SubtitleContentProperty::SUBTITLE_SCALE) {
+
 		update_subtitle ();
 		Changed (frequent);
-	} else if (property == VideoContentProperty::VIDEO_FRAME_TYPE) {
+
+	} else if (property == VideoContentProperty::VIDEO_CROP || property == VideoContentProperty::VIDEO_RATIO) {
+		
+		Changed (frequent);
+
+	} else if (property == ContentProperty::PATH) {
+
 		Changed (frequent);
 	}
 }
@@ -493,8 +537,42 @@ void
 Player::set_video_container_size (libdcp::Size s)
 {
 	_video_container_size = s;
-	_black_frame.reset (new Image (PIX_FMT_RGB24, _video_container_size, true));
-	_black_frame->make_black ();
+
+	shared_ptr<Image> im (new Image (PIX_FMT_RGB24, _video_container_size, true));
+	im->make_black ();
+	
+	_black_frame.reset (
+		new PlayerImage (
+			im,
+			Crop(),
+			_video_container_size,
+			_video_container_size,
+			Scaler::from_id ("bicubic")
+			)
+		);
+}
+
+shared_ptr<Resampler>
+Player::resampler (shared_ptr<AudioContent> c, bool create)
+{
+	map<shared_ptr<AudioContent>, shared_ptr<Resampler> >::iterator i = _resamplers.find (c);
+	if (i != _resamplers.end ()) {
+		return i->second;
+	}
+
+	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;
+	return r;
 }
 
 void
@@ -503,15 +581,19 @@ Player::emit_black ()
 #ifdef DCPOMATIC_DEBUG
 	_last_video.reset ();
 #endif
-	
-	/* XXX: use same here */
-	Video (_black_frame, EYES_BOTH, false, _video_position);
+
+	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;
 }
 
 void
 Player::emit_silence (OutputAudioFrame most)
 {
+	if (most == 0) {
+		return;
+	}
+	
 	OutputAudioFrame N = min (most, _film->audio_frame_rate() / 2);
 	shared_ptr<AudioBuffers> silence (new AudioBuffers (_film->audio_channels(), N));
 	silence->make_silent ();
@@ -584,7 +666,71 @@ Player::update_subtitle ()
 	_out_subtitle.position.x = rint (_video_container_size.width * (in_rect.x + (in_rect.width * (1 - sc->subtitle_scale ()) / 2)));
 	_out_subtitle.position.y = rint (_video_container_size.height * (in_rect.y + (in_rect.height * (1 - sc->subtitle_scale ()) / 2)));
 	
-	_out_subtitle.image = _in_subtitle.image->scale (libdcp::Size (scaled_size.width, scaled_size.height), Scaler::from_id ("bicubic"), true);
-	_out_subtitle.from = _in_subtitle.from + piece->content->start ();
-	_out_subtitle.to = _in_subtitle.to + piece->content->start ();
+	_out_subtitle.image = _in_subtitle.image->scale (
+		scaled_size,
+		Scaler::from_id ("bicubic"),
+		_in_subtitle.image->pixel_format (),
+		true
+		);
+	_out_subtitle.from = _in_subtitle.from + piece->content->position ();
+	_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.
+ *  @return false if this could not be done.
+ */
+bool
+Player::repeat_last_video ()
+{
+	if (!_last_incoming_video.image || !_have_valid_pieces) {
+		return false;
+	}
+
+	process_video (
+		_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;
+}
+
+PlayerImage::PlayerImage (
+	shared_ptr<const Image> in,
+	Crop crop,
+	libdcp::Size inter_size,
+	libdcp::Size out_size,
+	Scaler const * scaler
+	)
+	: _in (in)
+	, _crop (crop)
+	, _inter_size (inter_size)
+	, _out_size (out_size)
+	, _scaler (scaler)
+{
+
+}
+
+void
+PlayerImage::set_subtitle (shared_ptr<const Image> image, Position<int> pos)
+{
+	_subtitle_image = image;
+	_subtitle_position = pos;
+}
+
+shared_ptr<Image>
+PlayerImage::image ()
+{
+	shared_ptr<Image> out = _in->crop_scale_window (_crop, _inter_size, _out_size, _scaler, PIX_FMT_RGB24, false);
+
+	Position<int> const container_offset ((_out_size.width - _inter_size.width) / 2, (_out_size.height - _inter_size.width) / 2);
+
+	if (_subtitle_image) {
+		out->alpha_blend (_subtitle_image, _subtitle_position);
+	}
+
+	return out;
 }