X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplayer.cc;h=0c513056c56e45ddc1e301d001da346862de7401;hb=4ee6786d1c3db04dcc77e511121e5d62d0d595b5;hp=fabb5b21134b00bf2898237f867f5edbbeaa385d;hpb=985a83ffbf251db481150221914ef74fbfe549b2;p=dcpomatic.git

diff --git a/src/lib/player.cc b/src/lib/player.cc
index fabb5b211..0c513056c 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-2016 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
@@ -20,23 +20,25 @@
 #include "player.h"
 #include "film.h"
 #include "ffmpeg_decoder.h"
+#include "video_decoder.h"
+#include "audio_decoder.h"
 #include "audio_buffers.h"
+#include "audio_content.h"
 #include "ffmpeg_content.h"
 #include "image_decoder.h"
+#include "content_audio.h"
 #include "image_content.h"
-#include "sndfile_decoder.h"
-#include "sndfile_content.h"
 #include "subtitle_content.h"
-#include "subrip_decoder.h"
-#include "subrip_content.h"
+#include "text_subtitle_decoder.h"
+#include "text_subtitle_content.h"
+#include "video_mxf_decoder.h"
+#include "video_mxf_content.h"
 #include "dcp_content.h"
-#include "playlist.h"
 #include "job.h"
 #include "image.h"
 #include "raw_image_proxy.h"
 #include "ratio.h"
 #include "log.h"
-#include "scaler.h"
 #include "render_subtitles.h"
 #include "config.h"
 #include "content_video.h"
@@ -46,11 +48,21 @@
 #include "dcp_decoder.h"
 #include "dcp_subtitle_content.h"
 #include "dcp_subtitle_decoder.h"
+#include "audio_processor.h"
+#include "playlist.h"
+#include "referenced_reel_asset.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>
 
-#define LOG_GENERAL(...) _film->log()->log (String::compose (__VA_ARGS__), Log::TYPE_GENERAL);
+#include "i18n.h"
+
+#define LOG_GENERAL(...) _film->log()->log (String::compose (__VA_ARGS__), LogEntry::TYPE_GENERAL);
 
 using std::list;
 using std::cout;
@@ -61,21 +73,47 @@ 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;
+using boost::scoped_ptr;
 
-Player::Player (shared_ptr<const Film> f, shared_ptr<const Playlist> p)
-	: _film (f)
-	, _playlist (p)
+static bool
+has_video (Content* c)
+{
+	return static_cast<bool>(c->video);
+}
+
+static bool
+has_audio (Content* c)
+{
+	return static_cast<bool>(c->audio);
+}
+
+static bool
+has_subtitle (Content* c)
+{
+	return static_cast<bool>(c->subtitle);
+}
+
+Player::Player (shared_ptr<const Film> film, shared_ptr<const Playlist> playlist)
+	: _film (film)
+	, _playlist (playlist)
 	, _have_valid_pieces (false)
-	, _approximate_size (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 ());
+
+	film_changed (Film::AUDIO_PROCESSOR);
 }
 
 void
@@ -84,56 +122,30 @@ Player::setup_pieces ()
 	list<shared_ptr<Piece> > old_pieces = _pieces;
 	_pieces.clear ();
 
