X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fplayer.cc;h=0606a9340c9d1d6e51cd3f4e0d2ac906a090edf5;hp=8063d1212971afe2e9bf682a84d253361b902bac;hb=aeb835a18c8df347e0ed68fb24631b320abeb611;hpb=0b6c6de07f9a3aa28c2e8ca8ef30340e3fa1bfc6

diff --git a/src/lib/player.cc b/src/lib/player.cc
index 8063d1212..0606a9340 100644
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2015 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
@@ -17,631 +17,752 @@
 
 */
 
-#include <stdint.h>
 #include "player.h"
 #include "film.h"
 #include "ffmpeg_decoder.h"
+#include "audio_buffers.h"
 #include "ffmpeg_content.h"
 #include "image_decoder.h"
 #include "image_content.h"
 #include "sndfile_decoder.h"
 #include "sndfile_content.h"
 #include "subtitle_content.h"
-#include "playlist.h"
+#include "subrip_decoder.h"
+#include "subrip_content.h"
+#include "dcp_content.h"
 #include "job.h"
 #include "image.h"
-#include "image_proxy.h"
+#include "raw_image_proxy.h"
 #include "ratio.h"
-#include "resampler.h"
 #include "log.h"
-#include "scaler.h"
-#include "player_video_frame.h"
+#include "render_subtitles.h"
+#include "config.h"
+#include "content_video.h"
+#include "player_video.h"
 #include "frame_rate_change.h"
+#include "dcp_content.h"
+#include "dcp_decoder.h"
+#include "dcp_subtitle_content.h"
+#include "dcp_subtitle_decoder.h"
+#include "audio_processor.h"
+#include "playlist.h"
+#include <dcp/reel.h>
+#include <dcp/reel_sound_asset.h>
+#include <dcp/reel_subtitle_asset.h>
+#include <dcp/reel_picture_asset.h>
+#include <boost/foreach.hpp>
+#include <stdint.h>
+#include <algorithm>
+#include <iostream>
+
+#include "i18n.h"
 
-#define LOG_GENERAL(...) _film->log()->log (String::compose (__VA_ARGS__), Log::TYPE_GENERAL);
+#define LOG_GENERAL(...) _film->log()->log (String::compose (__VA_ARGS__), LogEntry::TYPE_GENERAL);
 
 using std::list;
 using std::cout;
 using std::min;
 using std::max;
+using std::min;
 using std::vector;
 using std::pair;
 using std::map;
+using std::make_pair;
+using std::copy;
 using boost::shared_ptr;
 using boost::weak_ptr;
 using boost::dynamic_pointer_cast;
+using boost::optional;
 
-Player::Player (shared_ptr<const Film> f, shared_ptr<const Playlist> p)
-	: _film (f)
-	, _playlist (p)
-	, _video (true)
-	, _audio (true)
+Player::Player (shared_ptr<const Film> film, shared_ptr<const Playlist> playlist)
+	: _film (film)
+	, _playlist (playlist)
 	, _have_valid_pieces (false)
-	, _video_position (0)
-	, _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)
+	, _ignore_video (false)
+	, _ignore_audio (false)
+	, _always_burn_subtitles (false)
+	, _fast (false)
+	, _play_referenced (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));
 	_film_changed_connection = _film->Changed.connect (bind (&Player::film_changed, this, _1));
+	_playlist_changed_connection = _playlist->Changed.connect (bind (&Player::playlist_changed, this));
+	_playlist_content_changed_connection = _playlist->ContentChanged.connect (bind (&Player::playlist_content_changed, this, _1, _2, _3));
 	set_video_container_size (_film->frame_size ());
-}
 
-void
-Player::disable_video ()
-{
-	_video = false;
+	film_changed (Film::AUDIO_PROCESSOR);
 }
 
 void
