X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplayer.cc;h=29c96833e9c035e72963d4b3949b3b58404391fd;hb=08daf11e8dea4314b4e3af647fa31e6ee63f92ac;hp=02d3903654649f33ba7ce582221768a3f34447fe;hpb=f0d7baf0ce956fe5461caa91868c41d881b5f0dc;p=dcpomatic.git

diff --git a/src/lib/player.cc b/src/lib/player.cc
index 02d390365..29c96833e 100644
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -22,10 +22,8 @@
 #include "film.h"
 #include "ffmpeg_decoder.h"
 #include "ffmpeg_content.h"
-#include "still_image_decoder.h"
-#include "still_image_content.h"
-#include "moving_image_decoder.h"
-#include "moving_image_content.h"
+#include "image_decoder.h"
+#include "image_content.h"
 #include "sndfile_decoder.h"
 #include "sndfile_content.h"
 #include "subtitle_content.h"
@@ -33,7 +31,6 @@
 #include "job.h"
 #include "image.h"
 #include "ratio.h"
-#include "resampler.h"
 #include "log.h"
 #include "scaler.h"
 
@@ -47,68 +44,20 @@ using std::map;
 using boost::shared_ptr;
 using boost::weak_ptr;
 using boost::dynamic_pointer_cast;
+using boost::optional;
 
 class Piece
 {
 public:
-	Piece (shared_ptr<Content> c)
-		: 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)
+	Piece (shared_ptr<Content> c, shared_ptr<Decoder> d, FrameRateChange f)
 		: content (c)
 		, decoder (d)
-		, video_position (c->position ())
-		, audio_position (c->position ())
+		, frc (f)
 	{}
 
-	void set_repeat (IncomingVideo video, int num)
-	{
-		cout << "Set repeat " << num << "\n";
-		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)
-	{
-		cout << "repeating; " << repeat_done << "\n";
-		player->process_video (
-			repeat_video.weak_piece,
-			repeat_video.image,
-			repeat_video.eyes,
-			repeat_video.same,
-			repeat_video.frame,
-			(repeat_done + 1) * (TIME_HZ / player->_film->video_frame_rate ())
-			);
-
-		++repeat_done;
-	}
-	
 	shared_ptr<Content> content;
 	shared_ptr<Decoder> decoder;
-	Time video_position;
-	Time audio_position;
-
-	IncomingVideo repeat_video;
-	int repeat_to_do;
-	int repeat_done;
+	FrameRateChange frc;
 };
 
 Player::Player (shared_ptr<const Film> f, shared_ptr<const Playlist> p)
@@ -121,6 +70,8 @@ Player::Player (shared_ptr<const Film> f, shared_ptr<const Playlist> p)
 	, _audio_position (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)
+	, _approximate_size (false)
 {
 	_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));