-	ContentList content = _playlist->content ();
-
-	for (ContentList::iterator i = content.begin(); i != content.end(); ++i) {
+	BOOST_FOREACH (shared_ptr<Content> i, _playlist->content ()) {
 
-		if (!(*i)->paths_valid ()) {
+		if (!i->paths_valid ()) {
 			continue;
 		}
-		
+
 		shared_ptr<Decoder> decoder;
 		optional<FrameRateChange> frc;
 
-		/* Work out a FrameRateChange for the best overlap video for this content, in case we need it below */
-		DCPTime best_overlap_t;
-		shared_ptr<VideoContent> best_overlap;
-		for (ContentList::iterator j = content.begin(); j != content.end(); ++j) {
-			shared_ptr<VideoContent> vc = dynamic_pointer_cast<VideoContent> (*j);
-			if (!vc) {
-				continue;
-			}
-			
-			DCPTime const overlap = max (vc->position(), (*i)->position()) - min (vc->end(), (*i)->end());
-			if (overlap > best_overlap_t) {
-				best_overlap = vc;
-				best_overlap_t = overlap;
-			}
-		}
-
-		optional<FrameRateChange> best_overlap_frc;
-		if (best_overlap) {
-			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 */
-			best_overlap_frc = FrameRateChange (_film->video_frame_rate(), _film->video_frame_rate ());
-		}
-
 		/* FFmpeg */
-		shared_ptr<const FFmpegContent> fc = dynamic_pointer_cast<const FFmpegContent> (*i);
+		shared_ptr<const FFmpegContent> fc = dynamic_pointer_cast<const FFmpegContent> (i);
 		if (fc) {
-			decoder.reset (new FFmpegDecoder (fc, _film->log()));
-			frc = FrameRateChange (fc->video_frame_rate(), _film->video_frame_rate());
+			decoder.reset (new FFmpegDecoder (fc, _film->log(), _fast));
+			frc = FrameRateChange (fc->active_video_frame_rate(), _film->video_frame_rate());
 		}
 
-		shared_ptr<const DCPContent> dc = dynamic_pointer_cast<const DCPContent> (*i);
+		shared_ptr<const DCPContent> dc = dynamic_pointer_cast<const DCPContent> (i);
 		if (dc) {
-			decoder.reset (new DCPDecoder (dc));
-			frc = FrameRateChange (dc->video_frame_rate(), _film->video_frame_rate());
+			decoder.reset (new DCPDecoder (dc, _film->log(), _fast));
+			frc = FrameRateChange (dc->active_video_frame_rate(), _film->video_frame_rate());
 		}
 
 		/* ImageContent */
-		shared_ptr<const ImageContent> ic = dynamic_pointer_cast<const ImageContent> (*i);
+		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) {
@@ -144,41 +156,56 @@ Player::setup_pieces ()
 			}
 
 			if (!decoder) {
-				decoder.reset (new ImageDecoder (ic));
+				decoder.reset (new ImageDecoder (ic, _film->log()));
 			}
 
-			frc = FrameRateChange (ic->video_frame_rate(), _film->video_frame_rate());
+			frc = FrameRateChange (ic->active_video_frame_rate(), _film->video_frame_rate());
 		}
 
-		/* SndfileContent */
-		shared_ptr<const SndfileContent> sc = dynamic_pointer_cast<const SndfileContent> (*i);
-		if (sc) {
-			decoder.reset (new SndfileDecoder (sc));
-			frc = best_overlap_frc;
-		}
+		/* 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).
+		*/
 
-		/* SubRipContent */
-		shared_ptr<const SubRipContent> rc = dynamic_pointer_cast<const SubRipContent> (*i);
+		/* TextSubtitleContent */
+		shared_ptr<const TextSubtitleContent> rc = dynamic_pointer_cast<const TextSubtitleContent> (i);
 		if (rc) {
-			decoder.reset (new SubRipDecoder (rc));
-			frc = best_overlap_frc;
+			decoder.reset (new TextSubtitleDecoder (rc));
+			frc = FrameRateChange (rc->active_video_frame_rate(), _film->video_frame_rate());
 		}
 
 		/* DCPSubtitleContent */
-		shared_ptr<const DCPSubtitleContent> dsc = dynamic_pointer_cast<const DCPSubtitleContent> (*i);
+		shared_ptr<const DCPSubtitleContent> dsc = dynamic_pointer_cast<const DCPSubtitleContent> (i);
 		if (dsc) {
 			decoder.reset (new DCPSubtitleDecoder (dsc));
-			frc = best_overlap_frc;
+			frc = FrameRateChange (dsc->active_video_frame_rate(), _film->video_frame_rate());
 		}
 
-		_pieces.push_back (shared_ptr<Piece> (new Piece (*i, decoder, frc.get ())));
+		/* VideoMXFContent */
+		shared_ptr<const VideoMXFContent> vmc = dynamic_pointer_cast<const VideoMXFContent> (i);
+		if (vmc) {
+			decoder.reset (new VideoMXFDecoder (vmc, _film->log()));
+			frc = FrameRateChange (vmc->active_video_frame_rate(), _film->video_frame_rate());
+		}
+
+		DCPOMATIC_ASSERT (decoder);
+
+		if (decoder->video && _ignore_video) {
+			decoder->video->set_ignore ();
+		}
+
+		if (decoder->audio && _ignore_audio) {
+			decoder->audio->set_ignore ();
+		}
+
+		_pieces.push_back (shared_ptr<Piece> (new Piece (i, decoder, frc.get ())));
 	}
 
 	_have_valid_pieces = true;
 }
 
 void