-Player::disable_audio ()
-{
-	_audio = false;
-}
-
-bool
-Player::pass ()
+Player::setup_pieces ()
 {
-	if (!_have_valid_pieces) {
-		setup_pieces ();
-	}
+	list<shared_ptr<Piece> > old_pieces = _pieces;
+	_pieces.clear ();
 
-	Time earliest_t = TIME_MAX;
-	shared_ptr<Piece> earliest;
-	enum {
-		VIDEO,
-		AUDIO
-	} type = VIDEO;
+	BOOST_FOREACH (shared_ptr<Content> i, _playlist->content ()) {
 
-	for (list<shared_ptr<Piece> >::iterator i = _pieces.begin(); i != _pieces.end(); ++i) {
-		if ((*i)->decoder->done () || (*i)->content->length_after_trim() == 0) {
+		if (!i->paths_valid ()) {
 			continue;
 		}
 
-		shared_ptr<VideoDecoder> vd = dynamic_pointer_cast<VideoDecoder> ((*i)->decoder);
-		shared_ptr<AudioDecoder> ad = dynamic_pointer_cast<AudioDecoder> ((*i)->decoder);
+		shared_ptr<Decoder> decoder;
+		optional<FrameRateChange> frc;
 
-		if (_video && vd) {
-			if ((*i)->video_position < earliest_t) {
-				earliest_t = (*i)->video_position;
-				earliest = *i;
-				type = VIDEO;
-			}
+		/* FFmpeg */
+		shared_ptr<const FFmpegContent> fc = dynamic_pointer_cast<const FFmpegContent> (i);
+		if (fc) {
+			decoder.reset (new FFmpegDecoder (fc, _film->log(), _fast));
+			frc = FrameRateChange (fc->video_frame_rate(), _film->video_frame_rate());
 		}
 
-		if (_audio && ad && ad->has_audio ()) {
-			if ((*i)->audio_position < earliest_t) {
-				earliest_t = (*i)->audio_position;
-				earliest = *i;
-				type = AUDIO;
-			}
+		shared_ptr<const DCPContent> dc = dynamic_pointer_cast<const DCPContent> (i);
+		if (dc) {
+			decoder.reset (new DCPDecoder (dc, _fast));
+			frc = FrameRateChange (dc->video_frame_rate(), _film->video_frame_rate());
 		}
-	}
 
-	if (!earliest) {
-		flush ();
-		return true;
-	}
+		/* ImageContent */
+		shared_ptr<const ImageContent> ic = dynamic_pointer_cast<const ImageContent> (i);
+		if (ic) {
+			/* 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<ImageDecoder> imd = dynamic_pointer_cast<ImageDecoder> ((*j)->decoder);
+				if (imd && imd->content() == ic) {
+					decoder = imd;
+				}
+			}
 
-	switch (type) {
-	case VIDEO:
-		if (earliest_t > _video_position) {
-			emit_black ();
-		} else {
-			if (earliest->repeating ()) {
-				earliest->repeat (this);
-			} else {
-				earliest->decoder->pass ();
+			if (!decoder) {
+				decoder.reset (new ImageDecoder (ic));
 			}
+
+			frc = FrameRateChange (ic->video_frame_rate(), _film->video_frame_rate());
 		}
-		break;
-
-	case AUDIO:
-		if (earliest_t > _audio_position) {
-			emit_silence (_film->time_to_audio_frames (earliest_t - _audio_position));
-		} 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() * ac->output_audio_frame_rate() / ac->content_audio_frame_rate(),
-							true
-							);
-					}
+
+		/* SndfileContent */
+		shared_ptr<const SndfileContent> sc = dynamic_pointer_cast<const SndfileContent> (i);
+		if (sc) {
+			decoder.reset (new SndfileDecoder (sc, _fast));
+
+			/* Work out a FrameRateChange for the best overlap video for this content */
+			DCPTime best_overlap_t;
+			shared_ptr<VideoContent> best_overlap;
+			BOOST_FOREACH (shared_ptr<Content> j, _playlist->content ()) {
+				shared_ptr<VideoContent> vc = dynamic_pointer_cast<VideoContent> (j);
+				if (!vc) {
+					continue;
 				}
-			}
-		}
-		break;
-	}
 
-	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;
+				DCPTime const overlap = min (vc->end(), i->end()) - max (vc->position(), i->position());
+				if (overlap > best_overlap_t) {
+					best_overlap = vc;
+					best_overlap_t = overlap;
+				}
 			}
 
-			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 (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 ());
 			}
 		}
 
-		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 ImageProxy> image, Eyes eyes, Part part, 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.part = part;
-	_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;
-	}
-
-	shared_ptr<VideoContent> content = dynamic_pointer_cast<VideoContent> (piece->content);
-	assert (content);
+		/* It's questionable whether subtitle content should have a video frame rate; perhaps
+		   it should be assumed that any subtitle content has been prepared at the same rate
+		   as simultaneous video content (like we do with audio).
+		*/
 
-	FrameRateChange frc (content->video_frame_rate(), _film->video_frame_rate());
-	if (frc.skip && (frame % 2) == 1) {
-		return;
-	}
+		/* SubRipContent */
+		shared_ptr<const SubRipContent> rc = dynamic_pointer_cast<const SubRipContent> (i);
+		if (rc) {
+			decoder.reset (new SubRipDecoder (rc));
+			frc = FrameRateChange (rc->subtitle_video_frame_rate(), _film->video_frame_rate());
+		}
 
-	Time const relative_time = (frame * frc.factor() * TIME_HZ / _film->video_frame_rate());
-	if (content->trimmed (relative_time)) {
-		return;
-	}
+		/* DCPSubtitleContent */
+		shared_ptr<const DCPSubtitleContent> dsc = dynamic_pointer_cast<const DCPSubtitleContent> (i);
+		if (dsc) {
+			decoder.reset (new DCPSubtitleDecoder (dsc));
+			frc = FrameRateChange (dsc->subtitle_video_frame_rate(), _film->video_frame_rate());
+		}
 
-	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<VideoDecoder> vd = dynamic_pointer_cast<VideoDecoder> (decoder);
+		if (vd && _ignore_video) {
+			vd->set_ignore_video ();
+		}
 
-	shared_ptr<PlayerVideoFrame> pi (
-		new PlayerVideoFrame (
-			image,
-			content->crop(),
-			image_size,
-			_video_container_size,
-			_film->scaler(),
-			eyes,
-			part,
-			content->colour_conversion()
-			)
-		);
-	
-	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);
-			}
+		shared_ptr<AudioDecoder> ad = dynamic_pointer_cast<AudioDecoder> (decoder);
+		if (ad && _ignore_audio) {
+			ad->set_ignore_audio ();
 		}