@@ -145,112 +96,136 @@ Player::pass ()
 {
 	if (!_have_valid_pieces) {
 		setup_pieces ();
-		_have_valid_pieces = true;
 	}
 
-	Time earliest_t = TIME_MAX;
-	shared_ptr<Piece> earliest;
-	enum {
-		VIDEO,
-		AUDIO
-	} type = VIDEO;
+	/* Interrogate all our pieces to find the one with the earliest decoded data */
+
+	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 ()) {
-			cout << "Scan: done.\n";
-			continue;
+
+		shared_ptr<Decoded> dec = (*i)->decoder->peek ();
+
+		if (dec) {
+			dec->set_dcp_times ((*i)->frc.speed_up, (*i)->content->position());
 		}
 
-		if (_video && dynamic_pointer_cast<VideoDecoder> ((*i)->decoder)) {
-			if ((*i)->video_position < earliest_t) {
-				earliest_t = (*i)->video_position;
-				earliest = *i;
-				type = VIDEO;
-			}
+		if (dec && dec->dcp_time < earliest_time) {
+			earliest_piece = *i;
+			earliest_decoded = dec;
+			earliest_time = dec->dcp_time;
 		}
 
-		if (_audio && dynamic_pointer_cast<AudioDecoder> ((*i)->decoder)) {
-			if ((*i)->audio_position < earliest_t) {
-				earliest_t = (*i)->audio_position;
-				earliest = *i;
-				type = AUDIO;
-			}
+		if (dynamic_pointer_cast<DecodedAudio> (dec) && dec->dcp_time < earliest_audio) {
+			earliest_audio = dec->dcp_time;
 		}
 	}
-
-	if (!earliest) {
-		cout << "No earliest: out.\n";
+		
+	if (!earliest_piece) {
 		flush ();
 		return true;
 	}
 
-	cout << "Earliest: " << earliest_t << "\n";
+	if (earliest_audio != TIME_MAX) {
+		TimedAudioBuffers<DCPTime> tb = _audio_merger.pull (earliest_audio);
+		Audio (tb.audio, tb.time);
+		/* This assumes that the audio_frames_to_time conversion is exact
+		   so that there are no accumulated errors caused by rounding.
+		*/
+		_audio_position += _film->audio_frames_to_time (tb.audio->frames ());
+	}
 
-	switch (type) {
-	case VIDEO:
-		cout << "VIDEO.\n";
-		if (earliest_t > _video_position) {
-			emit_black ();
-		} else {
-			if (earliest->repeating ()) {
-				cout << "-repeating.\n";
-				earliest->repeat (this);
+	/* 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);
+
+	/* Will be set to false if we shouldn't consume the peeked DecodedThing */
+	bool consume = true;
+
+	/* This is the margin either side of _{video,audio}_position that we will accept
+	   as a starting point for a frame consecutive to the previous.
+	*/
+	DCPTime const margin = TIME_HZ / (2 * _film->video_frame_rate ());
+	
+	if (dv && _video) {
+
+		if (_just_did_inaccurate_seek) {
+
+			/* Just emit; no subtlety */
+			emit_video (earliest_piece, dv);
+			step_video_position (dv);
+			
+		} else if (dv->dcp_time - _video_position > margin) {
+
+			/* Too far ahead */
+
+			list<shared_ptr<Piece> >::iterator i = _pieces.begin();
+			while (i != _pieces.end() && ((*i)->content->position() >= _video_position || _video_position >= (*i)->content->end())) {
+				++i;
+			}
+
+			if (i == _pieces.end() || !_last_incoming_video.video || !_have_valid_pieces) {
+				/* We're outside all video content */
+				emit_black ();
 			} else {
-				cout << "-passing.\n";
-				earliest->decoder->pass ();
+				/* We're inside some video; repeat the frame */
+				_last_incoming_video.video->dcp_time = _video_position;
+				emit_video (_last_incoming_video.weak_piece, _last_incoming_video.video);
+				step_video_position (_last_incoming_video.video);
 			}
+
+			consume = false;
+
+		} else if (abs (dv->dcp_time - _video_position) < margin) {
+			/* We're ok */
+			emit_video (earliest_piece, dv);
+			step_video_position (dv);
+		} else {
+			/* Too far behind: skip */
 		}
-		break;
 
-	case AUDIO:
-		cout << "SOUND.\n";
-		if (earliest_t > _audio_position) {
-			emit_silence (_film->time_to_audio_frames (earliest_t - _audio_position));
+	} else if (da && _audio) {
+
+		if (_just_did_inaccurate_seek) {
+			/* Just emit; no subtlety */
+			emit_audio (earliest_piece, da);
+		} else if (da->dcp_time - _audio_position > margin) {
+			/* Too far ahead */
+			emit_silence (da->dcp_time - _audio_position);
+			consume = false;
+		} else if (abs (da->dcp_time - _audio_position) < margin) {
+			/* We're ok */
+			emit_audio (earliest_piece, da);
 		} else {
-			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 ());
-					}
-				}
-			}
+			/* Too far behind: skip */
 		}
-		break;
+		
+	} else if (ds && _video) {
+		_in_subtitle.piece = earliest_piece;
+		_in_subtitle.subtitle = ds;
+		update_subtitle ();
 	}
 
-	if (_audio) {
-		Time audio_done_up_to = TIME_MAX;
-		for (list<shared_ptr<Piece> >::iterator i = _pieces.begin(); i != _pieces.end(); ++i) {
-			if (dynamic_pointer_cast<AudioDecoder> ((*i)->decoder)) {
-				audio_done_up_to = min (audio_done_up_to, (*i)->audio_position);
-			}
-		}
+	if (consume) {
+		earliest_piece->decoder->consume ();
+	}			
+	
+	_just_did_inaccurate_seek = false;
 
-		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 ());
-	}
-		
 	return false;
 }
 
 void
-Player::process_video (weak_ptr<Piece> weak_piece, shared_ptr<const Image> image, Eyes eyes, bool same, VideoContent::Frame frame, Time extra)
+Player::emit_video (weak_ptr<Piece> weak_piece, shared_ptr<DecodedVideo> video)
 {
-	cout << "PLAYER RECEIVES A VIDEO FRAME, extra " << extra << "\n";
-	
 	/* 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.video = video;
 	
 	shared_ptr<Piece> piece = weak_piece.lock ();
 	if (!piece) {
@@ -260,60 +235,62 @@ 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->video_frame_rate());
-	if (frc.skip && (frame % 2) == 1) {
-		return;
-	}
-
-	Time const relative_time = (frame * frc.factor() * TIME_HZ / _film->video_frame_rate());
-	if (content->trimmed (relative_time)) {
-		return;
-	}
-
-	/* Convert to RGB first, as FFmpeg doesn't seem to like handling YUV images with odd widths */
-	shared_ptr<Image> work_image = image->scale (image->size (), _film->scaler(), PIX_FMT_RGB24, true);
-
-	work_image = work_image->crop (content->crop(), true);
+	FrameRateChange frc (content->video_frame_rate(), _film->video_frame_rate());
 
 	float const ratio = content->ratio() ? content->ratio()->ratio() : content->video_size_after_crop().ratio();
 	libdcp::Size image_size = fit_ratio_within (ratio, _video_container_size);
+	if (_approximate_size) {
+		image_size.width &= ~3;
+		image_size.height &= ~3;
+	}
+
+	shared_ptr<PlayerImage> pi (
+		new PlayerImage (
+			video->image,
+			content->crop(),
+			image_size,
+			_video_container_size,
+			_film->scaler()
+			)
+		);
 	
-	work_image = work_image->scale (image_size, _film->scaler(), PIX_FMT_RGB24, true);
+	if (
+		_film->with_subtitles () &&
+		_out_subtitle.image &&
+		video->dcp_time >= _out_subtitle.from && video->dcp_time <= _out_subtitle.to
+		) {
 
-	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);
-	}
+		Position<int> const container_offset (
+			(_video_container_size.width - image_size.width) / 2,
+			(_video_container_size.height - image_size.height) / 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 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;
+		pi->set_subtitle (_out_subtitle.image, _out_subtitle.position + container_offset);
 	}
-
+					    
 #ifdef DCPOMATIC_DEBUG
 	_last_video = piece->content;
 #endif
 
-	Video (work_image, eyes, content->colour_conversion(), same, time);
-
-	time += TIME_HZ / _film->video_frame_rate();
+	Video (pi, video->eyes, content->colour_conversion(), video->same, video->dcp_time);
+	
 	_last_emit_was_black = false;
-	_video_position = piece->video_position = time;
-
-	cout << "frc.repeat=" << frc.repeat << "; vp now " << _video_position << "\n";
+}
 