-Player::content_changed (weak_ptr<Content> w, int property, bool frequent)
+Player::playlist_content_changed (weak_ptr<Content> w, int property, bool frequent)
 {
 	shared_ptr<Content> c = w.lock ();
 	if (!c) {
@@ -191,45 +218,52 @@ Player::content_changed (weak_ptr<Content> w, int property, bool frequent)
 		property == ContentProperty::TRIM_START ||
 		property == ContentProperty::TRIM_END ||
 		property == ContentProperty::PATH ||
-		property == VideoContentProperty::VIDEO_FRAME_TYPE ||
-		property == DCPContentProperty::CAN_BE_PLAYED
+		property == VideoContentProperty::FRAME_TYPE ||
+		property == DCPContentProperty::CAN_BE_PLAYED ||
+		property == SubtitleContentProperty::COLOUR ||
+		property == SubtitleContentProperty::OUTLINE ||
+		property == SubtitleContentProperty::OUTLINE_COLOUR ||
+		property == FFmpegContentProperty::SUBTITLE_STREAM
 		) {
-		
+
 		_have_valid_pieces = false;
 		Changed (frequent);
 
 	} 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 == VideoContentProperty::VIDEO_CROP ||
-		property == VideoContentProperty::VIDEO_SCALE ||
-		property == VideoContentProperty::VIDEO_FRAME_RATE
+		property == ContentProperty::VIDEO_FRAME_RATE ||
+		property == SubtitleContentProperty::USE ||
+		property == SubtitleContentProperty::X_OFFSET ||
+		property == SubtitleContentProperty::Y_OFFSET ||
+		property == SubtitleContentProperty::X_SCALE ||
+		property == SubtitleContentProperty::Y_SCALE ||
+		property == SubtitleContentProperty::FONTS ||
+		property == VideoContentProperty::CROP ||
+		property == VideoContentProperty::SCALE ||
+		property == VideoContentProperty::FADE_IN ||
+		property == VideoContentProperty::FADE_OUT ||
+		property == VideoContentProperty::COLOUR_CONVERSION
 		) {
-		
+
 		Changed (frequent);
 	}
 }
 
-/** @param already_resampled true if this data has already been through the chain up to the resampler */
-void
-Player::playlist_changed ()
-{
-	_have_valid_pieces = false;
-	Changed (false);
-}
-
 void
 Player::set_video_container_size (dcp::Size s)
 {
 	_video_container_size = s;
 
-	_black_image.reset (new Image (PIX_FMT_RGB24, _video_container_size, true));
+	_black_image.reset (new Image (AV_PIX_FMT_RGB24, _video_container_size, true));
 	_black_image->make_black ();
 }
 
+void
+Player::playlist_changed ()
+{
+	_have_valid_pieces = false;
+	Changed (false);
+}
+
 void
 Player::film_changed (Film::Property p)
 {
@@ -238,8 +272,18 @@ Player::film_changed (Film::Property p)
 	   last time we were run.
 	*/
 
-	if (p == Film::SCALER || p == Film::CONTAINER || p == Film::VIDEO_FRAME_RATE) {
+	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 ());
+		}
 	}
 }
 