+
+		_pieces.push_back (shared_ptr<Piece> (new Piece (i, decoder, frc.get ())));
 	}
 
-	/* 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);
-		}
+	_have_valid_pieces = true;
+}
 
-		i = j;
+void
+Player::playlist_content_changed (weak_ptr<Content> w, int property, bool frequent)
+{
+	shared_ptr<Content> c = w.lock ();
+	if (!c) {
+		return;
 	}
 
-#ifdef DCPOMATIC_DEBUG
-	_last_video = piece->content;
-#endif
+	if (
+		property == ContentProperty::POSITION ||
+		property == ContentProperty::LENGTH ||
+		property == ContentProperty::TRIM_START ||
+		property == ContentProperty::TRIM_END ||
+		property == ContentProperty::PATH ||
+		property == VideoContentProperty::VIDEO_FRAME_TYPE ||
+		property == DCPContentProperty::CAN_BE_PLAYED
+		) {
 
-	Video (pi, same, time);
+		_have_valid_pieces = false;
+		Changed (frequent);
 
-	_last_emit_was_black = false;
-	_video_position = piece->video_position = (time + TIME_HZ / _film->video_frame_rate());
+	} else if (
+		property == SubtitleContentProperty::USE_SUBTITLES ||
+		property == SubtitleContentProperty::SUBTITLE_X_OFFSET ||
+		property == SubtitleContentProperty::SUBTITLE_Y_OFFSET ||
+		property == SubtitleContentProperty::SUBTITLE_X_SCALE ||
+		property == SubtitleContentProperty::SUBTITLE_Y_SCALE ||
+		property == SubtitleContentProperty::FONTS ||
+		property == VideoContentProperty::VIDEO_CROP ||
+		property == VideoContentProperty::VIDEO_SCALE ||
+		property == VideoContentProperty::VIDEO_FRAME_RATE ||
+		property == VideoContentProperty::VIDEO_FADE_IN ||
+		property == VideoContentProperty::VIDEO_FADE_OUT ||
+		property == VideoContentProperty::COLOUR_CONVERSION
+		) {
 
-	if (frc.repeat > 1 && !piece->repeating ()) {
-		piece->set_repeat (_last_incoming_video, frc.repeat - 1);
+		Changed (frequent);
 	}
 }
 
-/** @param already_resampled true if this data has already been through the chain up to the resampler */
 void
-Player::process_audio (weak_ptr<Piece> weak_piece, shared_ptr<const AudioBuffers> audio, AudioContent::Frame frame, bool already_resampled)
+Player::set_video_container_size (dcp::Size s)
 {
-	shared_ptr<Piece> piece = weak_piece.lock ();
-	if (!piece) {
-		return;
-	}
+	_video_container_size = s;
 
-	shared_ptr<AudioContent> content = dynamic_pointer_cast<AudioContent> (piece->content);
-	assert (content);
+	_black_image.reset (new Image (PIX_FMT_RGB24, _video_container_size, true));
+	_black_image->make_black ();
+}
 
-	if (!already_resampled) {
-		/* 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);
-			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);
+void
+Player::playlist_changed ()
+{
+	_have_valid_pieces = false;
+	Changed (false);
+}
 
-	if (content->trimmed (relative_time)) {
-		return;
-	}
+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.
+	*/
 
-	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 ();
-
-	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))
-					);
-			}
+	if (p == Film::CONTAINER) {
+		Changed (false);
+	} else if (p == Film::VIDEO_FRAME_RATE) {
+		/* Pieces contain a FrameRateChange which contains the DCP frame rate,
+		   so we need new pieces here.
+		*/
+		_have_valid_pieces = false;
+		Changed (false);
+	} else if (p == Film::AUDIO_PROCESSOR) {
+		if (_film->audio_processor ()) {
+			_audio_processor = _film->audio_processor()->clone (_film->audio_frame_rate ());
 		}
 	}
+}
 