-	if (frc.repeat > 1 && !piece->repeating ()) {
-		piece->set_repeat (_last_incoming_video, frc.repeat - 1);
+void
+Player::step_video_position (shared_ptr<DecodedVideo> video)
+{
+	/* This is a bit of a hack; don't update _video_position if EYES_RIGHT is on its way */
+	if (video->eyes != EYES_LEFT) {
+		/* This assumes that the video_frames_to_time conversion is exact
+		   so that there are no accumulated errors caused by rounding.
+		*/
+		_video_position += _film->video_frames_to_time (1);
 	}
 }
 
 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) {
@@ -325,61 +302,49 @@ Player::process_audio (weak_ptr<Piece> weak_piece, shared_ptr<const AudioBuffers
 
 	/* Gain */
 	if (content->audio_gain() != 0) {
-		shared_ptr<AudioBuffers> gain (new AudioBuffers (audio));
+		shared_ptr<AudioBuffers> gain (new AudioBuffers (audio->data));
 		gain->apply_gain (content->audio_gain ());
-		audio = gain;
+		audio->data = 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)) {
+	if (content->trimmed (audio->dcp_time - content->position ())) {
 		return;
 	}
 
-	Time time = content->position() + (content->audio_delay() * TIME_HZ / 1000) + relative_time;
-	
 	/* Remap channels */
-	shared_ptr<AudioBuffers> dcp_mapped (new AudioBuffers (_film->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) {
-		if (i->first < audio->channels() && i->second < dcp_mapped->channels()) {
-			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;
+	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->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;
 	}
 
-	_audio_merger.push (audio, time);
-	piece->audio_position += _film->audio_frames_to_time (audio->frames ());
+	_audio_merger.push (audio->data, audio->dcp_time);
 }
 
 void
 Player::flush ()
 {
-	TimedAudioBuffers<Time> tb = _audio_merger.flush ();
+	TimedAudioBuffers<DCPTime> tb = _audio_merger.flush ();
 	if (tb.audio) {
 		Audio (tb.audio, tb.time);
 		_audio_position += _film->audio_frames_to_time (tb.audio->frames ());
@@ -390,7 +355,7 @@ Player::flush ()
 	}
 
 	while (_audio_position < _video_position) {
-		emit_silence (_film->time_to_audio_frames (_video_position - _audio_position));
+		emit_silence (_video_position - _audio_position);
 	}
 	
 }
@@ -400,11 +365,10 @@ Player::flush ()
  *  @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 ()) {
@@ -412,102 +376,113 @@ 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->position ();
-		s = max (static_cast<Time> (0), s);
-		s = min (vc->length_after_trim(), 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);
 
-		(*i)->video_position = (*i)->audio_position = vc->position() + s;
+		/* Convert this to the content time */
+		ContentTime ct = (s * (*i)->frc.speed_up) + (*i)->content->trim_start ();
 
-		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);
-
-		(*i)->reset_repeat ();
+		/* And seek the decoder */
+		(*i)->decoder->seek (ct, accurate);
 	}
 
-	_video_position = _audio_position = t;
+	_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);
 