@@ -247,7 +291,7 @@ list<PositionImage>
 Player::transform_image_subtitles (list<ImageSubtitle> subs) const
 {
 	list<PositionImage> all;
-	
+
 	for (list<ImageSubtitle>::const_iterator i = subs.begin(); i != subs.end(); ++i) {
 		if (!i->image) {
 			continue;
@@ -255,7 +299,7 @@ Player::transform_image_subtitles (list<ImageSubtitle> subs) const
 
 		/* 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
@@ -272,13 +316,14 @@ Player::transform_image_subtitles (list<ImageSubtitle> subs) const
 			PositionImage (
 				i->image->scale (
 					scaled_size,
-					Scaler::from_id ("bicubic"),
+					dcp::YUV_TO_RGB_REC601,
 					i->image->pixel_format (),
-					true
+					true,
+					_fast
 					),
 				Position<int> (
-					rint (_video_container_size.width * i->rectangle.x),
-					rint (_video_container_size.height * i->rectangle.y)
+					lrint (_video_container_size.width * i->rectangle.x),
+					lrint (_video_container_size.height * i->rectangle.y)
 					)
 				)
 			);
@@ -287,12 +332,6 @@ Player::transform_image_subtitles (list<ImageSubtitle> subs) const
 	return all;
 }
 
-void
-Player::set_approximate_size ()
-{
-	_approximate_size = true;
-}
-
 shared_ptr<PlayerVideo>
 Player::black_player_video_frame (DCPTime time) const
 {
@@ -301,28 +340,54 @@ Player::black_player_video_frame (DCPTime time) const
 			shared_ptr<const ImageProxy> (new RawImageProxy (_black_image)),
 			time,
 			Crop (),
-			optional<float> (),
+			optional<double> (),
 			_video_container_size,
 			_video_container_size,
-			Scaler::from_id ("bicubic"),
 			EYES_BOTH,
 			PART_WHOLE,
-			Config::instance()->colour_conversions().front().conversion
+			PresetColourConversion::all().front().conversion
 		)
 	);
 }
 
-/** @return All PlayerVideos at the given time (there may be two frames for 3D) */
+/** @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.
+ */
 list<shared_ptr<PlayerVideo> >
 Player::get_video (DCPTime time, bool accurate)
 {
 	if (!_have_valid_pieces) {
 		setup_pieces ();
 	}
-	
-	list<shared_ptr<Piece> > ov = overlaps<VideoContent> (
+
+	/* Find subtitles for possible burn-in */
+
+	PlayerSubtitles ps = get_subtitles (time, DCPTime::from_frames (1, _film->video_frame_rate ()), false, true, accurate);
+
+	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));
+	}
+
+	optional<PositionImage> subtitles;
+	if (!sub_images.empty ()) {
+		subtitles = merge (sub_images);
+	}
+
+	/* Find pieces containing video which is happening now */
+
+	list<shared_ptr<Piece> > ov = overlaps (
 		time,
-		time + DCPTime::from_frames (1, _film->video_frame_rate ())
+		time + DCPTime::from_frames (1, _film->video_frame_rate ()),
+		&has_video
 		);
 
 	list<shared_ptr<PlayerVideo> > pvf;
@@ -331,68 +396,73 @@ Player::get_video (DCPTime time, bool accurate)
 		/* No video content at this time */
 		pvf.push_back (black_player_video_frame (time));
 	} else {
-		/* Create a PlayerVideo from the content's video at this time */
-
-		shared_ptr<Piece> piece = ov.back ();
-		shared_ptr<VideoDecoder> decoder = dynamic_pointer_cast<VideoDecoder> (piece->decoder);
-		assert (decoder);
-		shared_ptr<VideoContent> content = dynamic_pointer_cast<VideoContent> (piece->content);
-		assert (content);
-
-		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));
-			return pvf;
-		}
-		
-		dcp::Size image_size = content->scale().size (content, _video_container_size, _film->frame_size (), _approximate_size ? 4 : 1);
-		if (_approximate_size) {
-			image_size.width &= ~3;
-			image_size.height &= ~3;
-		}
-		
-		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),
-						content->crop (),
-						content->fade (i->frame),
-						image_size,
-						_video_container_size,
-						_film->scaler(),
-						i->eyes,
-						i->part,
-						content->colour_conversion ()
-						)
-					)
-				);
-		}
-	}
+		/* Some video content at this time */
+		shared_ptr<Piece> last = *(ov.rbegin ());
+		VideoFrameType const last_type = last->content->video->frame_type ();
 