-	audio = dcp_mapped;
+list<PositionImage>
+Player::transform_image_subtitles (list<ImageSubtitle> subs) const
+{
+	list<PositionImage> all;
 
-	/* 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 ()) {
-			return;
+	for (list<ImageSubtitle>::const_iterator i = subs.begin(); i != subs.end(); ++i) {
+		if (!i->image) {
+			continue;
 		}
 
-		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;
+		/* We will scale the subtitle up to fit _video_container_size */
+		dcp::Size scaled_size (i->rectangle.width * _video_container_size.width, i->rectangle.height * _video_container_size.height);
+
+		/* 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_x_scale) / 2) and
+		 *     (height_before_subtitle_scale * (1 - subtitle_y_scale) / 2).
+		 *
+		 * Combining these two translations gives these expressions.
+		 */
+
+		all.push_back (
+			PositionImage (
+				i->image->scale (
+					scaled_size,
+					dcp::YUV_TO_RGB_REC601,
+					i->image->pixel_format (),
+					true
+					),
+				Position<int> (
+					lrint (_video_container_size.width * i->rectangle.x),
+					lrint (_video_container_size.height * i->rectangle.y)
+					)
+				)
+			);
 	}
 
-	_audio_merger.push (audio, time);
-	piece->audio_position += _film->audio_frames_to_time (audio->frames ());
+	return all;
 }
 
-void
-Player::flush ()
+shared_ptr<PlayerVideo>
+Player::black_player_video_frame (DCPTime time) const
 {
-	TimedAudioBuffers<Time> tb = _audio_merger.flush ();
-	if (_audio && tb.audio) {
-		Audio (tb.audio, tb.time);
-		_audio_position += _film->audio_frames_to_time (tb.audio->frames ());
-	}
-
-	while (_video && _video_position < _audio_position) {
-		emit_black ();
-	}
-
-	while (_audio && _audio_position < _video_position) {
-		emit_silence (_film->time_to_audio_frames (_video_position - _audio_position));
-	}
-	
+	return shared_ptr<PlayerVideo> (
+		new PlayerVideo (
+			shared_ptr<const ImageProxy> (new RawImageProxy (_black_image)),
+			time,
+			Crop (),
+			optional<double> (),
+			_video_container_size,
+			_video_container_size,
+			EYES_BOTH,
+			PART_WHOLE,
+			PresetColourConversion::all().front().conversion
+		)
+	);
 }
 
-/** 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
+/** @return All PlayerVideos at the given time.  There may be none if the content
+ *  at `time' is a DCP which we are passing through (i.e. referring to by reference)
+ *  or 2 if we have 3D.
  */
-void
-Player::seek (Time t, bool accurate)
+list<shared_ptr<PlayerVideo> >
+Player::get_video (DCPTime time, bool accurate)
 {
 	if (!_have_valid_pieces) {
 		setup_pieces ();
 	}
 
-	if (_pieces.empty ()) {
-		return;
+	/* Find subtitles for possible burn-in */
+
+	PlayerSubtitles ps = get_subtitles (time, DCPTime::from_frames (1, _film->video_frame_rate ()), false, true);
+
+	list<PositionImage> sub_images;
+
+	/* Image subtitles */
+	list<PositionImage> c = transform_image_subtitles (ps.image);
+	copy (c.begin(), c.end(), back_inserter (sub_images));
+
+	/* Text subtitles (rendered to an image) */
+	if (!ps.text.empty ()) {
+		list<PositionImage> s = render_subtitles (ps.text, ps.fonts, _video_container_size);
+		copy (s.begin (), s.end (), back_inserter (sub_images));
 	}
 
-	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;
-		}
+	optional<PositionImage> subtitles;
+	if (!sub_images.empty ()) {
+		subtitles = merge (sub_images);
+	}
+
+	/* Find pieces containing video which is happening now */
 
-		/* 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);
+	list<shared_ptr<Piece> > ov = overlaps<VideoContent> (
+		time,
+		time + DCPTime::from_frames (1, _film->video_frame_rate ()) - DCPTime::delta()
+		);
 
-		/* Hence set the piece positions to the `global' time */
-		(*i)->video_position = (*i)->audio_position = vc->position() + s;
+	list<shared_ptr<PlayerVideo> > pvf;
 
-		/* And seek the decoder */
-		dynamic_pointer_cast<VideoDecoder>((*i)->decoder)->seek (
-			vc->time_to_content_video_frames (s + vc->trim_start ()), accurate
-			);
+	if (ov.empty ()) {
+		/* No video content at this time */
+		pvf.push_back (black_player_video_frame (time));
+	} else {
+		/* Some video content at this time */
+		shared_ptr<Piece> last = *(ov.rbegin ());
+		VideoFrameType const last_type = dynamic_pointer_cast<VideoContent> (last->content)->video_frame_type ();
+
+		/* Get video from appropriate piece(s) */
+		BOOST_FOREACH (shared_ptr<Piece> piece, ov) {
+
+			shared_ptr<VideoDecoder> decoder = dynamic_pointer_cast<VideoDecoder> (piece->decoder);
+			DCPOMATIC_ASSERT (decoder);
+			shared_ptr<VideoContent> video_content = dynamic_pointer_cast<VideoContent> (piece->content);
+			DCPOMATIC_ASSERT (video_content);
+
+			shared_ptr<DCPContent> dcp_content = dynamic_pointer_cast<DCPContent> (video_content);
+			if (dcp_content && dcp_content->reference_video () && !_play_referenced) {
+				continue;
+			}
 
-		(*i)->reset_repeat ();
+			bool const use =
+				/* always use the last video */
+				piece == last ||
+				/* with a corresponding L/R eye if appropriate */
+				(last_type == VIDEO_FRAME_TYPE_3D_LEFT && video_content->video_frame_type() == VIDEO_FRAME_TYPE_3D_RIGHT) ||
+				(last_type == VIDEO_FRAME_TYPE_3D_RIGHT && video_content->video_frame_type() == VIDEO_FRAME_TYPE_3D_LEFT);
+
+			if (use) {
+				/* We want to use this piece */
+				list<ContentVideo> content_video = decoder->get_video (dcp_to_content_video (piece, time), accurate);
+				if (content_video.empty ()) {
+					pvf.push_back (black_player_video_frame (time));
+				} else {
+					dcp::Size image_size = video_content->scale().size (video_content, _video_container_size, _film->frame_size ());
+
+					for (list<ContentVideo>::const_iterator i = content_video.begin(); i != content_video.end(); ++i) {
+						pvf.push_back (
+							shared_ptr<PlayerVideo> (
+								new PlayerVideo (
+									i->image,
+									content_video_to_dcp (piece, i->frame),
+									video_content->crop (),
+									video_content->fade (i->frame),
+									image_size,
+									_video_container_size,
+									i->eyes,
+									i->part,
+									video_content->colour_conversion ()
+									)
+								)
+							);
+					}
+				}
+			} else {
+				/* Discard unused video */
+				decoder->get_video (dcp_to_content_video (piece, time), accurate);
+			}
+		}
 	}
 
-	_video_position = _audio_position = t;
+	if (subtitles) {
+		BOOST_FOREACH (shared_ptr<PlayerVideo> p, pvf) {
+			p->set_subtitle (subtitles.get ());
+		}
+	}
 
-	/* XXX: don't seek audio because we don't need to... */
+	return pvf;
 }
 
