X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplayer.cc;h=a50ab3a37ee9669ae0a3788ebe071e0c57a6010f;hb=5c09a82e483593fb37da0cad20679be735887613;hp=ee044e4e12e59c54a12ab3ceddc01b4c5e0a2502;hpb=9cbe46f9aa1d12b01ed0f9ffb3967bf6000e6e5c;p=dcpomatic.git

diff --git a/src/lib/player.cc b/src/lib/player.cc
index ee044e4e1..a50ab3a37 100644
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -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"
@@ -36,6 +34,7 @@
 #include "resampler.h"
 #include "log.h"
 #include "scaler.h"
+#include "player_video_frame.h"
 
 using std::list;
 using std::cout;
@@ -48,47 +47,6 @@ 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->position ())
-		, audio_position (c->position ())
-	{}
-	
-	Piece (shared_ptr<Content> c, shared_ptr<Decoder> d)
-		: content (c)
-		, decoder (d)
-		, video_position (c->position ())
-		, audio_position (c->position ())
-	{}
-	
-	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<StillImageContent> (p.content)) {
-		s << "\tstill image";
-	} else if (dynamic_pointer_cast<SndfileContent> (p.content)) {
-		s << "\tsndfile	   ";
-	}
-	
-	s << " at " << p.content->position() << " until " << p.content->end();
-	
-	return s;
-}
-#endif	
-
 Player::Player (shared_ptr<const Film> f, shared_ptr<const Playlist> p)
 	: _film (f)
 	, _playlist (p)
@@ -103,7 +61,7 @@ Player::Player (shared_ptr<const Film> f, shared_ptr<const Playlist> p)
 	_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 (_film->container()->size (_film->full_frame ()));
+	set_video_container_size (_film->frame_size ());
 }
 
 void
@@ -123,13 +81,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 {
@@ -142,7 +95,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;
@@ -150,7 +106,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;
@@ -160,10 +116,6 @@ Player::pass ()
 	}
 
 	if (!earliest) {
-#ifdef DEBUG_PLAYER
-		cout << "no earliest piece.\n";
-#endif		
-		
 		flush ();
 		return true;
 	}
@@ -171,28 +123,20 @@ 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 video " << *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 (none until " << earliest_t << "); emitting silence.\n";
-#endif
 			emit_silence (_film->time_to_audio_frames (earliest_t - _audio_position));
 		} else {
-#ifdef DEBUG_PLAYER
-			cout << "Pass audio " << *earliest << "\n";
-#endif
 			earliest->decoder->pass ();
 
 			if (earliest->decoder->done()) {
@@ -209,28 +153,42 @@ Player::pass ()
 		}
 		break;
 	}
-	
-	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);
-		}
-	}
 
-	TimedAudioBuffers<Time> tb = _audio_merger.pull (audio_done_up_to);
-	Audio (tb.audio, tb.time);
-	_audio_position += _film->audio_frames_to_time (tb.audio->frames ());
+	if (_audio) {
+		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;
+			}
 
-#ifdef DEBUG_PLAYER
-	cout << "\tpost pass _video_position=" << _video_position << " _audio_position=" << _audio_position << "\n";
-#endif	
+			shared_ptr<AudioDecoder> ad = dynamic_pointer_cast<AudioDecoder> ((*i)->decoder);
+			if (ad && ad->has_audio ()) {
+				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;
@@ -248,43 +206,62 @@ Player::process_video (weak_ptr<Piece> weak_piece, shared_ptr<const Image> image
 	if (content->trimmed (relative_time)) {
 		return;
 	}
-	
-	shared_ptr<Image> work_image = image->crop (content->crop(), true);
 
-	libdcp::Size const image_size = content->ratio()->size (_video_container_size);
+	Time const time = content->position() + relative_time + extra - content->trim_start ();
+	libdcp::Size const image_size = content->scale().size (content, _video_container_size, _film->frame_size ());
+
+	shared_ptr<PlayerVideoFrame> pi (
+		new PlayerVideoFrame (
+			image,
+			content->crop(),
+			image_size,
+			_video_container_size,
+			_film->scaler(),
+			eyes,
+			content->colour_conversion()
+			)
+		);
 	
-	work_image = work_image->scale_and_convert_to_rgb (image_size, _film->scaler(), true);
-
-	Time time = content->position() + relative_time - 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);
+	if (_film->with_subtitles ()) {
+		for (list<Subtitle>::const_iterator i = _subtitles.begin(); i != _subtitles.end(); ++i) {
+			if (i->covers (time)) {
+				/* This may be true for more than one of _subtitles, but the last (latest-starting)
+				   one is the one we want to use, so that's ok.
+				*/
+				Position<int> const container_offset (
+					(_video_container_size.width - image_size.width) / 2,
+					(_video_container_size.height - image_size.width) / 2
+					);
+				
+				pi->set_subtitle (i->out_image(), i->out_position() + container_offset);
+			}
+		}
 	}
 
-	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;
+	/* Clear out old subtitles */
+	for (list<Subtitle>::iterator i = _subtitles.begin(); i != _subtitles.end(); ) {
+		list<Subtitle>::iterator j = i;
+		++j;
+		
+		if (i->ends_before (time)) {
+			_subtitles.erase (i);
+		}
+
+		i = j;
 	}
 
 #ifdef DCPOMATIC_DEBUG
 	_last_video = piece->content;
 #endif
 
-	Video (work_image, eyes, same, time);
-	time += TIME_HZ / _film->video_frame_rate();
-
-	if (frc.repeat) {
-		Video (work_image, eyes, true, time);
-		time += TIME_HZ / _film->video_frame_rate();
-	}
+	Video (pi, same, time);
 
 	_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
@@ -298,6 +275,13 @@ 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);
@@ -312,15 +296,23 @@ Player::process_audio (weak_ptr<Piece> weak_piece, shared_ptr<const AudioBuffers
 		return;
 	}
 