-	/* Add subtitles (for possible burn-in) to whatever PlayerVideos we got */
+		/* Get video from appropriate piece(s) */
+		BOOST_FOREACH (shared_ptr<Piece> piece, ov) {
 
-	PlayerSubtitles ps = get_subtitles (time, DCPTime::from_frames (1, _film->video_frame_rate ()), false);
+			shared_ptr<VideoDecoder> decoder = piece->decoder->video;
+			DCPOMATIC_ASSERT (decoder);
 
-	list<PositionImage> sub_images;
+			shared_ptr<DCPContent> dcp_content = dynamic_pointer_cast<DCPContent> (piece->content);
+			if (dcp_content && dcp_content->reference_video () && !_play_referenced) {
+				continue;
+			}
 
-	/* Image subtitles */
-	list<PositionImage> c = transform_image_subtitles (ps.image);
-	copy (c.begin(), c.end(), back_inserter (sub_images));
+			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 && piece->content->video->frame_type() == VIDEO_FRAME_TYPE_3D_RIGHT) ||
+				(last_type == VIDEO_FRAME_TYPE_3D_RIGHT && piece->content->video->frame_type() == VIDEO_FRAME_TYPE_3D_LEFT);
+
+			if (use) {
+				/* We want to use this piece */
+				list<ContentVideo> content_video = decoder->get (dcp_to_content_video (piece, time), accurate);
+				if (content_video.empty ()) {
+					pvf.push_back (black_player_video_frame (time));
+				} else {
+					dcp::Size image_size = piece->content->video->scale().size (
+						piece->content->video, _video_container_size, _film->frame_size ()
+						);
 
-	/* Text subtitles (rendered to images) */
-	sub_images.push_back (render_subtitles (ps.text, _video_container_size));
-	
-	if (!sub_images.empty ()) {
-		for (list<shared_ptr<PlayerVideo> >::const_iterator i = pvf.begin(); i != pvf.end(); ++i) {
-			(*i)->set_subtitle (merge (sub_images));
+					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),
+									piece->content->video->crop (),
+									piece->content->video->fade (i->frame),
+									image_size,
+									_video_container_size,
+									i->eyes,
+									i->part,
+									piece->content->video->colour_conversion ()
+									)
+								)
+							);
+					}
+				}
+			} else {
+				/* Discard unused video */
+				decoder->get (dcp_to_content_video (piece, time), accurate);
+			}
+		}
+	}
+
+	if (subtitles) {
+		BOOST_FOREACH (shared_ptr<PlayerVideo> p, pvf) {
+			p->set_subtitle (subtitles.get ());
 		}
-	}	
-		
+	}
+
 	return pvf;
 }
 