-void
-Player::setup_pieces ()
+/** @return Audio data or 0 if the only audio data here is referenced DCP data */
+shared_ptr<AudioBuffers>
+Player::get_audio (DCPTime time, DCPTime length, bool accurate)
 {
-	list<shared_ptr<Piece> > old_pieces = _pieces;
+	if (!_have_valid_pieces) {
+		setup_pieces ();
+	}
 
-	_pieces.clear ();
+	Frame const length_frames = length.frames_round (_film->audio_frame_rate ());
 
-	ContentList content = _playlist->content ();
-	sort (content.begin(), content.end(), ContentSorter ());
+	shared_ptr<AudioBuffers> audio (new AudioBuffers (_film->audio_channels(), length_frames));
+	audio->make_silent ();
 
-	for (ContentList::iterator i = content.begin(); i != content.end(); ++i) {
+	list<shared_ptr<Piece> > ov = overlaps<AudioContent> (time, time + length);
+	if (ov.empty ()) {
+		return audio;
+	}
 
-		if (!(*i)->paths_valid ()) {
-			continue;
+	bool all_referenced = true;
+	BOOST_FOREACH (shared_ptr<Piece> i, ov) {
+		shared_ptr<AudioContent> audio_content = dynamic_pointer_cast<AudioContent> (i->content);
+		shared_ptr<DCPContent> dcp_content = dynamic_pointer_cast<DCPContent> (i->content);
+		if (audio_content && (!dcp_content || !dcp_content->reference_audio ())) {
+			/* There is audio content which is not from a DCP or not set to be referenced */
+			all_referenced = false;
 		}
+	}
 
-		shared_ptr<Piece> piece (new Piece (*i));
-
-		/* XXX: into content? */
+	if (all_referenced && !_play_referenced) {
+		return shared_ptr<AudioBuffers> ();
+	}
 
-		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, weak_ptr<Piece> (piece), _1, _2, _3, _4, _5, 0));
-			fd->Audio.connect (bind (&Player::process_audio, this, weak_ptr<Piece> (piece), _1, _2, false));
-			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;
+	BOOST_FOREACH (shared_ptr<Piece> i, ov) {
+
+		shared_ptr<AudioContent> content = dynamic_pointer_cast<AudioContent> (i->content);
+		DCPOMATIC_ASSERT (content);
+		shared_ptr<AudioDecoder> decoder = dynamic_pointer_cast<AudioDecoder> (i->decoder);
+		DCPOMATIC_ASSERT (decoder);
+
+		/* The time that we should request from the content */
+		DCPTime request = time - DCPTime::from_seconds (content->audio_delay() / 1000.0);
+		Frame request_frames = length_frames;
+		DCPTime offset;
+		if (request < DCPTime ()) {
+			/* We went off the start of the content, so we will need to offset
+			   the stuff we get back.
+			*/
+			offset = -request;
+			request_frames += request.frames_round (_film->audio_frame_rate ());
+			if (request_frames < 0) {
+				request_frames = 0;
+			}
+			request = DCPTime ();
 		}
-		
-		shared_ptr<const ImageContent> ic = dynamic_pointer_cast<const ImageContent> (*i);
-		if (ic) {
-			bool reusing = false;
-			
-			/* 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<ImageDecoder> imd = dynamic_pointer_cast<ImageDecoder> ((*j)->decoder);
-				if (imd && imd->content() == ic) {
-					piece = *j;
-					reusing = true;
+
+		Frame const content_frame = dcp_to_resampled_audio (i, request);
+
+		BOOST_FOREACH (AudioStreamPtr j, content->audio_streams ()) {
+
+			if (j->channels() == 0) {
+				/* Some content (e.g. DCPs) can have streams with no channels */
+				continue;
+			}
+
+			/* Audio from this piece's decoder stream (which might be more or less than what we asked for) */
+			ContentAudio all = decoder->get_audio (j, content_frame, request_frames, accurate);
+
+			/* Gain */
+			if (content->audio_gain() != 0) {
+				shared_ptr<AudioBuffers> gain (new AudioBuffers (all.audio));
+				gain->apply_gain (content->audio_gain ());
+				all.audio = gain;
+			}
+
+			/* Remap channels */
+			shared_ptr<AudioBuffers> dcp_mapped (new AudioBuffers (_film->audio_channels(), all.audio->frames()));
+			dcp_mapped->make_silent ();
+			AudioMapping map = j->mapping ();
+			for (int i = 0; i < map.input_channels(); ++i) {
+				for (int j = 0; j < _film->audio_channels(); ++j) {
+					if (map.get (i, j) > 0) {
+						dcp_mapped->accumulate_channel (
+							all.audio.get(),
+							i,
+							j,
+							map.get (i, j)
+							);
+					}
 				}
 			}
 
-			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, _5, 0));
-				piece->decoder = id;
+			if (_audio_processor) {
+				dcp_mapped = _audio_processor->run (dcp_mapped, _film->audio_channels ());
 			}
