X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplayer.cc;h=50f401fb75fac7d3164ef3c80b10a654554575ea;hb=e16c8ed02a0cb1f733a990d75a9de1bf50cf89bd;hp=7a149d734ca61fff7f173c548f9548586a8893b5;hpb=384e364f02b9a598044aff6073ea0f61c87c62b0;p=dcpomatic.git

diff --git a/src/lib/player.cc b/src/lib/player.cc
index 7a149d734..50f401fb7 100644
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -17,6 +17,7 @@
 
 */
 
+#include <stdint.h>
 #include "player.h"
 #include "film.h"
 #include "ffmpeg_decoder.h"
@@ -25,25 +26,80 @@
 #include "imagemagick_content.h"
 #include "sndfile_decoder.h"
 #include "sndfile_content.h"
+#include "subtitle_content.h"
 #include "playlist.h"
 #include "job.h"
+#include "image.h"
+#include "ratio.h"
+#include "resampler.h"
+#include "scaler.h"
 
 using std::list;
 using std::cout;
+using std::min;
+using std::max;
+using std::vector;
+using std::pair;
+using std::map;
 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 ())
+	{}
+	
+	Piece (shared_ptr<Content> c, shared_ptr<Decoder> d)
+		: content (c)
+		, decoder (d)
+		, video_position (c->start ())
+		, audio_position (c->start ())
+	{}
+	
+	shared_ptr<Content> content;
+	shared_ptr<Decoder> decoder;
+	Time video_position;
+	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<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)
 	, _video (true)
 	, _audio (true)
-	, _subtitles (true)
-	, _have_valid_decoders (false)
+	, _have_valid_pieces (false)
+	, _video_position (0)
+	, _audio_position (0)
+	, _audio_buffers (f->dcp_audio_channels(), 0)
 {
 	_playlist->Changed.connect (bind (&Player::playlist_changed, this));
-	_playlist->ContentChanged.connect (bind (&Player::content_changed, this, _1, _2));
+	_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 ()));
 }
 
 void
@@ -58,275 +114,490 @@ Player::disable_audio ()
 	_audio = false;
 }
 