+/** @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)
 {
@@ -400,187 +470,358 @@ Player::get_audio (DCPTime time, DCPTime length, bool accurate)
 		setup_pieces ();
 	}
 
-	AudioFrame const length_frames = length.frames (_film->audio_frame_rate ());
+	Frame const length_frames = length.frames_round (_film->audio_frame_rate ());
 
 	shared_ptr<AudioBuffers> audio (new AudioBuffers (_film->audio_channels(), length_frames));
 	audio->make_silent ();
-	
-	list<shared_ptr<Piece> > ov = overlaps<AudioContent> (time, time + length);
+
+	list<shared_ptr<Piece> > ov = overlaps (time, time + length, has_audio);
 	if (ov.empty ()) {
 		return audio;
 	}
 
-	for (list<shared_ptr<Piece> >::iterator i = ov.begin(); i != ov.end(); ++i) {
+	bool all_referenced = true;
+	BOOST_FOREACH (shared_ptr<Piece> i, ov) {
+		shared_ptr<DCPContent> dcp_content = dynamic_pointer_cast<DCPContent> (i->content);
+		if (i->content->audio && (!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<AudioContent> content = dynamic_pointer_cast<AudioContent> ((*i)->content);
-		assert (content);
-		shared_ptr<AudioDecoder> decoder = dynamic_pointer_cast<AudioDecoder> ((*i)->decoder);
-		assert (decoder);
+	if (all_referenced && !_play_referenced) {
+		return shared_ptr<AudioBuffers> ();
+	}
 
-		if (content->audio_frame_rate() == 0) {
-			/* This AudioContent has no audio (e.g. if it is an FFmpegContent with no
-			 * audio stream).
-			 */
-			continue;
-		}
+	BOOST_FOREACH (shared_ptr<Piece> i, ov) {
+
+		DCPOMATIC_ASSERT (i->content->audio);
+		shared_ptr<AudioDecoder> decoder = i->decoder->audio;
+		DCPOMATIC_ASSERT (decoder);
 
 		/* The time that we should request from the content */
-		DCPTime request = time - DCPTime::from_seconds (content->audio_delay() / 1000.0);
+		DCPTime request = time - DCPTime::from_seconds (i->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 ();
 		}
 
-		AudioFrame const content_frame = dcp_to_content_audio (*i, request);
+		Frame const content_frame = dcp_to_resampled_audio (i, request);
 
-		/* Audio from this piece's decoder (which might be more or less than what we asked for) */
-		shared_ptr<ContentAudio> all = decoder->get_audio (content_frame, length_frames, accurate);
+		BOOST_FOREACH (AudioStreamPtr j, i->content->audio->streams ()) {
 
-		/* Gain */
-		if (content->audio_gain() != 0) {
-			shared_ptr<AudioBuffers> gain (new AudioBuffers (all->audio));
-			gain->apply_gain (content->audio_gain ());
-			all->audio = gain;
-		}
+			if (j->channels() == 0) {
+				/* Some content (e.g. DCPs) can have streams with no channels */
+				continue;
+			}
 
-		/* Remap channels */
-		shared_ptr<AudioBuffers> dcp_mapped (new AudioBuffers (_film->audio_channels(), all->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<dcp::Channel> (j)) > 0) {
-					dcp_mapped->accumulate_channel (
-						all->audio.get(),
-						i,
-						j,
-						map.get (i, static_cast<dcp::Channel> (j))
-						);
+			/* Audio from this piece's decoder stream (which might be more or less than what we asked for) */
+			ContentAudio all = decoder->get (j, content_frame, request_frames, accurate);
+
+			/* Gain */
+			if (i->content->audio->gain() != 0) {
+				shared_ptr<AudioBuffers> gain (new AudioBuffers (all.audio));
+				gain->apply_gain (i->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 (_audio_processor) {
+				dcp_mapped = _audio_processor->run (dcp_mapped, _film->audio_channels ());
+			}
+
+			all.audio = dcp_mapped;
+
+			audio->accumulate_frames (
+				all.audio.get(),
+				content_frame - all.frame,
+				offset.frames_round (_film->audio_frame_rate()),
+				min (Frame (all.audio->frames()), request_frames)
+				);
 		}
-		
-		all->audio = dcp_mapped;
-
-		audio->accumulate_frames (
-			all->audio.get(),
-			content_frame - all->frame,
-			offset.frames (_film->audio_frame_rate()),
-			min (AudioFrame (all->audio->frames()), length_frames) - offset.frames (_film->audio_frame_rate ())
-			);
 	}
 
 	return audio;
 }
 
-VideoFrame
+Frame
 Player::dcp_to_content_video (shared_ptr<const Piece> piece, DCPTime t) const
 {
-	/* s is the offset of t from the start position of this content */
 	DCPTime s = t - piece->content->position ();
-	s = DCPTime (max (DCPTime::Type (0), s.get ()));
-	s = DCPTime (min (piece->content->length_after_trim().get(), s.get()));
+	s = min (piece->content->length_after_trim(), s);
+	s = max (DCPTime(), s + DCPTime (piece->content->trim_start(), piece->frc));
 
-	/* Convert this to the content frame */
-	return DCPTime (s + piece->content->trim_start()).frames (_film->video_frame_rate()) * piece->frc.factor ();
+	/* 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).
+
+	   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 ();
 }
 
 DCPTime
-Player::content_video_to_dcp (shared_ptr<const Piece> piece, VideoFrame f) const
+Player::content_video_to_dcp (shared_ptr<const Piece> piece, Frame f) const
 {
-	DCPTime t = DCPTime::from_frames (f / piece->frc.factor (), _film->video_frame_rate()) - piece->content->trim_start () + piece->content->position ();
-	if (t < DCPTime ()) {
-		t = DCPTime ();
-	}
-
-	return t;
+	/* 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 ());
 }
 
-AudioFrame
-Player::dcp_to_content_audio (shared_ptr<const Piece> piece, DCPTime t) const
+Frame
+Player::dcp_to_resampled_audio (shared_ptr<const Piece> piece, DCPTime t) const
 {
-	/* s is the offset of t from the start position of this content */
 	DCPTime s = t - piece->content->position ();
-	s = DCPTime (max (DCPTime::Type (0), s.get ()));
-	s = DCPTime (min (piece->content->length_after_trim().get(), s.get()));
-
-	/* Convert this to the content frame */
-	return DCPTime (s + piece->content->trim_start()).frames (_film->audio_frame_rate());
+	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 ());
 }
 
 ContentTime
 Player::dcp_to_content_subtitle (shared_ptr<const Piece> piece, DCPTime t) const
 {
-	/* s is the offset of t from the start position of this content */
 	DCPTime s = t - piece->content->position ();
-	s = DCPTime (max (DCPTime::Type (0), s.get ()));
-	s = DCPTime (min (piece->content->length_after_trim().get(), s.get()));
-
-	return ContentTime (s + piece->content->trim_start(), piece->frc);
-}
-
-void
-PlayerStatistics::dump (shared_ptr<Log> log) const
-{
-	log->log (String::compose ("Video: %1 good %2 skipped %3 black %4 repeat", video.good, video.skip, video.black, video.repeat), Log::TYPE_GENERAL);
-	log->log (String::compose ("Audio: %1 good %2 skipped %3 silence", audio.good, audio.skip, audio.silence.seconds()), Log::TYPE_GENERAL);
+	s = min (piece->content->length_after_trim(), s);
+	return max (ContentTime (), ContentTime (s, piece->frc) + piece->content->trim_start());
 }
 
-PlayerStatistics const &
-Player::statistics () const
+DCPTime
+Player::content_subtitle_to_dcp (shared_ptr<const Piece> piece, ContentTime t) const
 {
-	return _statistics;
+	return max (DCPTime (), DCPTime (t - piece->content->trim_start(), piece->frc) + piece->content->position());
 }
 
+/** @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)
+Player::get_subtitles (DCPTime time, DCPTime length, bool starting, bool burnt, bool accurate)
 {
-	list<shared_ptr<Piece> > subs = overlaps<SubtitleContent> (time, time + length);
+	list<shared_ptr<Piece> > subs = overlaps (time, time + length, has_subtitle);
 
 	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 ()) {
+		if (!(*j)->content->subtitle->use () || (!_always_burn_subtitles && (burnt != (*j)->content->subtitle->burn ()))) {
 			continue;
 		}
 
-		shared_ptr<SubtitleDecoder> subtitle_decoder = dynamic_pointer_cast<SubtitleDecoder> ((*j)->decoder);
+		shared_ptr<DCPContent> dcp_content = dynamic_pointer_cast<DCPContent> ((*j)->content);
+		if (dcp_content && dcp_content->reference_subtitle () && !_play_referenced) {
+			continue;
+		}
+
+		shared_ptr<SubtitleDecoder> subtitle_decoder = (*j)->decoder->subtitle;
 		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);
+		list<ContentImageSubtitle> image = subtitle_decoder->get_image (ContentTimePeriod (from, to), starting, accurate);
 		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 ();
+			i->sub.rectangle.x += (*j)->content->subtitle->x_offset ();
+			i->sub.rectangle.y += (*j)->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 ();
+			i->sub.rectangle.width *= (*j)->content->subtitle->x_scale ();
+			i->sub.rectangle.height *= (*j)->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);
-			
+			i->sub.rectangle.x -= i->sub.rectangle.width * ((*j)->content->subtitle->x_scale() - 1);
+			i->sub.rectangle.y -= i->sub.rectangle.height * ((*j)->content->subtitle->y_scale() - 1);
+
 			ps.image.push_back (i->sub);
 		}
 
-		list<ContentTextSubtitle> text = subtitle_decoder->get_text_subtitles (ContentTimePeriod (from, to), starting);
+		list<ContentTextSubtitle> text = subtitle_decoder->get_text (ContentTimePeriod (from, to), starting, accurate);
 		BOOST_FOREACH (ContentTextSubtitle& ts, text) {
-			BOOST_FOREACH (dcp::SubtitleString& s, ts.subs) {
-				s.set_v_position (s.v_position() + subtitle_content->subtitle_y_offset ());
-				s.set_size (s.size() * max (subtitle_content->subtitle_x_scale(), subtitle_content->subtitle_y_scale()));
+			BOOST_FOREACH (dcp::SubtitleString s, ts.subs) {
+				s.set_h_position (s.h_position() + (*j)->content->subtitle->x_offset ());
+				s.set_v_position (s.v_position() + (*j)->content->subtitle->y_offset ());
+				float const xs = (*j)->content->subtitle->x_scale();
+				float const ys = (*j)->content->subtitle->y_scale();
+				float size = s.size();
+
+				/* Adjust size to express the common part of the scaling;
+				   e.g. if xs = ys = 0.5 we scale size by 2.
+				*/
+				if (xs > 1e-5 && ys > 1e-5) {
+					size *= 1 / min (1 / xs, 1 / ys);
+				}
+				s.set_size (size);
+
+				/* Then express aspect ratio changes */
+				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(), 1000));
+				s.set_out (dcp::Time(content_subtitle_to_dcp (*j, ts.period().to).seconds(), 1000));
 				ps.text.push_back (s);