-		}
 
-		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, weak_ptr<Piece> (piece), _1, _2, false));
+			all.audio = dcp_mapped;
 
-			piece->decoder = sd;
+			audio->accumulate_frames (
+				all.audio.get(),
+				content_frame - all.frame,
+				offset.frames_round (_film->audio_frame_rate()),
+				min (Frame (all.audio->frames()), request_frames)
+				);
 		}
-
-		_pieces.push_back (piece);
 	}
 
-	_have_valid_pieces = true;
+	return audio;
 }
 
-void
-Player::content_changed (weak_ptr<Content> w, int property, bool frequent)
+Frame
+Player::dcp_to_content_video (shared_ptr<const Piece> piece, DCPTime t) const
 {
-	shared_ptr<Content> c = w.lock ();
-	if (!c) {
-		return;
-	}
+	shared_ptr<const VideoContent> vc = dynamic_pointer_cast<const VideoContent> (piece->content);
+	DCPTime s = t - piece->content->position ();
+	s = min (piece->content->length_after_trim(), s);
+	s = max (DCPTime(), s + DCPTime (piece->content->trim_start(), piece->frc));
 
-	if (
-		property == ContentProperty::POSITION || property == ContentProperty::LENGTH ||
-		property == ContentProperty::TRIM_START || property == ContentProperty::TRIM_END ||
-		property == VideoContentProperty::VIDEO_FRAME_TYPE 
-		) {
-		
-		_have_valid_pieces = false;
-		Changed (frequent);
+	/* It might seem more logical here to convert s to a ContentTime (using the FrameRateChange)
+	   then convert that ContentTime to frames at the content's rate.  However this fails for
+	   situations like content at 29.9978733fps, DCP at 30fps.  The accuracy of the Time type is not
+	   enough to distinguish between the two with low values of time (e.g. 3200 in Time units).
 
-	} else if (
-		property == SubtitleContentProperty::SUBTITLE_X_OFFSET ||
-		property == SubtitleContentProperty::SUBTITLE_Y_OFFSET ||
-		property == SubtitleContentProperty::SUBTITLE_X_SCALE ||
-		property == SubtitleContentProperty::SUBTITLE_Y_SCALE
-		) {
-
-		for (list<Subtitle>::iterator i = _subtitles.begin(); i != _subtitles.end(); ++i) {
-			i->update (_film, _video_container_size);
-		}
-		
-		Changed (frequent);
+	   Instead we convert the DCPTime using the DCP video rate then account for any skip/repeat.
+	*/
+	return s.frames_floor (piece->frc.dcp) / piece->frc.factor ();
+}
 
-	} else if (
-		property == VideoContentProperty::VIDEO_CROP || property == VideoContentProperty::VIDEO_SCALE ||
-		property == VideoContentProperty::VIDEO_FRAME_RATE
-		) {
-		
-		Changed (frequent);
+DCPTime
+Player::content_video_to_dcp (shared_ptr<const Piece> piece, Frame f) const
+{
+	shared_ptr<const VideoContent> vc = dynamic_pointer_cast<const VideoContent> (piece->content);
+	/* 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 ());
+}
 
-	} else if (property == ContentProperty::PATH) {
+Frame
+Player::dcp_to_resampled_audio (shared_ptr<const Piece> piece, DCPTime t) const
+{
+	DCPTime s = t - piece->content->position ();
+	s = min (piece->content->length_after_trim(), s);
+	/* See notes in dcp_to_content_video */
+	return max (DCPTime (), DCPTime (piece->content->trim_start (), piece->frc) + s).frames_floor (_film->audio_frame_rate ());
+}
 
-		_have_valid_pieces = false;
-		Changed (frequent);
-	}
+ContentTime
+Player::dcp_to_content_subtitle (shared_ptr<const Piece> piece, DCPTime t) const
+{
+	DCPTime s = t - piece->content->position ();
+	s = min (piece->content->length_after_trim(), s);
+	return max (ContentTime (), ContentTime (s, piece->frc) + piece->content->trim_start());
 }
 