-	Time time = content->position() + (content->audio_delay() * TIME_HZ / 1000) + relative_time;
+	Time time = content->position() + (content->audio_delay() * TIME_HZ / 1000) + relative_time - content->trim_start ();
 	
 	/* Remap channels */
 	shared_ptr<AudioBuffers> dcp_mapped (new AudioBuffers (_film->audio_channels(), audio->frames()));
 	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);
+
+	AudioMapping map = content->audio_mapping ();
+	for (int i = 0; i < map.content_channels(); ++i) {
+		for (int j = 0; j < _film->audio_channels(); ++j) {
+			if (map.get (i, static_cast<libdcp::Channel> (j)) > 0) {
+				dcp_mapped->accumulate_channel (
+					audio.get(),
+					i,
+					static_cast<libdcp::Channel> (j),
+					map.get (i, static_cast<libdcp::Channel> (j))
+					);
+			}
 		}
 	}
 
@@ -348,16 +340,16 @@ void
 Player::flush ()
 {
 	TimedAudioBuffers<Time> tb = _audio_merger.flush ();
-	if (tb.audio) {
+	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));
 	}
 	
@@ -372,7 +364,6 @@ Player::seek (Time t, bool accurate)
 {
 	if (!_have_valid_pieces) {
 		setup_pieces ();
-		_have_valid_pieces = true;
 	}
 
 	if (_pieces.empty ()) {
@@ -384,24 +375,25 @@ Player::seek (Time t, bool accurate)
 		if (!vc) {
 			continue;
 		}
-		
+
+		/* s is the offset of t from the start position of this content */
 		Time s = t - vc->position ();
 		s = max (static_cast<Time> (0), s);
 		s = min (vc->length_after_trim(), s);
 
+		/* Hence set the piece positions to the `global' time */
 		(*i)->video_position = (*i)->audio_position = vc->position() + s;
 
-		FrameRateConversion frc (vc->video_frame_rate(), _film->video_frame_rate());
-		/* Here we are converting from time (in the DCP) to a frame number in the content.
-		   Hence we need to use the DCP's frame rate and the double/skip correction, not
-		   the source's rate.
-		*/
-		VideoContent::Frame f = (s + vc->trim_start ()) * _film->video_frame_rate() / (frc.factor() * TIME_HZ);
-		dynamic_pointer_cast<VideoDecoder>((*i)->decoder)->seek (f, accurate);
+		/* And seek the decoder */
+		dynamic_pointer_cast<VideoDecoder>((*i)->decoder)->seek (
+			vc->time_to_content_video_frames (s + vc->trim_start ()), accurate
+			);
+
+		(*i)->reset_repeat ();
 	}
 
 	_video_position = _audio_position = t;
-	
+
 	/* XXX: don't seek audio because we don't need to... */
 }
 
@@ -417,6 +409,10 @@ Player::setup_pieces ()
 
 	for (ContentList::iterator i = content.begin(); i != content.end(); ++i) {
 
+		if (!(*i)->paths_valid ()) {
+			continue;
+		}
+
 		shared_ptr<Piece> piece (new Piece (*i));
 
 		/* XXX: into content? */
@@ -425,49 +421,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));
-			}
-
-			piece->decoder = id;
-		}
-
-		shared_ptr<const MovingImageContent> mc = dynamic_pointer_cast<const MovingImageContent> (*i);
-		if (mc) {
-			shared_ptr<MovingImageDecoder> md;
-
-			if (!md) {
-				md.reset (new MovingImageDecoder (_film, mc));
-				md->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 = md;
 		}
 
 		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;
 		}