+				ps.add_fonts ((*j)->content->subtitle->fonts ());
 			}
 		}
 	}
 
 	return ps;
 }
+
+list<shared_ptr<Font> >
+Player::get_subtitle_fonts ()
+{
+	if (!_have_valid_pieces) {
+		setup_pieces ();
+	}
+
+	list<shared_ptr<Font> > fonts;
+	BOOST_FOREACH (shared_ptr<Piece>& p, _pieces) {
+		if (p->content->subtitle) {
+			/* XXX: things may go wrong if there are duplicate font IDs
+			   with different font files.
+			*/
+			list<shared_ptr<Font> > f = p->content->subtitle->fonts ();
+			copy (f.begin(), f.end(), back_inserter (fonts));
+		}
+	}
+
+	return fonts;
+}
+
+/** Set this player never to produce any video data */
+void
+Player::set_ignore_video ()
+{
+	_ignore_video = true;
+}
+
+/** Set this player never to produce any audio data */
+void
+Player::set_ignore_audio ()
+{
+	_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::set_always_burn_subtitles (bool burn)
+{
+	_always_burn_subtitles = burn;
+}
+
+void
+Player::set_fast ()
+{
+	_fast = true;
+	_have_valid_pieces = false;
+}
+
+void
+Player::set_play_referenced ()
+{
+	_play_referenced = true;
+	_have_valid_pieces = false;
+}
+
+list<ReferencedReelAsset>
+Player::get_reel_assets ()
+{
+	list<ReferencedReelAsset> a;
+
+	BOOST_FOREACH (shared_ptr<Content> i, _playlist->content ()) {
+		shared_ptr<DCPContent> j = dynamic_pointer_cast<DCPContent> (i);
+		if (!j) {
+			continue;
+		}
+
+		scoped_ptr<DCPDecoder> decoder;
+		try {
+			decoder.reset (new DCPDecoder (j, _film->log(), false));
+		} catch (...) {
+			return a;
+		}
+
+		int64_t offset = 0;
+		BOOST_FOREACH (shared_ptr<dcp::Reel> k, decoder->reels()) {
+			DCPTime const from = i->position() + DCPTime::from_frames (offset, _film->video_frame_rate());
+			if (j->reference_video ()) {
+				a.push_back (
+					ReferencedReelAsset (
+						k->main_picture (),
+						DCPTimePeriod (from, from + DCPTime::from_frames (k->main_picture()->duration(), _film->video_frame_rate()))
+						)
+					);
+			}
+
+			if (j->reference_audio ()) {
+				a.push_back (
+					ReferencedReelAsset (
+						k->main_sound (),
+						DCPTimePeriod (from, from + DCPTime::from_frames (k->main_sound()->duration(), _film->video_frame_rate()))
+						)
+					);
+			}
+
+			if (j->reference_subtitle ()) {
+				DCPOMATIC_ASSERT (k->main_subtitle ());
+				a.push_back (
+					ReferencedReelAsset (
+						k->main_subtitle (),
+						DCPTimePeriod (from, from + DCPTime::from_frames (k->main_subtitle()->duration(), _film->video_frame_rate()))
+						)
+					);
+			}
+
+			/* Assume that main picture duration is the length of the reel */
+			offset += k->main_picture()->duration ();
+		}
+	}
+
+	return a;
+}
+
+list<shared_ptr<Piece> >
+Player::overlaps (DCPTime from, DCPTime to, boost::function<bool (Content *)> valid)
+{
+	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);
+		}
+	}
+
+	return overlaps;
+}