-void
-Player::playlist_changed ()
+DCPTime
+Player::content_subtitle_to_dcp (shared_ptr<const Piece> piece, ContentTime t) const
 {
-	_have_valid_pieces = false;
-	Changed (false);
+	return max (DCPTime (), DCPTime (t - piece->content->trim_start(), piece->frc) + piece->content->position());
 }
 
-void
-Player::set_video_container_size (libdcp::Size s)
+/** @param burnt true to return only subtitles to be burnt, false to return only
+ *  subtitles that should not be burnt.  This parameter will be ignored if
+ *  _always_burn_subtitles is true; in this case, all subtitles will be returned.
+ */
+PlayerSubtitles
+Player::get_subtitles (DCPTime time, DCPTime length, bool starting, bool burnt)
 {
-	_video_container_size = s;
+	list<shared_ptr<Piece> > subs = overlaps<SubtitleContent> (time, time + length);
 
-	shared_ptr<Image> im (new Image (PIX_FMT_RGB24, _video_container_size, true));
-	im->make_black ();
-	
-	_black_frame.reset (
-		new PlayerVideoFrame (
-			shared_ptr<ImageProxy> (new RawImageProxy (im, _film->log ())),
-			Crop(),
-			_video_container_size,
-			_video_container_size,
-			Scaler::from_id ("bicubic"),
-			EYES_BOTH,
-			PART_WHOLE,
-			ColourConversion ()
-			)
-		);
+	PlayerSubtitles ps (time, length);
+
+	for (list<shared_ptr<Piece> >::const_iterator j = subs.begin(); j != subs.end(); ++j) {
+		shared_ptr<SubtitleContent> subtitle_content = dynamic_pointer_cast<SubtitleContent> ((*j)->content);
+		if (!subtitle_content->use_subtitles () || (!_always_burn_subtitles && (burnt != subtitle_content->burn_subtitles ()))) {
+			continue;
+		}
+
+		shared_ptr<DCPContent> dcp_content = dynamic_pointer_cast<DCPContent> (subtitle_content);
+		if (dcp_content && dcp_content->reference_subtitle () && !_play_referenced) {
+			continue;
+		}
+
+		shared_ptr<SubtitleDecoder> subtitle_decoder = dynamic_pointer_cast<SubtitleDecoder> ((*j)->decoder);
+		ContentTime const from = dcp_to_content_subtitle (*j, time);
+		/* XXX: this video_frame_rate() should be the rate that the subtitle content has been prepared for */
+		ContentTime const to = from + ContentTime::from_frames (1, _film->video_frame_rate ());
+
+		list<ContentImageSubtitle> image = subtitle_decoder->get_image_subtitles (ContentTimePeriod (from, to), starting);
+		for (list<ContentImageSubtitle>::iterator i = image.begin(); i != image.end(); ++i) {
+
+			/* Apply content's subtitle offsets */
+			i->sub.rectangle.x += subtitle_content->subtitle_x_offset ();
+			i->sub.rectangle.y += subtitle_content->subtitle_y_offset ();
+
+			/* Apply content's subtitle scale */
+			i->sub.rectangle.width *= subtitle_content->subtitle_x_scale ();
+			i->sub.rectangle.height *= subtitle_content->subtitle_y_scale ();
+
+			/* Apply a corrective translation to keep the subtitle centred after that scale */
+			i->sub.rectangle.x -= i->sub.rectangle.width * (subtitle_content->subtitle_x_scale() - 1);
+			i->sub.rectangle.y -= i->sub.rectangle.height * (subtitle_content->subtitle_y_scale() - 1);
+
+			ps.image.push_back (i->sub);
+		}
+
+		list<ContentTextSubtitle> text = subtitle_decoder->get_text_subtitles (ContentTimePeriod (from, to), starting);
+		BOOST_FOREACH (ContentTextSubtitle& ts, text) {
+			BOOST_FOREACH (dcp::SubtitleString s, ts.subs) {
+				s.set_h_position (s.h_position() + subtitle_content->subtitle_x_offset ());
+				s.set_v_position (s.v_position() + subtitle_content->subtitle_y_offset ());
+				float const xs = subtitle_content->subtitle_x_scale();
+				float const ys = subtitle_content->subtitle_y_scale();
+				float const average = s.size() * (xs + ys) / 2;
+				s.set_size (average);
+				if (fabs (1.0 - xs / ys) > dcp::ASPECT_ADJUST_EPSILON) {
+					s.set_aspect_adjust (xs / ys);
+				}
+				s.set_in (dcp::Time(content_subtitle_to_dcp (*j, ts.period().from).seconds()));
+				s.set_out (dcp::Time(content_subtitle_to_dcp (*j, ts.period().to).seconds()));
+				ps.text.push_back (s);
+				ps.add_fonts (subtitle_content->fonts ());
+			}
+		}
+	}
+
+	return ps;
 }
 
