X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplayer.cc;h=d60dfb6a9b339508fd2bf1fb5fe1f9586674f036;hb=060a980527bc0b39e12494fec3c0baaab4c9d086;hp=7ab72d9a15379b7c71fade6ba432cdb686b77546;hpb=8bdc282a88cbd0446b06866b9436c43200886314;p=dcpomatic.git

diff --git a/src/lib/player.cc b/src/lib/player.cc
index 7ab72d9a1..d60dfb6a9 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 "imagemagick_decoder.h"
-#include "imagemagick_content.h"
+#include "image_decoder.h"
+#include "image_content.h"
 #include "sndfile_decoder.h"
 #include "sndfile_content.h"
 #include "subtitle_content.h"
@@ -32,6 +32,7 @@
 #include "image.h"
 #include "ratio.h"
 #include "resampler.h"
+#include "log.h"
 #include "scaler.h"
 
 using std::list;
@@ -44,48 +45,22 @@ using std::map;
 using boost::shared_ptr;
 using boost::weak_ptr;
 using boost::dynamic_pointer_cast;
-
-//#define DEBUG_PLAYER 1
+using boost::optional;
 
 class Piece
 {
 public:
-	Piece (shared_ptr<Content> c)
-		: content (c)
-		, video_position (c->start ())
-		, audio_position (c->start ())
-	{}
-	
-	Piece (shared_ptr<Content> c, shared_ptr<Decoder> d)
+	Piece (shared_ptr<Content> c, shared_ptr<Decoder> d, FrameRateChange f)
 		: content (c)
 		, decoder (d)
-		, video_position (c->start ())
-		, audio_position (c->start ())
+		, frc (f)
 	{}
-	
+
 	shared_ptr<Content> content;
 	shared_ptr<Decoder> decoder;
-	Time video_position;
-	Time audio_position;
+	FrameRateChange frc;
 };
 
-#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<ImageMagickContent> (p.content)) {
-		s << "\timagemagick";
-	} else if (dynamic_pointer_cast<SndfileContent> (p.content)) {
-		s << "\tsndfile    ";
-	}
-	
-	s << " at " << p.content->start() << " until " << p.content->end();
-	
-	return s;
-}
-#endif	
-
 Player::Player (shared_ptr<const Film> f, shared_ptr<const Playlist> p)
 	: _film (f)
 	, _playlist (p)
