X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplayer.cc;h=522b8304f533aa6674fd02fb1ccef6da3fb43bdb;hb=1aad2c33896ce6222f3c929c7af7fe4ff5fda0f2;hp=3de26ec90fcae36e18f5c07cd62622d525aacaed;hpb=7673eebbd4595326b419f269544c43ed68bb5cf2;p=dcpomatic.git

diff --git a/src/lib/player.cc b/src/lib/player.cc
index 3de26ec90..522b8304f 100644
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2017 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -47,8 +47,8 @@
 #include "content_subtitle.h"
 #include "dcp_decoder.h"
 #include "image_decoder.h"
-#include "resampler.h"
 #include "compose.hpp"
+#include "shuffler.h"
 #include <dcp/reel.h>
 #include <dcp/reel_sound_asset.h>
 #include <dcp/reel_subtitle_asset.h>
@@ -83,11 +83,12 @@ Player::Player (shared_ptr<const Film> film, shared_ptr<const Playlist> playlist
 	, _playlist (playlist)
 	, _have_valid_pieces (false)
 	, _ignore_video (false)
-	, _ignore_audio (false)
+	, _ignore_subtitle (false)
 	, _always_burn_subtitles (false)
 	, _fast (false)
 	, _play_referenced (false)
 	, _audio_merger (_film->audio_frame_rate())
+	, _shuffler (0)
 {
 	_film_changed_connection = _film->Changed.connect (bind (&Player::film_changed, this, _1));
 	_playlist_changed_connection = _playlist->Changed.connect (bind (&Player::playlist_changed, this));
@@ -99,18 +100,27 @@ Player::Player (shared_ptr<const Film> film, shared_ptr<const Playlist> playlist
 	seek (DCPTime (), true);
 }
 
+Player::~Player ()
+{
+	delete _shuffler;
+}
+
 void
 Player::setup_pieces ()
 {
 	_pieces.clear ();
 
+	delete _shuffler;
+	_shuffler = new Shuffler();
+	_shuffler->Video.connect(bind(&Player::video, this, _1, _2));
+
 	BOOST_FOREACH (shared_ptr<Content> i, _playlist->content ()) {
 
 		if (!i->paths_valid ()) {
 			continue;
 		}
 
-		shared_ptr<Decoder> decoder = decoder_factory (i, _film->log());
+		shared_ptr<Decoder> decoder = decoder_factory (i, _film->log(), _fast);
 		FrameRateChange frc (i->active_video_frame_rate(), _film->video_frame_rate());
 
 		if (!decoder) {
@@ -122,20 +132,27 @@ Player::setup_pieces ()
 			decoder->video->set_ignore ();
 		}
 
-		if (decoder->audio && _ignore_audio) {
-			decoder->audio->set_ignore ();
+		if (decoder->subtitle && _ignore_subtitle) {
+			decoder->subtitle->set_ignore ();
 		}
 
 		shared_ptr<DCPDecoder> dcp = dynamic_pointer_cast<DCPDecoder> (decoder);
 		if (dcp && _play_referenced) {
-			dcp->set_decode_referenced ();
+			if (_play_referenced) {
+				dcp->set_decode_referenced ();
+			}
+			dcp->set_forced_reduction (_dcp_decode_reduction);
 		}
 
 		shared_ptr<Piece> piece (new Piece (i, decoder, frc));
 		_pieces.push_back (piece);
 
 		if (decoder->video) {
-			decoder->video->Data.connect (bind (&Player::video, this, weak_ptr<Piece> (piece), _1));
+			if (i->video->frame_type() == VIDEO_FRAME_TYPE_3D_LEFT || i->video->frame_type() == VIDEO_FRAME_TYPE_3D_RIGHT) {
+				decoder->video->Data.connect (bind (&Shuffler::video, _shuffler, weak_ptr<Piece>(piece), _1));
+			} else {
+				decoder->video->Data.connect (bind (&Player::video, this, weak_ptr<Piece>(piece), _1));
+			}
 		}
 
 		if (decoder->audio) {
@@ -149,6 +166,7 @@ Player::setup_pieces ()
 		}
 	}
 
+	_stream_states.clear ();
 	BOOST_FOREACH (shared_ptr<Piece> i, _pieces) {
 		if (i->content->audio) {
 			BOOST_FOREACH (AudioStreamPtr j, i->content->audio->streams()) {
@@ -157,22 +175,12 @@ Player::setup_pieces ()
 		}
 	}
 
-	if (!_play_referenced) {
-		BOOST_FOREACH (shared_ptr<Piece> i, _pieces) {
-			shared_ptr<DCPContent> dc = dynamic_pointer_cast<DCPContent> (i->content);
-			if (dc) {
-				if (dc->reference_video()) {
-					_no_video.push_back (DCPTimePeriod (dc->position(), dc->end()));
-				}
-				if (dc->reference_audio()) {
-					_no_audio.push_back (DCPTimePeriod (dc->position(), dc->end()));
-				}
-			}
-		}
-	}
+	_black = Empty (_film->content(), _film->length(), bind(&Content::video, _1));
+	_silent = Empty (_film->content(), _film->length(), bind(&Content::audio, _1));
 
-	_last_video_time = optional<DCPTime> ();
-	_last_audio_time = optional<DCPTime> ();
+	_last_video_time = DCPTime ();
+	_last_video_eyes = EYES_BOTH;
+	_last_audio_time = DCPTime ();
 	_have_valid_pieces = true;
 }
 
@@ -194,10 +202,10 @@ Player::playlist_content_changed (weak_ptr<Content> w, int property, bool freque
 		property == DCPContentProperty::NEEDS_ASSETS ||
 		property == DCPContentProperty::NEEDS_KDM ||
 		property == SubtitleContentProperty::COLOUR ||
-		property == SubtitleContentProperty::OUTLINE ||
-		property == SubtitleContentProperty::SHADOW ||
+		property == SubtitleContentProperty::EFFECT ||
 		property == SubtitleContentProperty::EFFECT_COLOUR ||
 		property == FFmpegContentProperty::SUBTITLE_STREAM ||
+		property == FFmpegContentProperty::FILTERS ||
 		property == VideoContentProperty::COLOUR_CONVERSION
 		) {
 
@@ -317,7 +325,7 @@ Player::transform_image_subtitles (list<ImageSubtitle> subs) const
 }
 
 shared_ptr<PlayerVideo>
-Player::black_player_video_frame () const
+Player::black_player_video_frame (Eyes eyes) const
 {
 	return shared_ptr<PlayerVideo> (
 		new PlayerVideo (
@@ -326,7 +334,7 @@ Player::black_player_video_frame () const
 			optional<double> (),
 			_video_container_size,
 			_video_container_size,
-			EYES_BOTH,
+			eyes,
 			PART_WHOLE,
 			PresetColourConversion::all().front().conversion
 		)
@@ -354,8 +362,8 @@ DCPTime
 Player::content_video_to_dcp (shared_ptr<const Piece> piece, Frame f) const
 {
 	/* See comment in dcp_to_content_video */
-	DCPTime const d = DCPTime::from_frames (f * piece->frc.factor(), piece->frc.dcp) - DCPTime (piece->content->trim_start (), piece->frc);
-	return max (DCPTime (), d + piece->content->position ());
+	DCPTime const d = DCPTime::from_frames (f * piece->frc.factor(), piece->frc.dcp) - DCPTime(piece->content->trim_start(), piece->frc);
+	return d + piece->content->position();
 }
 
 Frame
@@ -371,8 +379,9 @@ DCPTime
 Player::resampled_audio_to_dcp (shared_ptr<const Piece> piece, Frame f) const
 {
 	/* See comment in dcp_to_content_video */
-	DCPTime const d = DCPTime::from_frames (f, _film->audio_frame_rate()) - DCPTime (piece->content->trim_start(), piece->frc);
-	return max (DCPTime (), d + piece->content->position ());
+	return DCPTime::from_frames (f, _film->audio_frame_rate())
+		- DCPTime (piece->content->trim_start(), piece->frc)
+		+ piece->content->position();
 }
 
 ContentTime
@@ -417,6 +426,12 @@ Player::set_ignore_video ()
 	_ignore_video = true;
 }
 
+void
+Player::set_ignore_subtitle ()
+{
+	_ignore_subtitle = true;
+}
+
 /** Set whether or not this player should always burn text subtitles into the image,
  *  regardless of the content settings.
  *  @param burn true to always burn subtitles, false to obey content settings.
@@ -427,6 +442,7 @@ Player::set_always_burn_subtitles (bool burn)
 	_always_burn_subtitles = burn;
 }
 
+/** Sets up the player to be faster, possibly at the expense of quality */
 void
 Player::set_fast ()
 {
@@ -454,7 +470,7 @@ Player::get_reel_assets ()
 
 		scoped_ptr<DCPDecoder> decoder;
 		try {
-			decoder.reset (new DCPDecoder (j, _film->log()));
+			decoder.reset (new DCPDecoder (j, _film->log(), false));
 		} catch (...) {
 			return a;
 		}
@@ -507,97 +523,151 @@ Player::get_reel_assets ()
 	return a;
 }
 
-list<shared_ptr<Piece> >
-Player::overlaps (DCPTime from, DCPTime to, boost::function<bool (Content *)> valid)
+bool
+Player::pass ()
 {
 	if (!_have_valid_pieces) {
 		setup_pieces ();
 	}
 
-	list<shared_ptr<Piece> > overlaps;
-	BOOST_FOREACH (shared_ptr<Piece> i, _pieces) {
-		if (valid (i->content.get ()) && i->content->position() < to && i->content->end() > from) {
-			overlaps.push_back (i);
-		}
+	if (_playlist->length() == DCPTime()) {
+		/* Special case of an empty Film; just give one black frame */
+		emit_video (black_player_video_frame(EYES_BOTH), DCPTime());
+		return true;
 	}
 
-	return overlaps;
-}
+	/* Find the decoder or empty which is farthest behind where we are and make it emit some data */
 
-bool
-Player::pass ()
-{
-	if (!_have_valid_pieces) {
-		setup_pieces ();
-	}
-
-	shared_ptr<Piece> earliest;
-	DCPTime earliest_content;
+	shared_ptr<Piece> earliest_content;
+	optional<DCPTime> earliest_time;
 
 	BOOST_FOREACH (shared_ptr<Piece> i, _pieces) {
-		if (!i->done) {
-			DCPTime const t = i->content->position() + DCPTime (i->decoder->position(), i->frc);
-			if (!earliest || t < earliest_content) {
-				earliest_content = t;
-				earliest = i;
+		if (i->done) {
+			continue;
+		}
+
+		DCPTime const t = content_time_to_dcp (i, i->decoder->position());
+		if (t > i->content->end()) {
+			i->done = true;
+		} else {
+
+			/* Given two choices at the same time, pick the one with a subtitle so we see it before
+			   the video.
+			*/
+			if (!earliest_time || t < *earliest_time || (t == *earliest_time && i->decoder->subtitle)) {
+				earliest_time = t;
+				earliest_content = i;
 			}
 		}
 	}
 
-	if (!earliest) {
-		/* No more content; fill up with silent black */
-		DCPTimePeriod remaining_video (DCPTime(), _playlist->length());
-		if (_last_video_time) {
-			remaining_video.from = _last_video_time.get();
-		}
-		fill_video (remaining_video);
-		DCPTimePeriod remaining_audio (DCPTime(), _playlist->length());
-		if (_last_audio_time) {
-			remaining_audio.from = _last_audio_time.get();
-		}
-		fill_audio (remaining_audio);
-		return true;
+	bool done = false;
+
+	enum {
+		NONE,
+		CONTENT,
+		BLACK,
+		SILENT
+	} which = NONE;
+
+	if (earliest_content) {
+		which = CONTENT;
+	}
+
+	if (!_black.done() && (!earliest_time || _black.position() < *earliest_time)) {
+		earliest_time = _black.position ();
+		which = BLACK;
 	}
 
-	earliest->done = earliest->decoder->pass ();
-	if (earliest->done && earliest->content->audio) {
-		/* Flush the Player audio system for this piece */
-		BOOST_FOREACH (AudioStreamPtr i, earliest->content->audio->streams()) {
-			audio_flush (earliest, i);
+	if (!_silent.done() && (!earliest_time || _silent.position() < *earliest_time)) {
+		earliest_time = _silent.position ();
+		which = SILENT;
+	}
+
+	switch (which) {
+	case CONTENT:
+		earliest_content->done = earliest_content->decoder->pass ();
+		break;
+	case BLACK:
+		emit_video (black_player_video_frame(EYES_BOTH), _black.position());
+		_black.set_position (_black.position() + one_video_frame());
+		break;
+	case SILENT:
+	{
+		DCPTimePeriod period (_silent.period_at_position());
+		if (period.duration() > one_video_frame()) {
+			period.to = period.from + one_video_frame();
 		}
+		fill_audio (period);
+		_silent.set_position (period.to);
+		break;
+	}
+	case NONE:
+		done = true;
+		break;
 	}
 
 	/* Emit any audio that is ready */
 
-	DCPTime pull_from = _playlist->length ();
+	/* Work out the time before which the audio is definitely all here.  This is the earliest last_push_end of one
+	   of our streams, or the position of the _silent.
+	*/
+	DCPTime pull_to = _film->length ();
 	for (map<AudioStreamPtr, StreamState>::const_iterator i = _stream_states.begin(); i != _stream_states.end(); ++i) {
-		if (!i->second.piece->done && i->second.last_push_end < pull_from) {
-			pull_from = i->second.last_push_end;
+		if (!i->second.piece->done && i->second.last_push_end < pull_to) {
+			pull_to = i->second.last_push_end;
 		}
 	}
+	if (!_silent.done() && _silent.position() < pull_to) {
+		pull_to = _silent.position();
+	}
 
-	list<pair<shared_ptr<AudioBuffers>, DCPTime> > audio = _audio_merger.pull (pull_from);
+	list<pair<shared_ptr<AudioBuffers>, DCPTime> > audio = _audio_merger.pull (pull_to);
 	for (list<pair<shared_ptr<AudioBuffers>, DCPTime> >::iterator i = audio.begin(); i != audio.end(); ++i) {
-		if (_last_audio_time && i->second < _last_audio_time.get()) {
-			/* There has been an accurate seek and we have received some audio before the seek time;
-			   discard it.
-			*/
+		if (_last_audio_time && i->second < *_last_audio_time) {
+			/* This new data comes before the last we emitted (or the last seek); discard it */
 			pair<shared_ptr<AudioBuffers>, DCPTime> cut = discard_audio (i->first, i->second, *_last_audio_time);
 			if (!cut.first) {
 				continue;
 			}
 			*i = cut;
+		} else if (_last_audio_time && i->second > *_last_audio_time) {
+			/* There's a gap between this data and the last we emitted; fill with silence */
+			fill_audio (DCPTimePeriod (*_last_audio_time, i->second));
 		}
 
-		if (_last_audio_time) {
-			fill_audio (DCPTimePeriod (_last_audio_time.get(), i->second));
+		emit_audio (i->first, i->second);
+	}
+
+	if (done) {
+		_shuffler->flush ();
+	}
+	return done;
+}
+
+optional<PositionImage>
+Player::subtitles_for_frame (DCPTime time) const
+{
+	list<PositionImage> subtitles;
+
+	BOOST_FOREACH (PlayerSubtitles i, _active_subtitles.get_burnt (DCPTimePeriod(time, time + DCPTime::from_frames(1, _film->video_frame_rate())),  _always_burn_subtitles)) {
+
+		/* Image subtitles */
+		list<PositionImage> c = transform_image_subtitles (i.image);
+		copy (c.begin(), c.end(), back_inserter (subtitles));
+
+		/* Text subtitles (rendered to an image) */
+		if (!i.text.empty ()) {
+			list<PositionImage> s = render_subtitles (i.text, i.fonts, _video_container_size, time);
+			copy (s.begin(), s.end(), back_inserter (subtitles));
 		}
+	}
 
-		Audio (i->first, i->second);
-		_last_audio_time = i->second + DCPTime::from_frames(i->first->frames(), _film->audio_frame_rate());
+	if (subtitles.empty ()) {
+		return optional<PositionImage> ();
 	}
 
-	return false;
+	return merge (subtitles);
 }
 
 void
@@ -613,56 +683,52 @@ Player::video (weak_ptr<Piece> wp, ContentVideo video)
 		return;
 	}
 
-	/* Time and period of the frame we will emit */
+	/* Time of the first frame we will emit */
 	DCPTime const time = content_video_to_dcp (piece, video.frame);
-	DCPTimePeriod const period (time, time + one_video_frame());
 
 	/* Discard if it's outside the content's period or if it's before the last accurate seek */
-	if (time < piece->content->position() || time >= piece->content->end() || (_last_video_time && time < _last_video_time)) {
+	if (
+		time < piece->content->position() ||
+		time >= piece->content->end() ||
+		(_last_video_time && time < *_last_video_time)) {
 		return;
 	}
 
-	/* Get any subtitles */
-
-	optional<PositionImage> subtitles;
-
-	for (ActiveSubtitles::const_iterator i = _active_subtitles.begin(); i != _active_subtitles.end(); ++i) {
-
-		shared_ptr<Piece> sub_piece = i->first.lock ();
-		if (!sub_piece) {
-			continue;
-		}
-
-		if (!sub_piece->content->subtitle->use() || (!_always_burn_subtitles && !piece->content->subtitle->burn())) {
-			continue;
-		}
-
-		pair<PlayerSubtitles, DCPTime> sub = i->second;
-
-		list<PositionImage> sub_images;
-
-		/* Image subtitles */
-		list<PositionImage> c = transform_image_subtitles (sub.first.image);
-		copy (c.begin(), c.end(), back_inserter (sub_images));
-
-		/* Text subtitles (rendered to an image) */
-		if (!sub.first.text.empty ()) {
-			list<PositionImage> s = render_subtitles (sub.first.text, sub.first.fonts, _video_container_size, time);
-			copy (s.begin (), s.end (), back_inserter (sub_images));
-		}
-
-		if (!sub_images.empty ()) {
-			subtitles = merge (sub_images);
-		}
-	}
-
-	/* Fill gaps */
+	/* Fill gaps that we discover now that we have some video which needs to be emitted */
 
 	if (_last_video_time) {
-		fill_video (DCPTimePeriod (_last_video_time.get(), time));
+		DCPTime fill_from = max (*_last_video_time, piece->content->position());
+		LastVideoMap::const_iterator last = _last_video.find (wp);
+		if (_film->three_d()) {
+			DCPTime j = fill_from;
+			Eyes eyes = _last_video_eyes.get_value_or(EYES_LEFT);
+			if (eyes == EYES_BOTH) {
+				eyes = EYES_LEFT;
+			}
+			while (j < time || eyes != video.eyes) {
+				if (last != _last_video.end()) {
+					last->second->set_eyes (eyes);
+					emit_video (last->second, j);
+				} else {
+					emit_video (black_player_video_frame(eyes), j);
+				}
+				if (eyes == EYES_RIGHT) {
+					j += one_video_frame();
+				}
+				eyes = increment_eyes (eyes);
+			}
+		} else {
+			for (DCPTime j = fill_from; j < time; j += one_video_frame()) {
+				if (last != _last_video.end()) {
+					emit_video (last->second, j);
+				} else {
+					emit_video (black_player_video_frame(EYES_BOTH), j);
+				}
+			}
+		}
 	}
 
-	_last_video.reset (
+	_last_video[wp].reset (
 		new PlayerVideo (
 			video.image,
 			piece->content->video->crop (),
@@ -677,87 +743,11 @@ Player::video (weak_ptr<Piece> wp, ContentVideo video)
 			)
 		);
 
-	if (subtitles) {
-		_last_video->set_subtitle (subtitles.get ());
-	}
-
-	Video (_last_video, time);
-
-	_last_video_time = time + one_video_frame ();
-}
-
-void
-Player::audio_flush (shared_ptr<Piece> piece, AudioStreamPtr stream)
-{
-	shared_ptr<AudioContent> content = piece->content->audio;
-	DCPOMATIC_ASSERT (content);
-
-	shared_ptr<Resampler> r = resampler (content, stream, false);
-	if (!r) {
-		return;
-	}
-
-	pair<shared_ptr<const AudioBuffers>, Frame> ro = r->flush ();
-	if (ro.first->frames() == 0) {
-		return;
-	}
-
-	ContentAudio content_audio;
-	content_audio.audio = ro.first;
-	content_audio.frame = ro.second;
-
-	/* Compute time in the DCP */
-	DCPTime time = resampled_audio_to_dcp (piece, content_audio.frame) + DCPTime::from_seconds (content->delay() / 1000.0);
-
-	audio_transform (content, stream, content_audio, time);
-}
-
-/** Do our common processing on some audio */
-void
-Player::audio_transform (shared_ptr<AudioContent> content, AudioStreamPtr stream, ContentAudio content_audio, DCPTime time)
-{
-	DCPOMATIC_ASSERT (content_audio.audio->frames() > 0);
-
-	/* Gain */
-
-	if (content->gain() != 0) {
-		shared_ptr<AudioBuffers> gain (new AudioBuffers (content_audio.audio));
-		gain->apply_gain (content->gain ());
-		content_audio.audio = gain;
+	DCPTime t = time;
+	for (int i = 0; i < frc.repeat; ++i) {
+		emit_video (_last_video[wp], t);
+		t += one_video_frame ();
 	}
-
-	/* Remap */
-
-	shared_ptr<AudioBuffers> dcp_mapped (new AudioBuffers (_film->audio_channels(), content_audio.audio->frames()));
-	dcp_mapped->make_silent ();
-
-	AudioMapping map = stream->mapping ();
-	for (int i = 0; i < map.input_channels(); ++i) {
-		for (int j = 0; j < dcp_mapped->channels(); ++j) {
-			if (map.get (i, static_cast<dcp::Channel> (j)) > 0) {
-				dcp_mapped->accumulate_channel (
-					content_audio.audio.get(),
-					i,
-					static_cast<dcp::Channel> (j),
-					map.get (i, static_cast<dcp::Channel> (j))
-					);
-			}
-		}
-	}
-
-	content_audio.audio = dcp_mapped;
-
-	/* Process */
-
-	if (_audio_processor) {
-		content_audio.audio = _audio_processor->run (content_audio.audio, _film->audio_channels ());
-	}
-
-	/* Push */
-
-	_audio_merger.push (content_audio.audio, time);
-	DCPOMATIC_ASSERT (_stream_states.find (stream) != _stream_states.end ());
-	_stream_states[stream].last_push_end = time + DCPTime::from_frames (content_audio.audio->frames(), _film->audio_frame_rate());
 }
 
 void
@@ -773,19 +763,8 @@ Player::audio (weak_ptr<Piece> wp, AudioStreamPtr stream, ContentAudio content_a
 	shared_ptr<AudioContent> content = piece->content->audio;
 	DCPOMATIC_ASSERT (content);
 
-	/* Resample */
-	if (stream->frame_rate() != content->resampled_frame_rate()) {
-		shared_ptr<Resampler> r = resampler (content, stream, true);
-		pair<shared_ptr<const AudioBuffers>, Frame> ro = r->run (content_audio.audio, content_audio.frame);
-		if (ro.first->frames() == 0) {
-			return;
-		}
-		content_audio.audio = ro.first;
-		content_audio.frame = ro.second;
-	}
-
 	/* Compute time in the DCP */
-	DCPTime time = resampled_audio_to_dcp (piece, content_audio.frame) + DCPTime::from_seconds (content->delay() / 1000.0);
+	DCPTime time = resampled_audio_to_dcp (piece, content_audio.frame);
 	/* And the end of this block in the DCP */
 	DCPTime end = time + DCPTime::from_frames(content_audio.audio->frames(), content->resampled_frame_rate());
 
@@ -803,13 +782,39 @@ Player::audio (weak_ptr<Piece> wp, AudioStreamPtr stream, ContentAudio content_a
 		return;
 	} else if (end > piece->content->end()) {
 		Frame const remaining_frames = DCPTime(piece->content->end() - time).frames_round(_film->audio_frame_rate());
-		DCPOMATIC_ASSERT (remaining_frames > 0);
+		if (remaining_frames == 0) {
+			return;
+		}
 		shared_ptr<AudioBuffers> cut (new AudioBuffers (content_audio.audio->channels(), remaining_frames));
 		cut->copy_from (content_audio.audio.get(), remaining_frames, 0, 0);
 		content_audio.audio = cut;
 	}
 
-	audio_transform (content, stream, content_audio, time);
+	DCPOMATIC_ASSERT (content_audio.audio->frames() > 0);
+
+	/* Gain */
+
+	if (content->gain() != 0) {
+		shared_ptr<AudioBuffers> gain (new AudioBuffers (content_audio.audio));
+		gain->apply_gain (content->gain ());
+		content_audio.audio = gain;
+	}
+
+	/* Remap */
+
+	content_audio.audio = remap (content_audio.audio, _film->audio_channels(), stream->mapping());
+
+	/* Process */
+
+	if (_audio_processor) {
+		content_audio.audio = _audio_processor->run (content_audio.audio, _film->audio_channels ());
+	}
+
+	/* Push */
+
+	_audio_merger.push (content_audio.audio, time);
+	DCPOMATIC_ASSERT (_stream_states.find (stream) != _stream_states.end ());
+	_stream_states[stream].last_push_end = time + DCPTime::from_frames (content_audio.audio->frames(), _film->audio_frame_rate());
 }
 
 void
@@ -836,7 +841,7 @@ Player::image_subtitle_start (weak_ptr<Piece> wp, ContentImageSubtitle subtitle)
 	ps.image.push_back (subtitle.sub);
 	DCPTime from (content_time_to_dcp (piece, subtitle.from()));
 
-	_active_subtitles[wp] = make_pair (ps, from);
+	_active_subtitles.add_from (wp, ps, from);
 }
 
 void
@@ -875,13 +880,13 @@ Player::text_subtitle_start (weak_ptr<Piece> wp, ContentTextSubtitle subtitle)
 		ps.add_fonts (piece->content->subtitle->fonts ());
 	}
 
-	_active_subtitles[wp] = make_pair (ps, from);
+	_active_subtitles.add_from (wp, ps, from);
 }
 
 void
 Player::subtitle_stop (weak_ptr<Piece> wp, ContentTime to)
 {
-	if (_active_subtitles.find (wp) == _active_subtitles.end ()) {
+	if (!_active_subtitles.have (wp)) {
 		return;
 	}
 
@@ -890,23 +895,28 @@ Player::subtitle_stop (weak_ptr<Piece> wp, ContentTime to)
 		return;
 	}
 
+	DCPTime const dcp_to = content_time_to_dcp (piece, to);
+
+	pair<PlayerSubtitles, DCPTime> from = _active_subtitles.add_to (wp, dcp_to);
+
 	if (piece->content->subtitle->use() && !_always_burn_subtitles && !piece->content->subtitle->burn()) {
-		Subtitle (_active_subtitles[wp].first, DCPTimePeriod (_active_subtitles[wp].second, content_time_to_dcp (piece, to)));
+		Subtitle (from.first, DCPTimePeriod (from.second, dcp_to));
 	}
-
-	_active_subtitles.erase (wp);
 }
 
 void
 Player::seek (DCPTime time, bool accurate)
 {
-	if (_audio_processor) {
-		_audio_processor->flush ();
+	if (!_have_valid_pieces) {
+		setup_pieces ();
 	}
 
-	for (ResamplerMap::iterator i = _resamplers.begin(); i != _resamplers.end(); ++i) {
-		i->second->flush ();
-		i->second->reset ();
+	if (_shuffler) {
+		_shuffler->clear ();
+	}
+
+	if (_audio_processor) {
+		_audio_processor->flush ();
 	}
 
 	_audio_merger.clear ();
@@ -929,70 +939,65 @@ Player::seek (DCPTime time, bool accurate)
 
 	if (accurate) {
 		_last_video_time = time;
+		_last_video_eyes = EYES_LEFT;
 		_last_audio_time = time;
 	} else {
-		_last_video_time = optional<DCPTime> ();
-		_last_audio_time = optional<DCPTime> ();
+		_last_video_time = optional<DCPTime>();
+		_last_video_eyes = optional<Eyes>();
+		_last_audio_time = optional<DCPTime>();
 	}
+
+	_black.set_position (time);
+	_silent.set_position (time);
+
+	_last_video.clear ();
 }
 
-shared_ptr<Resampler>
-Player::resampler (shared_ptr<const AudioContent> content, AudioStreamPtr stream, bool create)
+void
+Player::emit_video (shared_ptr<PlayerVideo> pv, DCPTime time)
 {
-	ResamplerMap::const_iterator i = _resamplers.find (make_pair (content, stream));
-	if (i != _resamplers.end ()) {
-		return i->second;
-	}
-
-	if (!create) {
-		return shared_ptr<Resampler> ();
+	optional<PositionImage> subtitles = subtitles_for_frame (time);
+	if (subtitles) {
+		pv->set_subtitle (subtitles.get ());
 	}
 
-	LOG_GENERAL (
-		"Creating new resampler from %1 to %2 with %3 channels",
-		stream->frame_rate(),
-		content->resampled_frame_rate(),
-		stream->channels()
-		);
-
-	shared_ptr<Resampler> r (
-		new Resampler (stream->frame_rate(), content->resampled_frame_rate(), stream->channels())
-		);
+	Video (pv, time);
 
-	_resamplers[make_pair(content, stream)] = r;
-	return r;
+	if (pv->eyes() == EYES_BOTH || pv->eyes() == EYES_RIGHT) {
+		_last_video_time = time + one_video_frame();
+		_active_subtitles.clear_before (time);
+	}
+	_last_video_eyes = increment_eyes (pv->eyes());
 }
 
 void
-Player::fill_video (DCPTimePeriod period)
+Player::emit_audio (shared_ptr<AudioBuffers> data, DCPTime time)
 {
-	/* XXX: this may not work for 3D */
-	BOOST_FOREACH (DCPTimePeriod i, subtract(period, _no_video)) {
-		for (DCPTime j = i.from; j < i.to; j += one_video_frame()) {
-			if (_playlist->video_content_at(j) && _last_video) {
-				Video (shared_ptr<PlayerVideo> (new PlayerVideo (*_last_video)), j);
-			} else {
-				Video (black_player_video_frame(), j);
-			}
-		}
-	}
+	/* This audio must follow on from the previous */
+	DCPOMATIC_ASSERT (!_last_audio_time || time == *_last_audio_time);
+	Audio (data, time);
+	_last_audio_time = time + DCPTime::from_frames (data->frames(), _film->audio_frame_rate());
 }
 
 void
 Player::fill_audio (DCPTimePeriod period)
 {
-	BOOST_FOREACH (DCPTimePeriod i, subtract(period, _no_audio)) {
-		DCPTime t = i.from;
-		while (t < i.to) {
-			DCPTime block = min (DCPTime::from_seconds (0.5), i.to - t);
-			Frame const samples = block.frames_round(_film->audio_frame_rate());
-			if (samples) {
-				shared_ptr<AudioBuffers> silence (new AudioBuffers (_film->audio_channels(), samples));
-				silence->make_silent ();
-				Audio (silence, t);
-			}
-			t += block;
+	if (period.from == period.to) {
+		return;
+	}
+
+	DCPOMATIC_ASSERT (period.from < period.to);
+
+	DCPTime t = period.from;
+	while (t < period.to) {
+		DCPTime block = min (DCPTime::from_seconds (0.5), period.to - t);
+		Frame const samples = block.frames_round(_film->audio_frame_rate());
+		if (samples) {
+			shared_ptr<AudioBuffers> silence (new AudioBuffers (_film->audio_channels(), samples));
+			silence->make_silent ();
+			emit_audio (silence, t);
 		}
+		t += block;
 	}
 }
 
@@ -1015,3 +1020,15 @@ Player::discard_audio (shared_ptr<const AudioBuffers> audio, DCPTime time, DCPTi
 	cut->copy_from (audio.get(), remaining_frames, discard_frames, 0);
 	return make_pair(cut, time + discard_time);
 }
+
+void
+Player::set_dcp_decode_reduction (optional<int> reduction)
+{
+	if (reduction == _dcp_decode_reduction) {
+		return;
+	}
+
+	_dcp_decode_reduction = reduction;
+	_have_valid_pieces = false;
+	Changed (false);
+}