-shared_ptr<Resampler>
-Player::resampler (shared_ptr<AudioContent> c, bool create)
+list<shared_ptr<Font> >
+Player::get_subtitle_fonts ()
 {
-	map<shared_ptr<AudioContent>, shared_ptr<Resampler> >::iterator i = _resamplers.find (c);
-	if (i != _resamplers.end ()) {
-		return i->second;
+	if (!_have_valid_pieces) {
+		setup_pieces ();
 	}
 
-	if (!create) {
-		return shared_ptr<Resampler> ();
+	list<shared_ptr<Font> > fonts;
+	BOOST_FOREACH (shared_ptr<Piece>& p, _pieces) {
+		shared_ptr<SubtitleContent> sc = dynamic_pointer_cast<SubtitleContent> (p->content);
+		if (sc) {
+			/* XXX: things may go wrong if there are duplicate font IDs
+			   with different font files.
+			*/
+			list<shared_ptr<Font> > f = sc->fonts ();
+			copy (f.begin(), f.end(), back_inserter (fonts));
+		}
 	}
 
-	LOG_GENERAL (
-		"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;
-	return r;
+	return fonts;
 }
 
+/** Set this player never to produce any video data */
 void
-Player::emit_black ()
+Player::set_ignore_video ()
 {
-#ifdef DCPOMATIC_DEBUG
-	_last_video.reset ();
-#endif
-
-	Video (_black_frame, _last_emit_was_black, _video_position);
-	_video_position += _film->video_frames_to_time (1);
-	_last_emit_was_black = true;
+	_ignore_video = true;
 }
 
+/** Set this player never to produce any audio data */
 void
-Player::emit_silence (OutputAudioFrame most)
+Player::set_ignore_audio ()
 {
-	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 ();
-	Audio (silence, _audio_position);
-	_audio_position += _film->audio_frames_to_time (N);
+	_ignore_audio = 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.
+ */
 void
-Player::film_changed (Film::Property p)
+Player::set_always_burn_subtitles (bool burn)
 {
-	/* 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.
-	*/
+	_always_burn_subtitles = burn;
+}
 
-	if (p == Film::SCALER || p == Film::WITH_SUBTITLES || p == Film::CONTAINER || p == Film::VIDEO_FRAME_RATE) {
-		Changed (false);
-	}
+void
+Player::set_fast ()
+{
+	_fast = true;
+	_have_valid_pieces = false;
 }
 
 void
-Player::process_subtitle (weak_ptr<Piece> weak_piece, shared_ptr<Image> image, dcpomatic::Rect<double> rect, Time from, Time to)
+Player::set_play_referenced ()
 {
-	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));
-	}
+	_play_referenced = true;
+	_have_valid_pieces = false;
 }
 
-/** 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 ()
+list<shared_ptr<dcp::ReelAsset> >
+Player::get_reel_assets ()
 {
-	if (!_last_incoming_video.image || !_have_valid_pieces) {
-		return false;
-	}
+	list<shared_ptr<dcp::ReelAsset> > a;
 
-	process_video (
-		_last_incoming_video.weak_piece,
-		_last_incoming_video.image,
-		_last_incoming_video.eyes,
-		_last_incoming_video.part,
-		_last_incoming_video.same,
-		_last_incoming_video.frame,
-		_last_incoming_video.extra
-		);
+	BOOST_FOREACH (shared_ptr<Content> i, _playlist->content ()) {
+		shared_ptr<DCPContent> j = dynamic_pointer_cast<DCPContent> (i);
+		if (!j) {
+			continue;
+		}
+		/* XXX: hack hack hack */
+		DCPDecoder decoder (j, false);
+		if (j->reference_video ()) {
+			a.push_back (decoder.reels().front()->main_picture ());
+		}
+		if (j->reference_audio ()) {
+			a.push_back (decoder.reels().front()->main_sound ());
+		}
+		if (j->reference_subtitle ()) {
+			a.push_back (decoder.reels().front()->main_subtitle ());
+		}
+	}
 
-	return true;
+	return a;
 }