@@ -475,12 +460,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
@@ -494,16 +474,34 @@ 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 == VideoContentProperty::VIDEO_CROP || property == VideoContentProperty::VIDEO_RATIO
+		property == VideoContentProperty::VIDEO_FRAME_TYPE 
 		) {
 		
 		_have_valid_pieces = false;
 		Changed (frequent);
 
-	} else if (property == SubtitleContentProperty::SUBTITLE_OFFSET || property == SubtitleContentProperty::SUBTITLE_SCALE) {
-		update_subtitle ();
+	} else if (
+		property == SubtitleContentProperty::SUBTITLE_X_OFFSET ||
+		property == SubtitleContentProperty::SUBTITLE_Y_OFFSET ||
+		property == SubtitleContentProperty::SUBTITLE_SCALE
+		) {
+
+		for (list<Subtitle>::iterator i = _subtitles.begin(); i != _subtitles.end(); ++i) {
+			i->update (_film, _video_container_size);
+		}
+		
+		Changed (frequent);
+
+	} else if (
+		property == VideoContentProperty::VIDEO_CROP || property == VideoContentProperty::VIDEO_SCALE ||
+		property == VideoContentProperty::VIDEO_FRAME_RATE
+		) {
+		
 		Changed (frequent);
-	} else if (property == VideoContentProperty::VIDEO_FRAME_TYPE) {
+
+	} else if (property == ContentProperty::PATH) {
+
+		_have_valid_pieces = false;
 		Changed (frequent);
 	}
 }
@@ -519,8 +517,21 @@ 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 PlayerVideoFrame (
+			im,
+			Crop(),
+			_video_container_size,
+			_video_container_size,
+			Scaler::from_id ("bicubic"),
+			EYES_BOTH,
+			ColourConversion ()
+			)
+		);
 }
 
 shared_ptr<Resampler>
@@ -534,6 +545,12 @@ Player::resampler (shared_ptr<AudioContent> c, bool create)
 	if (!create) {
 		return shared_ptr<Resampler> ();
 	}
+
+	_film->log()->log (
+		String::compose (
+			"Creating new resampler for %1 to %2 with %3 channels", c->content_audio_frame_rate(), c->output_audio_frame_rate(), c->audio_channels()
+			)
+		);
 	
 	shared_ptr<Resampler> r (new Resampler (c->content_audio_frame_rate(), c->output_audio_frame_rate(), c->audio_channels()));
 	_resamplers[c] = r;
@@ -546,8 +563,8 @@ Player::emit_black ()
 #ifdef DCPOMATIC_DEBUG
 	_last_video.reset ();
 #endif
-	
-	Video (_black_frame, EYES_BOTH, _last_emit_was_black, _video_position);
+
+	Video (_black_frame, _last_emit_was_black, _video_position);
 	_video_position += _film->video_frames_to_time (1);
 	_last_emit_was_black = true;
 }
@@ -555,6 +572,10 @@ Player::emit_black ()
 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 ();
@@ -570,7 +591,7 @@ Player::film_changed (Film::Property p)
 	   last time we were run.
 	*/
 
-	if (p == Film::SCALER || p == Film::WITH_SUBTITLES || p == Film::CONTAINER) {
+	if (p == Film::SCALER || p == Film::WITH_SUBTITLES || p == Film::CONTAINER || p == Film::VIDEO_FRAME_RATE) {
 		Changed (false);
 	}
 }
@@ -578,56 +599,34 @@ 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 ();
+	if (!image) {
+		/* A null image means that we should stop any current subtitles at `from' */
+		for (list<Subtitle>::iterator i = _subtitles.begin(); i != _subtitles.end(); ++i) {
+			i->set_stop (from);
+		}
+	} else {
+		_subtitles.push_back (Subtitle (_film, _video_container_size, weak_piece, image, rect, from, to));
+	}
 }
 
-void
-Player::update_subtitle ()
+/** 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 ()
 {
-	shared_ptr<Piece> piece = _in_subtitle.piece.lock ();
-	if (!piece) {
-		return;
-	}
-
-	if (!_in_subtitle.image) {
-		_out_subtitle.image.reset ();
-		return;
+	if (!_last_incoming_video.image || !_have_valid_pieces) {
+		return false;
 	}
 
-	shared_ptr<SubtitleContent> sc = dynamic_pointer_cast<SubtitleContent> (piece->content);
-	assert (sc);
+	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
+		);
 
-	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->position ();
-	_out_subtitle.to = _in_subtitle.to + piece->content->position ();
+	return true;
 }