@@ -94,12 +69,14 @@ 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->dcp_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)
+	, _just_did_inaccurate_seek (false)
 {
-	_playlist->Changed.connect (bind (&Player::playlist_changed, this));
-	_playlist->ContentChanged.connect (bind (&Player::content_changed, this, _1, _2));
-	_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,91 +96,100 @@ Player::pass ()
 {
 	if (!_have_valid_pieces) {
 		setup_pieces ();
-		_have_valid_pieces = true;
 	}
 
-#ifdef DEBUG_PLAYER
-	cout << "= PASS\n";
-#endif	
+	/* Interrogate all our pieces to find the one with the earliest decoded data */
 
-        Time earliest_t = TIME_MAX;
-        shared_ptr<Piece> earliest;
-	enum {
-		VIDEO,
-		AUDIO
-	} type = VIDEO;
+	shared_ptr<Piece> earliest_piece;
+	shared_ptr<Decoded> earliest_decoded;
+	DCPTime earliest_time = TIME_MAX;
+	DCPTime earliest_audio = TIME_MAX;
 
 	for (list<shared_ptr<Piece> >::iterator i = _pieces.begin(); i != _pieces.end(); ++i) {
-		if ((*i)->decoder->done ()) {
-			continue;
+
+		shared_ptr<Decoded> dec = (*i)->decoder->peek ();
+
+		if (dec) {
+			dec->set_dcp_times ((*i)->frc.speed_up, (*i)->content->position());
 		}
 
-		if (dynamic_pointer_cast<VideoDecoder> ((*i)->decoder)) {
-			if ((*i)->video_position < earliest_t) {
-				earliest_t = (*i)->video_position;
-				earliest = *i;
-				type = VIDEO;
+		/* XXX: don't know what to do with this */
+#if 0		
+		if (ad->done()) {
+			shared_ptr<AudioContent> ac = dynamic_pointer_cast<AudioContent> ((*i)->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 ());
+				}
 			}
 		}
+#endif		
 
-		if (dynamic_pointer_cast<AudioDecoder> ((*i)->decoder)) {
-			if ((*i)->audio_position < earliest_t) {
-				earliest_t = (*i)->audio_position;
-				earliest = *i;
-				type = AUDIO;
-			}
+		if (dec && dec->dcp_time < earliest_time) {
+			earliest_piece = *i;
+			earliest_decoded = dec;
+			earliest_time = dec->dcp_time;
 		}
-	}
 
-	if (!earliest) {
-#ifdef DEBUG_PLAYER
-		cout << "no earliest piece.\n";
-#endif		
+		if (dynamic_pointer_cast<DecodedAudio> (dec) && dec->dcp_time < earliest_audio) {
+			earliest_audio = dec->dcp_time;
+		}
+	}
 		
+	if (!earliest_piece) {
 		flush ();
 		return true;
 	}
 
-	switch (type) {
-	case VIDEO:
-		if (earliest_t > _video_position) {
-#ifdef DEBUG_PLAYER
-			cout << "no video here; emitting black frame.\n";
-#endif
+	if (earliest_audio != TIME_MAX) {
+		TimedAudioBuffers<DCPTime> tb = _audio_merger.pull (earliest_audio);
+		Audio (tb.audio, tb.time);
+		_audio_position += _film->audio_frames_to_time (tb.audio->frames ());
+	}
+
+	/* Emit the earliest thing */
+
+	shared_ptr<DecodedVideo> dv = dynamic_pointer_cast<DecodedVideo> (earliest_decoded);
+	shared_ptr<DecodedAudio> da = dynamic_pointer_cast<DecodedAudio> (earliest_decoded);
+	shared_ptr<DecodedSubtitle> ds = dynamic_pointer_cast<DecodedSubtitle> (earliest_decoded);
+
+	if (dv) {
+		if (!_just_did_inaccurate_seek && earliest_time > _video_position) {
+			/* XXX: if we're inside some content, repeat the last frame... otherwise emit black */
 			emit_black ();
 		} else {
-#ifdef DEBUG_PLAYER
-			cout << "Pass " << *earliest << "\n";
-#endif			
-			earliest->decoder->pass ();
+			emit_video (earliest_piece, dv);
+			earliest_piece->decoder->get ();
 		}
-		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 if (da) {
+		if (!_just_did_inaccurate_seek && earliest_time > _audio_position) {
+			emit_silence (earliest_time - _audio_position);
 		} else {
-#ifdef DEBUG_PLAYER
-			cout << "Pass " << *earliest << "\n";
-#endif			
-			earliest->decoder->pass ();
+			emit_audio (earliest_piece, da);
+			earliest_piece->decoder->get ();
 		}
-		break;
+	} else if (ds) {
+		_in_subtitle.piece = earliest_piece;
+		_in_subtitle.subtitle = ds;
+		update_subtitle ();
+		earliest_piece->decoder->get ();
 	}
 
-#ifdef DEBUG_PLAYER
-	cout << "\tpost pass " << _video_position << " " << _audio_position << "\n";
-#endif	
+	_just_did_inaccurate_seek = false;
 
-        return false;
+	return false;
 }
 
 void
-Player::process_video (weak_ptr<Piece> weak_piece, shared_ptr<const Image> image, bool same, VideoContent::Frame frame)
+Player::emit_video (weak_ptr<Piece> weak_piece, shared_ptr<DecodedVideo> video)
 {
+	/* 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.video = video;
+	
 	shared_ptr<Piece> piece = weak_piece.lock ();
 	if (!piece) {
 		return;
@@ -212,45 +198,57 @@ Player::process_video (weak_ptr<Piece> weak_piece, shared_ptr<const Image> image
 	shared_ptr<VideoContent> content = dynamic_pointer_cast<VideoContent> (piece->content);
 	assert (content);
 
-	FrameRateConversion frc (content->video_frame_rate(), _film->dcp_video_frame_rate());
+	FrameRateChange frc (content->video_frame_rate(), _film->video_frame_rate());
+#if 0
+	XXX
 	if (frc.skip && (frame % 2) == 1) {
 		return;
 	}
+#endif	
 
-	shared_ptr<Image> work_image = image->crop (content->crop(), true);
+	if (content->trimmed (video->dcp_time - content->position ())) {
+		return;
+	}
 
-	libdcp::Size const image_size = content->ratio()->size (_video_container_size);
+	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 (
+			video->image,
+			content->crop(),
+			image_size,
+			_video_container_size,
+			_film->scaler()
+			)
+		);
 	
-	work_image = work_image->scale_and_convert_to_rgb (image_size, _film->scaler(), true);
+	if (
+		_film->with_subtitles () &&
+		_out_subtitle.subtitle->image &&
+		video->dcp_time >= _out_subtitle.subtitle->dcp_time && video->dcp_time <= _out_subtitle.subtitle->dcp_time_to
+		) {
 
-	Time time = content->start() + (frame * frc.factor() * TIME_HZ / _film->dcp_video_frame_rate());
-	
-	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);
-	}
+		Position<int> const container_offset (
+			(_video_container_size.width - image_size.width) / 2,
+			(_video_container_size.height - image_size.width) / 2
+			);
 
-	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 SimpleImage (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;
+		pi->set_subtitle (_out_subtitle.subtitle->image, _out_subtitle.position + container_offset);
 	}
+					    
+#ifdef DCPOMATIC_DEBUG
+	_last_video = piece->content;
+#endif
 
-        Video (work_image, same, time);
-	time += TIME_HZ / _film->dcp_video_frame_rate();
-
-	if (frc.repeat) {
-		Video (work_image, true, time);
-		time += TIME_HZ / _film->dcp_video_frame_rate();
-	}
+	Video (pi, video->eyes, content->colour_conversion(), video->same, video->dcp_time);
 
-	_video_position = piece->video_position = time;
+	_last_emit_was_black = false;
+	_video_position = rint (video->dcp_time + TIME_HZ / _film->video_frame_rate());
 }
 
 void
-Player::process_audio (weak_ptr<Piece> weak_piece, shared_ptr<const AudioBuffers> audio, AudioContent::Frame frame)
+Player::emit_audio (weak_ptr<Piece> weak_piece, shared_ptr<DecodedAudio> audio)
 {
 	shared_ptr<Piece> piece = weak_piece.lock ();
 	if (!piece) {
@@ -260,84 +258,59 @@ 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->data));
+		gain->apply_gain (content->audio_gain ());
+		audio->data = gain;
+	}
+
 	/* Resample */
 	if (content->content_audio_frame_rate() != content->output_audio_frame_rate()) {
-		shared_ptr<Resampler> r = resampler (content);
-		audio = r->run (audio);
+		audio->data = resampler(content, true)->run (audio->data);
+	}
+	
+	if (content->trimmed (audio->dcp_time - content->position ())) {
+		return;
 	}
 
 	/* Remap channels */
-	shared_ptr<AudioBuffers> dcp_mapped (new AudioBuffers (_film->dcp_audio_channels(), audio->frames()));
+	shared_ptr<AudioBuffers> dcp_mapped (new AudioBuffers (_film->audio_channels(), audio->data->frames()));
 	dcp_mapped->make_silent ();
 	list<pair<int, libdcp::Channel> > map = content->audio_mapping().content_to_dcp ();
 	for (list<pair<int, libdcp::Channel> >::iterator i = map.begin(); i != map.end(); ++i) {
-		dcp_mapped->accumulate_channel (audio.get(), i->first, i->second);
+		if (i->first < audio->data->channels() && i->second < dcp_mapped->channels()) {
+			dcp_mapped->accumulate_channel (audio->data.get(), i->first, i->second);
+		}
 	}
 
-	audio = dcp_mapped;
-
-	Time time = content->start() + (frame * TIME_HZ / _film->dcp_audio_frame_rate()) + (content->audio_delay() * TIME_HZ / 1000);
+	audio->data = dcp_mapped;
 
-	/* We must cut off anything that comes before the start of all time */
-	if (time < 0) {
-		int const frames = - time * _film->dcp_audio_frame_rate() / TIME_HZ;
-		if (frames >= audio->frames ()) {
+	/* Delay */
+	audio->dcp_time += content->audio_delay() * TIME_HZ / 1000;
+	if (audio->dcp_time < 0) {
+		int const frames = - audio->dcp_time * _film->audio_frame_rate() / TIME_HZ;
+		if (frames >= audio->data->frames ()) {
 			return;
 		}
 
-		shared_ptr<AudioBuffers> trimmed (new AudioBuffers (audio->channels(), audio->frames() - frames));
-		trimmed->copy_from (audio.get(), audio->frames() - frames, frames, 0);
+		shared_ptr<AudioBuffers> trimmed (new AudioBuffers (audio->data->channels(), audio->data->frames() - frames));
+		trimmed->copy_from (audio->data.get(), audio->data->frames() - frames, frames, 0);
 
-		audio = trimmed;
-		time = 0;
+		audio->data = trimmed;
+		audio->dcp_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 */
-                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);
-		}
-			
-		if (N > _audio_buffers.frames()) {
-			cout << "N=" << N << ", ab=" << _audio_buffers.frames() << "\n";
-		}
-		assert (N <= _audio_buffers.frames());
-                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 = time + _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->data, audio->dcp_time);
 }
 
 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<DCPTime> tb = _audio_merger.flush ();
+	if (tb.audio) {
+		Audio (tb.audio, tb.time);
+		_audio_position += _film->audio_frames_to_time (tb.audio->frames ());
 	}
 
 	while (_video_position < _audio_position) {
@@ -345,18 +318,20 @@ Player::flush ()
 	}
 
 	while (_audio_position < _video_position) {
-		emit_silence (_film->time_to_audio_frames (_video_position - _audio_position));
+		emit_silence (_video_position - _audio_position);
 	}
 	
 }
 
-/** @return true on error */
+/** Seek so that the next pass() will yield (approximately) the requested frame.
+ *  Pass accurate = true to try harder to get close to the request.
+ *  @return true on error
+ */
 void
-Player::seek (Time t, bool accurate)
+Player::seek (DCPTime t, bool accurate)
 {
 	if (!_have_valid_pieces) {
 		setup_pieces ();
-		_have_valid_pieces = true;
 	}
 
 	if (_pieces.empty ()) {
@@ -364,91 +339,112 @@ Player::seek (Time t, bool accurate)
 	}
 
 	for (list<shared_ptr<Piece> >::iterator i = _pieces.begin(); i != _pieces.end(); ++i) {
-		shared_ptr<VideoContent> vc = dynamic_pointer_cast<VideoContent> ((*i)->content);
-		if (!vc) {
-			continue;
-		}
-		
-		Time s = t - vc->start ();
-		s = max (static_cast<Time> (0), s);
-		s = min (vc->length(), s);
+		/* s is the offset of t from the start position of this content */
+		DCPTime s = t - (*i)->content->position ();
+		s = max (static_cast<DCPTime> (0), s);
+		s = min ((*i)->content->length_after_trim(), s);
 
-		FrameRateConversion frc (vc->video_frame_rate(), _film->dcp_video_frame_rate());
-		VideoContent::Frame f = s * vc->video_frame_rate() / (frc.factor() * TIME_HZ);
-		dynamic_pointer_cast<VideoDecoder>((*i)->decoder)->seek (f, accurate);
+		/* Convert this to the content time */
+		ContentTime ct = (s * (*i)->frc.speed_up) + (*i)->content->trim_start ();
+
+		/* And seek the decoder */
+		(*i)->decoder->seek (ct, accurate);
 	}
 
-	/* XXX: don't seek audio because we don't need to... */
+	_video_position = time_round_up (t, TIME_HZ / _film->video_frame_rate());
+	_audio_position = time_round_up (t, TIME_HZ / _film->audio_frame_rate());
+
+	_audio_merger.clear (_audio_position);
+
+	if (!accurate) {
+		/* We just did an inaccurate seek, so it's likely that the next thing seen
+		   out of pass() will be a fair distance from _{video,audio}_position.  Setting
+		   this flag stops pass() from trying to fix that: we assume that if it
+		   was an inaccurate seek then the caller does not care too much about
+		   inserting black/silence to keep the time tidy.
+		*/
+		_just_did_inaccurate_seek = true;
+	}
 }
 
 void
 Player::setup_pieces ()
 {
 	list<shared_ptr<Piece> > old_pieces = _pieces;
-
 	_pieces.clear ();
 
-	Playlist::ContentList content = _playlist->content ();
-	sort (content.begin(), content.end(), ContentSorter ());
+	ContentList content = _playlist->content ();
 
-	for (Playlist::ContentList::iterator i = content.begin(); i != content.end(); ++i) {
+	for (ContentList::iterator i = content.begin(); i != content.end(); ++i) {
 
-		shared_ptr<Piece> piece (new Piece (*i));
-
-                /* XXX: into content? */
+		shared_ptr<Decoder> decoder;
+		optional<FrameRateChange> frc;
 
 		shared_ptr<const FFmpegContent> fc = dynamic_pointer_cast<const FFmpegContent> (*i);
 		if (fc) {
-			shared_ptr<FFmpegDecoder> fd (new FFmpegDecoder (_film, fc, _video, _audio));
-			
-			fd->Video.connect (bind (&Player::process_video, this, piece, _1, _2, _3));
-			fd->Audio.connect (bind (&Player::process_audio, this, piece, _1, _2));
-			fd->Subtitle.connect (bind (&Player::process_subtitle, this, piece, _1, _2, _3, _4));
-
-			piece->decoder = fd;
+			decoder.reset (new FFmpegDecoder (_film, fc, _video, _audio));
+			frc = FrameRateChange (fc->video_frame_rate(), _film->video_frame_rate());
 		}
 		
-		shared_ptr<const ImageMagickContent> ic = dynamic_pointer_cast<const ImageMagickContent> (*i);
+		shared_ptr<const ImageContent> ic = dynamic_pointer_cast<const ImageContent> (*i);
 		if (ic) {
-			shared_ptr<ImageMagickDecoder> id;
-			
-			/* See if we can re-use an old ImageMagickDecoder */
+			/* 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<ImageMagickDecoder> imd = dynamic_pointer_cast<ImageMagickDecoder> ((*j)->decoder);
+				shared_ptr<ImageDecoder> imd = dynamic_pointer_cast<ImageDecoder> ((*j)->decoder);
 				if (imd && imd->content() == ic) {
-					id = imd;
+					decoder = imd;
 				}
 			}
 
-			if (!id) {
-				id.reset (new ImageMagickDecoder (_film, ic));
-				id->Video.connect (bind (&Player::process_video, this, piece, _1, _2, _3));
+			if (!decoder) {
+				decoder.reset (new ImageDecoder (_film, ic));
 			}
 
-			piece->decoder = id;
+			frc = FrameRateChange (ic->video_frame_rate(), _film->video_frame_rate());
 		}
 
 		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));
+			decoder.reset (new SndfileDecoder (_film, sc));
+
+			/* Working out the frc for this content is a bit tricky: what if it overlaps
+			   two pieces of video content with different frame rates?  For now, use
+			   the one with the best overlap.
+			*/
+
+			DCPTime best_overlap_t = 0;
+			shared_ptr<VideoContent> best_overlap;
+			for (ContentList::iterator j = content.begin(); j != content.end(); ++j) {
+				shared_ptr<VideoContent> vc = dynamic_pointer_cast<VideoContent> (*j);
+				if (!vc) {
+					continue;
+				}
+
+				DCPTime const overlap = max (vc->position(), sc->position()) - min (vc->end(), sc->end());
+				if (overlap > best_overlap_t) {
+					best_overlap = vc;
+					best_overlap_t = overlap;
+				}
+			}
 
-			piece->decoder = sd;
+			if (best_overlap) {
+				frc = FrameRateChange (best_overlap->video_frame_rate(), _film->video_frame_rate ());
+			} else {
+				/* No video overlap; e.g. if the DCP is just audio */
+				frc = FrameRateChange (_film->video_frame_rate(), _film->video_frame_rate ());
+			}
 		}
 
-		_pieces.push_back (piece);
+		decoder->seek ((*i)->trim_start (), true);
+		
+		_pieces.push_back (shared_ptr<Piece> (new Piece (*i, decoder, frc.get ())));
 	}
 
-#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
-Player::content_changed (weak_ptr<Content> w, int p)
+Player::content_changed (weak_ptr<Content> w, int property, bool frequent)
 {
 	shared_ptr<Content> c = w.lock ();
 	if (!c) {
@@ -456,16 +452,28 @@ Player::content_changed (weak_ptr<Content> w, int p)
 	}
 
 	if (
-		p == ContentProperty::START || p == ContentProperty::LENGTH ||
-		p == VideoContentProperty::VIDEO_CROP || p == VideoContentProperty::VIDEO_RATIO
+		property == ContentProperty::POSITION || property == ContentProperty::LENGTH ||
+		property == ContentProperty::TRIM_START || property == ContentProperty::TRIM_END
 		) {
 		
 		_have_valid_pieces = false;
-		Changed ();
+		Changed (frequent);
+
+	} else if (property == SubtitleContentProperty::SUBTITLE_OFFSET || property == SubtitleContentProperty::SUBTITLE_SCALE) {
 
-	} else if (p == SubtitleContentProperty::SUBTITLE_OFFSET || p == SubtitleContentProperty::SUBTITLE_SCALE) {
 		update_subtitle ();
-		Changed ();
+		Changed (frequent);
+
+	} else if (
+		property == VideoContentProperty::VIDEO_FRAME_TYPE || property == VideoContentProperty::VIDEO_CROP ||
+		property == VideoContentProperty::VIDEO_RATIO
+		) {
+		
+		Changed (frequent);
+
+	} else if (property == ContentProperty::PATH) {
+
+		Changed (frequent);
 	}
 }
 
@@ -473,24 +481,45 @@ void
 Player::playlist_changed ()
 {
 	_have_valid_pieces = false;
-	Changed ();
+	Changed (false);
 }
 
 void
 Player::set_video_container_size (libdcp::Size s)
 {
 	_video_container_size = s;
-	_black_frame.reset (new SimpleImage (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)
+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;
@@ -500,19 +529,27 @@ Player::resampler (shared_ptr<AudioContent> c)
 void
 Player::emit_black ()
 {
-	/* XXX: use same here */
-	Video (_black_frame, false, _video_position);
+#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;
 }
 
 void
-Player::emit_silence (OutputAudioFrame most)
+Player::emit_silence (DCPTime most)
 {
-	OutputAudioFrame N = min (most, _film->dcp_audio_frame_rate() / 2);
-	shared_ptr<AudioBuffers> silence (new AudioBuffers (_film->dcp_audio_channels(), N));
+	if (most == 0) {
+		return;
+	}
+	
+	DCPTime t = min (most, TIME_HZ / 2);
+	shared_ptr<AudioBuffers> silence (new AudioBuffers (_film->audio_channels(), t * _film->audio_frame_rate() / TIME_HZ));
 	silence->make_silent ();
 	Audio (silence, _audio_position);
-	_audio_position += _film->audio_frames_to_time (N);
+	_audio_position += t;
 }
 
 void
@@ -524,22 +561,10 @@ Player::film_changed (Film::Property p)
 	*/
 
 	if (p == Film::SCALER || p == Film::WITH_SUBTITLES || p == Film::CONTAINER) {
-		Changed ();
+		Changed (false);
 	}
 }
 
-void
-Player::process_subtitle (weak_ptr<Piece> weak_piece, shared_ptr<Image> image, dcpomatic::Rect<double> rect, Time from, Time to)
-{
-	_in_subtitle.piece = weak_piece;
-	_in_subtitle.image = image;
-	_in_subtitle.rect = rect;
-	_in_subtitle.from = from;
-	_in_subtitle.to = to;
-
-	update_subtitle ();
-}
-
 void
 Player::update_subtitle ()
 {
@@ -548,15 +573,15 @@ Player::update_subtitle ()
 		return;
 	}
 
-	if (!_in_subtitle.image) {
-		_out_subtitle.image.reset ();
+	if (!_in_subtitle.subtitle->image) {
+		_out_subtitle.subtitle->image.reset ();
 		return;
 	}
 
 	shared_ptr<SubtitleContent> sc = dynamic_pointer_cast<SubtitleContent> (piece->content);
 	assert (sc);
 
-	dcpomatic::Rect<double> in_rect = _in_subtitle.rect;
+	dcpomatic::Rect<double> in_rect = _in_subtitle.subtitle->rect;
 	libdcp::Size scaled_size;
 
 	in_rect.y += sc->subtitle_offset ();
@@ -580,7 +605,68 @@ 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.subtitle->image = _in_subtitle.subtitle->image->scale (
+		scaled_size,
+		Scaler::from_id ("bicubic"),
+		_in_subtitle.subtitle->image->pixel_format (),
+		true
+		);
+	
+	_out_subtitle.subtitle->dcp_time = _in_subtitle.subtitle->dcp_time;
+	_out_subtitle.subtitle->dcp_time = _in_subtitle.subtitle->dcp_time;
+}
+
+/** 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.video || !_have_valid_pieces) {
+		return false;
+	}
+
+	emit_video (
+		_last_incoming_video.weak_piece,
+		_last_incoming_video.video
+		);
+
+	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;
 }