-	/* XXX: don't seek audio because we don't need to... */
+	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 ();
 
 	ContentList content = _playlist->content ();
-	sort (content.begin(), content.end(), ContentSorter ());
 
 	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, _4, 0));
-			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 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;
-			
-			/* 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;
+					decoder = imd;
 				}
 			}
 
-			if (!id) {
-				id.reset (new StillImageDecoder (_film, ic));
-				id->Video.connect (bind (&Player::process_video, this, piece, _1, _2, _3, _4, 0));
+			if (!decoder) {
+				decoder.reset (new ImageDecoder (_film, ic));
 			}
 
-			piece->decoder = id;
+			frc = FrameRateChange (ic->video_frame_rate(), _film->video_frame_rate());
 		}
 
-		shared_ptr<const MovingImageContent> mc = dynamic_pointer_cast<const MovingImageContent> (*i);
-		if (mc) {
-			shared_ptr<MovingImageDecoder> md;
+		shared_ptr<const SndfileContent> sc = dynamic_pointer_cast<const SndfileContent> (*i);
+		if (sc) {
+			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;
+				}
 
-			if (!md) {
-				md.reset (new MovingImageDecoder (_film, mc));
-				md->Video.connect (bind (&Player::process_video, this, piece, _1, _2, _3, _4, 0));
+				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 = md;
+			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 ());
+			}
 		}
 
-		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->seek ((*i)->trim_start (), true);
+		
+		_pieces.push_back (shared_ptr<Piece> (new Piece (*i, decoder, frc.get ())));
+	}
 
-			piece->decoder = sd;
-		}
+	_have_valid_pieces = true;
 
-		_pieces.push_back (piece);
-	}
+	/* The Piece for the _last_incoming_video will no longer be valid */
+	_last_incoming_video.video.reset ();
+
+	_video_position = _audio_position = 0;
 }
 
 void