-void
-Player::disable_subtitles ()
-{
-	_subtitles = false;
-}
-
 bool
 Player::pass ()
 {
-	if (!_have_valid_decoders) {
-		setup_decoders ();
-		_have_valid_decoders = true;
+	if (!_have_valid_pieces) {
+		setup_pieces ();
+		_have_valid_pieces = true;
 	}
-	
-	bool done = true;
-	
-	if (_video_decoder != _video_decoders.end ()) {
 
-		/* Run video decoder; this may also produce audio */
-		
-		if ((*_video_decoder)->pass ()) {
-			_video_decoder++;
-		}
-		
-		if (_video_decoder != _video_decoders.end ()) {
-			done = false;
-		}
-		
-	} else if (!_video && _playlist->audio_from() == Playlist::AUDIO_FFMPEG && _sequential_audio_decoder != _audio_decoders.end ()) {
+#ifdef DEBUG_PLAYER
+	cout << "= PASS\n";
+#endif	
 
-		/* We're not producing video, so we may need to run FFmpeg content to get the audio */
-		
-		if ((*_sequential_audio_decoder)->pass ()) {
-			_sequential_audio_decoder++;
+        Time earliest_t = TIME_MAX;
+        shared_ptr<Piece> earliest;
+	enum {
+		VIDEO,
+		AUDIO
+	} type = VIDEO;
+
+	for (list<shared_ptr<Piece> >::iterator i = _pieces.begin(); i != _pieces.end(); ++i) {
+		if ((*i)->decoder->done ()) {
+			continue;
 		}
-		
-		if (_sequential_audio_decoder != _audio_decoders.end ()) {
-			done = false;
+
+		if (_video && dynamic_pointer_cast<VideoDecoder> ((*i)->decoder)) {
+			if ((*i)->video_position < earliest_t) {
+				earliest_t = (*i)->video_position;
+				earliest = *i;
+				type = VIDEO;
+			}
 		}
-		
-	} else if (_playlist->audio_from() == Playlist::AUDIO_SNDFILE) {
 
-		/* We're getting audio from SndfileContent */
-		
-		for (list<shared_ptr<AudioDecoder> >::iterator i = _audio_decoders.begin(); i != _audio_decoders.end(); ++i) {
-			if (!(*i)->pass ()) {
-				done = false;
+		if (_audio && dynamic_pointer_cast<AudioDecoder> ((*i)->decoder)) {
+			if ((*i)->audio_position < earliest_t) {
+				earliest_t = (*i)->audio_position;
+				earliest = *i;
+				type = AUDIO;
 			}
 		}
+	}
 
-		Audio (_audio_buffers, _audio_time.get());
-		_audio_buffers.reset ();
-		_audio_time = boost::none;
+	if (!earliest) {
+#ifdef DEBUG_PLAYER
+		cout << "no earliest piece.\n";
+#endif		
+		
+		flush ();
+		return true;
 	}
 
-	return done;
+	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 ();
+		}
+		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 ();
+		}
+		break;
+	}
+
+#ifdef DEBUG_PLAYER
+	cout << "\tpost pass " << _video_position << " " << _audio_position << "\n";
+#endif	
+
+        return false;
 }
 
 void
-Player::set_progress (shared_ptr<Job> job)
+Player::process_video (weak_ptr<Piece> weak_piece, shared_ptr<const Image> image, bool same, VideoContent::Frame frame)
 {
-	/* Assume progress can be divined from how far through the video we are */
+	shared_ptr<Piece> piece = weak_piece.lock ();
+	if (!piece) {
+		return;
+	}
 
-	if (_video_decoder == _video_decoders.end() || !_playlist->video_length()) {
+	shared_ptr<VideoContent> content = dynamic_pointer_cast<VideoContent> (piece->content);
+	assert (content);
+
+	FrameRateConversion frc (content->video_frame_rate(), _film->dcp_video_frame_rate());
+	if (frc.skip && (frame % 2) == 1) {
 		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 time = content->start() + (frame * frc.factor() * TIME_HZ / _film->dcp_video_frame_rate());
 	
-	ContentVideoFrame p = 0;
-	list<shared_ptr<VideoDecoder> >::iterator i = _video_decoders.begin ();
-	while (i != _video_decoders.end() && i != _video_decoder) {
-		p += (*i)->video_length ();
+	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);
 	}
 
-	job->set_progress (float ((*_video_decoder)->video_frame ()) / _playlist->video_length ());
-}
+	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;
+	}
 
-void
-Player::process_video (shared_ptr<Image> i, bool same, shared_ptr<Subtitle> s, double t)
-{
-	/* XXX: this time will need mangling to add on the offset of the start of the content */
-	Video (i, same, s, t);
+#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_position = piece->video_position = time;
 }
 
 void
-Player::process_audio (weak_ptr<const AudioContent> c, shared_ptr<AudioBuffers> b, double t)
+Player::process_audio (weak_ptr<Piece> weak_piece, shared_ptr<const AudioBuffers> audio, AudioContent::Frame frame)
 {
-	/* XXX: this time will need mangling to add on the offset of the start of the content */
-	AudioMapping mapping = _film->audio_mapping ();
-	if (!_audio_buffers) {
-		_audio_buffers.reset (new AudioBuffers (mapping.dcp_channels(), b->frames ()));
-		_audio_buffers->make_silent ();
-		_audio_time = t;
+	shared_ptr<Piece> piece = weak_piece.lock ();
+	if (!piece) {
+		return;
 	}
 
-	for (int i = 0; i < b->channels(); ++i) {
-		list<libdcp::Channel> dcp = mapping.content_to_dcp (AudioMapping::Channel (c, i));
-		for (list<libdcp::Channel>::iterator j = dcp.begin(); j != dcp.end(); ++j) {
-			_audio_buffers->accumulate (b, i, static_cast<int> (*j));
+	shared_ptr<AudioContent> content = dynamic_pointer_cast<AudioContent> (piece->content);
+	assert (content);
+
+	/* Resample */
+	if (content->content_audio_frame_rate() != content->output_audio_frame_rate()) {
+		shared_ptr<Resampler> r = resampler (content);
+		audio = r->run (audio);
+	}
+
+	/* Remap channels */
+	shared_ptr<AudioBuffers> dcp_mapped (new AudioBuffers (_film->dcp_audio_channels(), audio->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 (_playlist->audio_from() == Playlist::AUDIO_FFMPEG) {
-		/* We can just emit this audio now as it will all be here */
-		Audio (_audio_buffers, t);
-		_audio_buffers.reset ();
-		_audio_time = boost::none;
+	audio = dcp_mapped;
+
+	Time time = content->start() + (frame * TIME_HZ / _film->dcp_audio_frame_rate()) + (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->dcp_audio_frame_rate() / TIME_HZ;
+		if (frames >= audio->frames ()) {
+			return;
+		}
+
+		shared_ptr<AudioBuffers> trimmed (new AudioBuffers (audio->channels(), audio->frames() - frames));
+		trimmed->copy_from (audio.get(), audio->frames() - frames, frames, 0);
+
+		audio = trimmed;
+		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);
+		}
+		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());
 }
 
-/** @return true on error */
-bool
-Player::seek (double t)
+void
+Player::flush ()
 {
-	if (!_have_valid_decoders) {
-		setup_decoders ();
-		_have_valid_decoders = true;
+	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);
 	}
 
-	/* Find the decoder that contains this position */
-	_video_decoder = _video_decoders.begin ();
-	while (_video_decoder != _video_decoders.end ()) {
-		double const this_length = double ((*_video_decoder)->video_length()) / _film->video_frame_rate ();
-		if (t < this_length) {
-			break;
-		}
-		t -= this_length;
-		++_video_decoder;
+	while (_video_position < _audio_position) {
+		emit_black ();
+	}
+
+	while (_audio_position < _video_position) {
+		emit_silence (_film->time_to_audio_frames (_video_position - _audio_position));
 	}
 	
-	if (_video_decoder != _video_decoders.end()) {
-		(*_video_decoder)->seek (t);
-	} else {
-		return true;
+}
+
+/** 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)
+{
+	if (!_have_valid_pieces) {
+		setup_pieces ();
+		_have_valid_pieces = true;
 	}
 
-	/* XXX: don't seek audio because we don't need to... */
+	if (_pieces.empty ()) {
+		return;
+	}
 
-	return false;
-}
+	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);
 
+		(*i)->video_position = (*i)->audio_position = vc->start() + s;
 
-void
-Player::seek_back ()
-{
-	/* XXX */
+		FrameRateConversion frc (vc->video_frame_rate(), _film->dcp_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->dcp_video_frame_rate() / (frc.factor() * TIME_HZ);
+		dynamic_pointer_cast<VideoDecoder>((*i)->decoder)->seek (f, accurate);
+	}
+
+	_video_position = _audio_position = t;
+	
+	/* XXX: don't seek audio because we don't need to... */
 }
 
 void
-Player::seek_forward ()
+Player::setup_pieces ()
 {
-	/* XXX */
-}
+	list<shared_ptr<Piece> > old_pieces = _pieces;
 
+	_pieces.clear ();
 
-void
-Player::setup_decoders ()
-{
-	_video_decoders.clear ();
-	_video_decoder = _video_decoders.end ();
-	_audio_decoders.clear ();
-	
-	if (_video) {
-		list<shared_ptr<const VideoContent> > vc = _playlist->video ();
-		for (list<shared_ptr<const VideoContent> >::iterator i = vc.begin(); i != vc.end(); ++i) {
+	Playlist::ContentList content = _playlist->content ();
+	sort (content.begin(), content.end(), ContentSorter ());
+
+	for (Playlist::ContentList::iterator i = content.begin(); i != content.end(); ++i) {
+
+		shared_ptr<Piece> piece (new Piece (*i));
 
-			shared_ptr<VideoDecoder> d;
+                /* XXX: into content? */
+
+		shared_ptr<const FFmpegContent> fc = dynamic_pointer_cast<const FFmpegContent> (*i);
+		if (fc) {
+			shared_ptr<FFmpegDecoder> fd (new FFmpegDecoder (_film, fc, _video, _audio));
 			
-			/* XXX: into content? */
+			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;
+		}
+		
+		shared_ptr<const ImageMagickContent> ic = dynamic_pointer_cast<const ImageMagickContent> (*i);
+		if (ic) {
+			shared_ptr<ImageMagickDecoder> id;
 			
-			shared_ptr<const FFmpegContent> fc = dynamic_pointer_cast<const FFmpegContent> (*i);
-			if (fc) {
-				shared_ptr<FFmpegDecoder> fd (
-					new FFmpegDecoder (
-						_film, fc, _video,
-						_audio && _playlist->audio_from() == Playlist::AUDIO_FFMPEG,
-						_subtitles
-						)
-					);
-
-				if (_playlist->audio_from() == Playlist::AUDIO_FFMPEG) {
-					fd->Audio.connect (bind (&Player::process_audio, this, fc, _1, _2));
+			/* See if we can re-use an old ImageMagickDecoder */
+			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);
+				if (imd && imd->content() == ic) {
+					id = imd;
 				}
-
-				d = fd;
 			}
 
-			shared_ptr<const ImageMagickContent> ic = dynamic_pointer_cast<const ImageMagickContent> (*i);
-			if (ic) {
-				d.reset (new ImageMagickDecoder (_film, ic));
+			if (!id) {
+				id.reset (new ImageMagickDecoder (_film, ic));
+				id->Video.connect (bind (&Player::process_video, this, piece, _1, _2, _3));
 			}
 
-			d->connect_video (shared_from_this ());
-			_video_decoders.push_back (d);
+			piece->decoder = id;
 		}
 
-		_video_decoder = _video_decoders.begin ();
-	}
+		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));
 
-	if (_playlist->audio_from() == Playlist::AUDIO_FFMPEG && !_video) {
+			piece->decoder = sd;
+		}
 
-		/* If we're getting audio from FFmpegContent but not the video, we need a set
-		   of decoders for the audio.
-		*/
-		
-		list<shared_ptr<const AudioContent> > ac = _playlist->audio ();
-		for (list<shared_ptr<const AudioContent> >::iterator i = ac.begin(); i != ac.end(); ++i) {
+		_pieces.push_back (piece);
+	}
 
-			shared_ptr<const FFmpegContent> fc = dynamic_pointer_cast<const FFmpegContent> (*i);
-			assert (fc);
-			
-			shared_ptr<AudioDecoder> d (
-				new FFmpegDecoder (
-					_film, fc, _video,
-					_audio && _playlist->audio_from() == Playlist::AUDIO_FFMPEG,
-					_subtitles
-					)
-				);
-
-			d->Audio.connect (bind (&Player::process_audio, this, fc, _1, _2));
-			_audio_decoders.push_back (d);
-		}
+#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	
+}
 
-		_sequential_audio_decoder = _audio_decoders.begin ();
+void
+Player::content_changed (weak_ptr<Content> w, int property, bool frequent)
+{
+	shared_ptr<Content> c = w.lock ();
+	if (!c) {
+		return;
 	}
 
-	if (_playlist->audio_from() == Playlist::AUDIO_SNDFILE) {
+	if (
+		property == ContentProperty::START || property == ContentProperty::LENGTH ||
+		property == VideoContentProperty::VIDEO_CROP || property == VideoContentProperty::VIDEO_RATIO
+		) {
 		
-		list<shared_ptr<const AudioContent> > ac = _playlist->audio ();
-		for (list<shared_ptr<const AudioContent> >::iterator i = ac.begin(); i != ac.end(); ++i) {
-			
-			shared_ptr<const SndfileContent> sc = dynamic_pointer_cast<const SndfileContent> (*i);
-			assert (sc);
-			
-			shared_ptr<AudioDecoder> d (new SndfileDecoder (_film, sc));
-			d->Audio.connect (bind (&Player::process_audio, this, sc, _1, _2));
-			_audio_decoders.push_back (d);
-		}
+		_have_valid_pieces = false;
+		Changed (frequent);
+
+	} else if (property == SubtitleContentProperty::SUBTITLE_OFFSET || property == SubtitleContentProperty::SUBTITLE_SCALE) {
+		update_subtitle ();
+		Changed (frequent);
 	}
 }
 
-double
-Player::last_video_time () const
+void
+Player::playlist_changed ()
+{
+	_have_valid_pieces = false;
+	Changed (false);
+}
+
+void
+Player::set_video_container_size (libdcp::Size s)
 {
-	double t = 0;
-	for (list<shared_ptr<VideoDecoder> >::const_iterator i = _video_decoders.begin(); i != _video_decoder; ++i) {
-		t += (*i)->video_length() / (*i)->video_frame_rate ();
+	_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)
+{
+	map<shared_ptr<AudioContent>, shared_ptr<Resampler> >::iterator i = _resamplers.find (c);
+	if (i != _resamplers.end ()) {
+		return i->second;
 	}
+	
+	shared_ptr<Resampler> r (new Resampler (c->content_audio_frame_rate(), c->output_audio_frame_rate(), c->audio_channels()));
+	_resamplers[c] = r;
+	return r;
+}
 
-	return t + (*_video_decoder)->last_content_time ();
+void
+Player::emit_black ()
+{
+#ifdef DCPOMATIC_DEBUG
+	_last_video.reset ();
+#endif
+	
+	/* XXX: use same here */
+	Video (_black_frame, false, _video_position);
+	_video_position += _film->video_frames_to_time (1);
 }
 
 void
-Player::content_changed (weak_ptr<Content> w, int p)
+Player::emit_silence (OutputAudioFrame most)
 {
-	shared_ptr<Content> c = w.lock ();
-	if (!c) {
-		return;
-	}
+	OutputAudioFrame N = min (most, _film->dcp_audio_frame_rate() / 2);
+	shared_ptr<AudioBuffers> silence (new AudioBuffers (_film->dcp_audio_channels(), N));
+	silence->make_silent ();
+	Audio (silence, _audio_position);
+	_audio_position += _film->audio_frames_to_time (N);
+}
 
-	if (p == VideoContentProperty::VIDEO_LENGTH) {
-		if (dynamic_pointer_cast<FFmpegContent> (c)) {
-			/* FFmpeg content length changes are serious; we need new decoders */
-			_have_valid_decoders = false;
-		}
+void
+Player::film_changed (Film::Property p)
+{
+	/* Here we should notice Film properties that affect our output, and
+	   alert listeners that our output now would be different to how it was
+	   last time we were run.
+	*/
+
+	if (p == Film::SCALER || p == Film::WITH_SUBTITLES || p == Film::CONTAINER) {
+		Changed (false);
 	}
 }
 
 void
-Player::playlist_changed ()
+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 ()
 {
-	_have_valid_decoders = false;
+	shared_ptr<Piece> piece = _in_subtitle.piece.lock ();
+	if (!piece) {
+		return;
+	}
+
+	if (!_in_subtitle.image) {
+		_out_subtitle.image.reset ();
+		return;
+	}
+
+	shared_ptr<SubtitleContent> sc = dynamic_pointer_cast<SubtitleContent> (piece->content);
+	assert (sc);
+
+	dcpomatic::Rect<double> in_rect = _in_subtitle.rect;
+	libdcp::Size scaled_size;
+
+	in_rect.y += sc->subtitle_offset ();
+
+	/* We will scale the subtitle up to fit _video_container_size, and also by the additional subtitle_scale */
+	scaled_size.width = in_rect.width * _video_container_size.width * sc->subtitle_scale ();
+	scaled_size.height = in_rect.height * _video_container_size.height * sc->subtitle_scale ();
+
+	/* Then we need a corrective translation, consisting of two parts:
+	 *
+	 * 1.  that which is the result of the scaling of the subtitle by _video_container_size; this will be
+	 *     rect.x * _video_container_size.width and rect.y * _video_container_size.height.
+	 *
+	 * 2.  that to shift the origin of the scale by subtitle_scale to the centre of the subtitle; this will be
+	 *     (width_before_subtitle_scale * (1 - subtitle_scale) / 2) and
+	 *     (height_before_subtitle_scale * (1 - subtitle_scale) / 2).
+	 *
+	 * Combining these two translations gives these expressions.
+	 */
+	
+	_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 ();
 }