@@ -520,7 +495,8 @@ Player::content_changed (weak_ptr<Content> w, int property, bool frequent)
 
 	if (
 		property == ContentProperty::POSITION || property == ContentProperty::LENGTH ||
-		property == ContentProperty::TRIM_START || property == ContentProperty::TRIM_END
+		property == ContentProperty::TRIM_START || property == ContentProperty::TRIM_END ||
+		property == VideoContentProperty::VIDEO_FRAME_TYPE 
 		) {
 		
 		_have_valid_pieces = false;
@@ -531,10 +507,7 @@ Player::content_changed (weak_ptr<Content> w, int property, bool frequent)
 		update_subtitle ();
 		Changed (frequent);
 
-	} else if (
-		property == VideoContentProperty::VIDEO_FRAME_TYPE || property == VideoContentProperty::VIDEO_CROP ||
-		property == VideoContentProperty::VIDEO_RATIO
-		) {
+	} else if (property == VideoContentProperty::VIDEO_CROP || property == VideoContentProperty::VIDEO_RATIO) {
 		
 		Changed (frequent);
 
@@ -555,25 +528,19 @@ 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<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> ();
-	}
+	shared_ptr<Image> im (new Image (PIX_FMT_RGB24, _video_container_size, true));
+	im->make_black ();
 	
-	shared_ptr<Resampler> r (new Resampler (c->content_audio_frame_rate(), c->output_audio_frame_rate(), c->audio_channels()));
-	_resamplers[c] = r;
-	return r;
+	_black_frame.reset (
+		new PlayerImage (
+			im,
+			Crop(),
+			_video_container_size,
+			_video_container_size,
+			Scaler::from_id ("bicubic")
+			)
+		);
 }
 
 void
@@ -582,24 +549,25 @@ 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;
 }
 
 void
-Player::emit_silence (OutputAudioFrame most)
+Player::emit_silence (DCPTime most)
 {
 	if (most == 0) {
 		return;
 	}
 	
-	OutputAudioFrame N = min (most, _film->audio_frame_rate() / 2);
-	shared_ptr<AudioBuffers> silence (new AudioBuffers (_film->audio_channels(), N));
+	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
@@ -615,18 +583,6 @@ Player::film_changed (Film::Property p)
 	}
 }
 
-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 ()
 {
@@ -635,7 +591,7 @@ Player::update_subtitle ()
 		return;
 	}
 
-	if (!_in_subtitle.image) {
+	if (!_in_subtitle.subtitle->image) {
 		_out_subtitle.image.reset ();
 		return;
 	}
@@ -643,7 +599,7 @@ Player::update_subtitle ()
 	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 ();
@@ -666,15 +622,16 @@ 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 (
+
+	_out_subtitle.image = _in_subtitle.subtitle->image->scale (
 		scaled_size,
 		Scaler::from_id ("bicubic"),
-		_in_subtitle.image->pixel_format (),
+		PIX_FMT_RGBA,
 		true
 		);
-	_out_subtitle.from = _in_subtitle.from + piece->content->position ();
-	_out_subtitle.to = _in_subtitle.to + piece->content->position ();
+
+	_out_subtitle.from = _in_subtitle.subtitle->dcp_time;
+	_out_subtitle.to = _in_subtitle.subtitle->dcp_time_to;
 }
 
 /** Re-emit the last frame that was emitted, using current settings for crop, ratio, scaler and subtitles.
@@ -683,18 +640,59 @@ Player::update_subtitle ()
 bool
 Player::repeat_last_video ()
 {
-	if (!_last_incoming_video.image) {
+	if (!_last_incoming_video.video || !_have_valid_pieces) {
 		return false;
 	}
 
-	process_video (
+	emit_video (
 		_last_incoming_video.weak_piece,
-		_last_incoming_video.image,
-		_last_incoming_video.eyes,
-		_last_incoming_video.same,
-		_last_incoming_video.frame,
-		0
+		_last_incoming_video.video
 		);
 
 	return true;
 }
+
+void
+Player::set_approximate_size ()
+{
+	_approximate_size = 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 (AVPixelFormat format, bool aligned)
+{
+	shared_ptr<Image> out = _in->crop_scale_window (_crop, _inter_size, _out_size, _scaler, format, aligned);
+	
+	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;
+}
+