Reword again: Text -> Caption and Plain -> Text.
[dcpomatic.git] / src / lib / player.cc
index d2ef1a5fffa6a6d61a6b47e187bd743a291a4f7a..a7cd0fd94ce93bf402b2ac152d4f9842c09f694e 100644 (file)
@@ -1,58 +1,65 @@
 /*
-    Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2018 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
 #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 "subrip_decoder.h"
-#include "subrip_content.h"
+#include "content_audio.h"
 #include "dcp_content.h"
 #include "job.h"
 #include "image.h"
 #include "raw_image_proxy.h"
 #include "ratio.h"
 #include "log.h"
-#include "render_subtitles.h"
+#include "render_text.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 "referenced_reel_asset.h"
+#include "decoder_factory.h"
+#include "decoder.h"
+#include "video_decoder.h"
+#include "audio_decoder.h"
+#include "text_content.h"
+#include "text_decoder.h"
+#include "ffmpeg_content.h"
+#include "audio_content.h"
+#include "dcp_decoder.h"
+#include "image_decoder.h"
+#include "compose.hpp"
+#include "shuffler.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;
@@ -68,13 +75,25 @@ using boost::shared_ptr;
 using boost::weak_ptr;
 using boost::dynamic_pointer_cast;
 using boost::optional;
+using boost::scoped_ptr;
+
+int const PlayerProperty::VIDEO_CONTAINER_SIZE = 700;
+int const PlayerProperty::PLAYLIST = 701;
+int const PlayerProperty::FILM_CONTAINER = 702;
+int const PlayerProperty::FILM_VIDEO_FRAME_RATE = 703;
+int const PlayerProperty::DCP_DECODE_REDUCTION = 704;
 
 Player::Player (shared_ptr<const Film> film, shared_ptr<const Playlist> playlist)
        : _film (film)
        , _playlist (playlist)
        , _have_valid_pieces (false)
        , _ignore_video (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));
@@ -82,107 +101,92 @@ Player::Player (shared_ptr<const Film> film, shared_ptr<const Playlist> playlist
        set_video_container_size (_film->frame_size ());
 
        film_changed (Film::AUDIO_PROCESSOR);
+
+       seek (DCPTime (), true);
+}
+
+Player::~Player ()
+{
+       delete _shuffler;
 }
 
 void
 Player::setup_pieces ()
 {
-       list<shared_ptr<Piece> > old_pieces = _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;
-               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;
-               BOOST_FOREACH (shared_ptr<Content> j, _playlist->content ()) {
-                       shared_ptr<VideoContent> vc = dynamic_pointer_cast<VideoContent> (j);
-                       if (!vc) {
-                               continue;
-                       }
+               shared_ptr<Decoder> decoder = decoder_factory (i, _film->log(), _fast);
+               FrameRateChange frc (i->active_video_frame_rate(), _film->video_frame_rate());
 
-                       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;
-                       }
+               if (!decoder) {
+                       /* Not something that we can decode; e.g. Atmos content */
+                       continue;
                }
 
-               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 ());
+               if (decoder->video && _ignore_video) {
+                       decoder->video->set_ignore (true);
                }
 
-               /* FFmpeg */
-               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());
+               if (decoder->subtitle && _ignore_subtitle) {
+                       decoder->subtitle->set_ignore (true);
                }
 
-               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());
+               shared_ptr<DCPDecoder> dcp = dynamic_pointer_cast<DCPDecoder> (decoder);
+               if (dcp) {
+                       dcp->set_decode_referenced (_play_referenced);
+                       if (_play_referenced) {
+                               dcp->set_forced_reduction (_dcp_decode_reduction);
+                       }
                }
 
-               /* 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;
-                               }
-                       }
+               shared_ptr<Piece> piece (new Piece (i, decoder, frc));
+               _pieces.push_back (piece);
 
-                       if (!decoder) {
-                               decoder.reset (new ImageDecoder (ic));
+               if (decoder->video) {
+                       if (i->video->frame_type() == VIDEO_FRAME_TYPE_3D_LEFT || i->video->frame_type() == VIDEO_FRAME_TYPE_3D_RIGHT) {
+                               /* We need a Shuffler to cope with 3D L/R video data arriving out of sequence */
+                               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));
                        }
-
-                       frc = FrameRateChange (ic->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;
                }
 
-               /* SubRipContent */
-               shared_ptr<const SubRipContent> rc = dynamic_pointer_cast<const SubRipContent> (i);
-               if (rc) {
-                       decoder.reset (new SubRipDecoder (rc));
-                       frc = best_overlap_frc;
+               if (decoder->audio) {
+                       decoder->audio->Data.connect (bind (&Player::audio, this, weak_ptr<Piece> (piece), _1, _2));
                }
 
-               /* DCPSubtitleContent */
-               shared_ptr<const DCPSubtitleContent> dsc = dynamic_pointer_cast<const DCPSubtitleContent> (i);
-               if (dsc) {
-                       decoder.reset (new DCPSubtitleDecoder (dsc));
-                       frc = best_overlap_frc;
+               if (decoder->subtitle) {
+                       decoder->subtitle->BitmapStart.connect (bind (&Player::bitmap_text_start, this, weak_ptr<Piece> (piece), _1));
+                       decoder->subtitle->PlainStart.connect (bind (&Player::plain_text_start, this, weak_ptr<Piece> (piece), _1));
+                       decoder->subtitle->Stop.connect (bind (&Player::subtitle_stop, this, weak_ptr<Piece> (piece), _1, _2));
                }
+       }
 
-               shared_ptr<VideoDecoder> vd = dynamic_pointer_cast<VideoDecoder> (decoder);
-               if (vd && _ignore_video) {
-                       vd->set_ignore_video ();
+       _stream_states.clear ();
+       BOOST_FOREACH (shared_ptr<Piece> i, _pieces) {
+               if (i->content->audio) {
+                       BOOST_FOREACH (AudioStreamPtr j, i->content->audio->streams()) {
+                               _stream_states[j] = StreamState (i, i->content->position ());
+                       }
                }
-
-               _pieces.push_back (shared_ptr<Piece> (new Piece (i, decoder, frc.get ())));
        }
 
+       _black = Empty (_film->content(), _film->length(), bind(&Content::video, _1));
+       _silent = Empty (_film->content(), _film->length(), bind(&Content::audio, _1));
+
+       _last_video_time = DCPTime ();
+       _last_video_eyes = EYES_BOTH;
+       _last_audio_time = DCPTime ();
        _have_valid_pieces = true;
 }
 
@@ -200,46 +204,63 @@ Player::playlist_content_changed (weak_ptr<Content> w, int property, bool freque
                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 == VideoContentProperty::COLOUR_CONVERSION ||
+               property == AudioContentProperty::STREAMS ||
+               property == DCPContentProperty::NEEDS_ASSETS ||
+               property == DCPContentProperty::NEEDS_KDM ||
+               property == TextContentProperty::COLOUR ||
+               property == TextContentProperty::EFFECT ||
+               property == TextContentProperty::EFFECT_COLOUR ||
+               property == FFmpegContentProperty::SUBTITLE_STREAM ||
+               property == FFmpegContentProperty::FILTERS
                ) {
 
                _have_valid_pieces = false;
-               Changed (frequent);
+               Changed (property, 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 == 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
+               property == TextContentProperty::LINE_SPACING ||
+               property == TextContentProperty::OUTLINE_WIDTH ||
+               property == TextContentProperty::Y_SCALE ||
+               property == TextContentProperty::FADE_IN ||
+               property == TextContentProperty::FADE_OUT ||
+               property == ContentProperty::VIDEO_FRAME_RATE ||
+               property == TextContentProperty::USE ||
+               property == TextContentProperty::X_OFFSET ||
+               property == TextContentProperty::Y_OFFSET ||
+               property == TextContentProperty::X_SCALE ||
+               property == TextContentProperty::FONTS ||
+               property == VideoContentProperty::CROP ||
+               property == VideoContentProperty::SCALE ||
+               property == VideoContentProperty::FADE_IN ||
+               property == VideoContentProperty::FADE_OUT
                ) {
 
-               Changed (frequent);
+               Changed (property, frequent);
        }
 }
 
 void
 Player::set_video_container_size (dcp::Size s)
 {
+       if (s == _video_container_size) {
+               return;
+       }
+
        _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 ();
+
+       Changed (PlayerProperty::VIDEO_CONTAINER_SIZE, false);
 }
 
 void
 Player::playlist_changed ()
 {
        _have_valid_pieces = false;
-       Changed (false);
+       Changed (PlayerProperty::PLAYLIST, false);
 }
 
 void
@@ -250,21 +271,29 @@ Player::film_changed (Film::Property p)
           last time we were run.
        */
 
-       if (p == Film::CONTAINER || p == Film::VIDEO_FRAME_RATE) {
-               Changed (false);
+       if (p == Film::CONTAINER) {
+               Changed (PlayerProperty::FILM_CONTAINER, 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 (PlayerProperty::FILM_VIDEO_FRAME_RATE, false);
        } else if (p == Film::AUDIO_PROCESSOR) {
                if (_film->audio_processor ()) {
                        _audio_processor = _film->audio_processor()->clone (_film->audio_frame_rate ());
                }
+       } else if (p == Film::AUDIO_CHANNELS) {
+               _audio_merger.clear ();
        }
 }
 
 list<PositionImage>
-Player::transform_image_subtitles (list<ImageSubtitle> subs) const
+Player::transform_bitmap_texts (list<BitmapText> subs) const
 {
        list<PositionImage> all;
 
-       for (list<ImageSubtitle>::const_iterator i = subs.begin(); i != subs.end(); ++i) {
+       for (list<BitmapText>::const_iterator i = subs.begin(); i != subs.end(); ++i) {
                if (!i->image) {
                        continue;
                }
@@ -272,25 +301,14 @@ 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
-                *     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
+                                       true,
+                                       _fast
                                        ),
                                Position<int> (
                                        lrint (_video_container_size.width * i->rectangle.x),
@@ -304,353 +322,790 @@ Player::transform_image_subtitles (list<ImageSubtitle> subs) const
 }
 
 shared_ptr<PlayerVideo>
-Player::black_player_video_frame (DCPTime time) const
+Player::black_player_video_frame (Eyes eyes) const
 {
        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,
+                       eyes,
                        PART_WHOLE,
-                       PresetColourConversion::all().front().conversion
+                       PresetColourConversion::all().front().conversion,
+                       boost::weak_ptr<Content>(),
+                       boost::optional<Frame>()
                )
        );
 }
 
-/** @return All PlayerVideos at the given time (there may be two frames for 3D) */
-list<shared_ptr<PlayerVideo> >
-Player::get_video (DCPTime time, bool accurate)
+Frame
+Player::dcp_to_content_video (shared_ptr<const Piece> piece, DCPTime t) const
+{
+       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));
+
+       /* 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, 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 d + piece->content->position();
+}
+
+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 ());
+}
+
+DCPTime
+Player::resampled_audio_to_dcp (shared_ptr<const Piece> piece, Frame f) const
+{
+       /* See comment in dcp_to_content_video */
+       return DCPTime::from_frames (f, _film->audio_frame_rate())
+               - DCPTime (piece->content->trim_start(), piece->frc)
+               + piece->content->position();
+}
+
+ContentTime
+Player::dcp_to_content_time (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());
+}
+
+DCPTime
+Player::content_time_to_dcp (shared_ptr<const Piece> piece, ContentTime t) const
+{
+       return max (DCPTime (), DCPTime (t - piece->content->trim_start(), piece->frc) + piece->content->position());
+}
+
+list<shared_ptr<Font> >
+Player::get_subtitle_fonts ()
 {
        if (!_have_valid_pieces) {
                setup_pieces ();
        }
 
-       /* Find subtitles for possible burn-in */
+       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;
+}
 
-       PlayerSubtitles ps = get_subtitles (time, DCPTime::from_frames (1, _film->video_frame_rate ()), false, true);
+void
+Player::set_ignore_subtitle ()
+{
+       _ignore_subtitle = true;
+}
 
-       list<PositionImage> sub_images;
+/** 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;
+}
 
-       /* Image subtitles */
-       list<PositionImage> c = transform_image_subtitles (ps.image);
-       copy (c.begin(), c.end(), back_inserter (sub_images));
+/** Sets up the player to be faster, possibly at the expense of quality */
+void
+Player::set_fast ()
+{
+       _fast = true;
+       _have_valid_pieces = false;
+}
 
-       /* 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));
-       }
+void
+Player::set_play_referenced ()
+{
+       _play_referenced = true;
+       _have_valid_pieces = false;
+}
 
-       optional<PositionImage> subtitles;
-       if (!sub_images.empty ()) {
-               subtitles = merge (sub_images);
-       }
+list<ReferencedReelAsset>
+Player::get_reel_assets ()
+{
+       list<ReferencedReelAsset> a;
 
-       /* Find pieces containing video which is happening now */
+       BOOST_FOREACH (shared_ptr<Content> i, _playlist->content ()) {
+               shared_ptr<DCPContent> j = dynamic_pointer_cast<DCPContent> (i);
+               if (!j) {
+                       continue;
+               }
 
-       list<shared_ptr<Piece> > ov = overlaps<VideoContent> (
-               time,
-               time + DCPTime::from_frames (1, _film->video_frame_rate ()) - DCPTime::delta()
-               );
+               scoped_ptr<DCPDecoder> decoder;
+               try {
+                       decoder.reset (new DCPDecoder (j, _film->log(), false));
+               } catch (...) {
+                       return a;
+               }
 
-       list<shared_ptr<PlayerVideo> > pvf;
+               int64_t offset = 0;
+               BOOST_FOREACH (shared_ptr<dcp::Reel> k, decoder->reels()) {
+
+                       DCPOMATIC_ASSERT (j->video_frame_rate ());
+                       double const cfr = j->video_frame_rate().get();
+                       Frame const trim_start = j->trim_start().frames_round (cfr);
+                       Frame const trim_end = j->trim_end().frames_round (cfr);
+                       int const ffr = _film->video_frame_rate ();
+
+                       DCPTime const from = i->position() + DCPTime::from_frames (offset, _film->video_frame_rate());
+                       if (j->reference_video ()) {
+                               shared_ptr<dcp::ReelAsset> ra = k->main_picture ();
+                               DCPOMATIC_ASSERT (ra);
+                               ra->set_entry_point (ra->entry_point() + trim_start);
+                               ra->set_duration (ra->duration() - trim_start - trim_end);
+                               a.push_back (
+                                       ReferencedReelAsset (ra, DCPTimePeriod (from, from + DCPTime::from_frames (ra->duration(), ffr)))
+                                       );
+                       }
 
-       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);
-
-                       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);
+                       if (j->reference_audio ()) {
+                               shared_ptr<dcp::ReelAsset> ra = k->main_sound ();
+                               DCPOMATIC_ASSERT (ra);
+                               ra->set_entry_point (ra->entry_point() + trim_start);
+                               ra->set_duration (ra->duration() - trim_start - trim_end);
+                               a.push_back (
+                                       ReferencedReelAsset (ra, DCPTimePeriod (from, from + DCPTime::from_frames (ra->duration(), ffr)))
+                                       );
                        }
-               }
-       }
 
-       if (subtitles) {
-               BOOST_FOREACH (shared_ptr<PlayerVideo> p, pvf) {
-                       p->set_subtitle (subtitles.get ());
+                       if (j->reference_subtitle ()) {
+                               shared_ptr<dcp::ReelAsset> ra = k->main_subtitle ();
+                               DCPOMATIC_ASSERT (ra);
+                               ra->set_entry_point (ra->entry_point() + trim_start);
+                               ra->set_duration (ra->duration() - trim_start - trim_end);
+                               a.push_back (
+                                       ReferencedReelAsset (ra, DCPTimePeriod (from, from + DCPTime::from_frames (ra->duration(), ffr)))
+                                       );
+                       }
+
+                       /* Assume that main picture duration is the length of the reel */
+                       offset += k->main_picture()->duration ();
                }
        }
 
-       return pvf;
+       return a;
 }
 
-shared_ptr<AudioBuffers>
-Player::get_audio (DCPTime time, DCPTime length, bool accurate)
+bool
+Player::pass ()
 {
        if (!_have_valid_pieces) {
                setup_pieces ();
        }
 
-       Frame const length_frames = length.frames_round (_film->audio_frame_rate ());
+       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;
+       }
 
-       shared_ptr<AudioBuffers> audio (new AudioBuffers (_film->audio_channels(), length_frames));
-       audio->make_silent ();
+       /* Find the decoder or empty which is farthest behind where we are and make it emit some data */
 
-       list<shared_ptr<Piece> > ov = overlaps<AudioContent> (time, time + length);
-       if (ov.empty ()) {
-               return audio;
-       }
+       shared_ptr<Piece> earliest_content;
+       optional<DCPTime> earliest_time;
 
-       for (list<shared_ptr<Piece> >::iterator i = ov.begin(); i != ov.end(); ++i) {
+       BOOST_FOREACH (shared_ptr<Piece> i, _pieces) {
+               if (i->done) {
+                       continue;
+               }
 
-               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);
+               DCPTime const t = content_time_to_dcp (i, max(i->decoder->position(), i->content->trim_start()));
+               if (t > i->content->end()) {
+                       i->done = true;
+               } else {
 
-               /* 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.
+                       /* Given two choices at the same time, pick the one with a subtitle so we see it before
+                          the video.
                        */
-                       offset = -request;
-                       request_frames += request.frames_round (_film->audio_frame_rate ());
-                       if (request_frames < 0) {
-                               request_frames = 0;
+                       if (!earliest_time || t < *earliest_time || (t == *earliest_time && i->decoder->subtitle)) {
+                               earliest_time = t;
+                               earliest_content = i;
                        }
-                       request = DCPTime ();
                }
+       }
 
-               Frame const content_frame = dcp_to_resampled_audio (*i, request);
+       bool done = false;
 
-               BOOST_FOREACH (AudioStreamPtr j, content->audio_streams ()) {
+       enum {
+               NONE,
+               CONTENT,
+               BLACK,
+               SILENT
+       } which = NONE;
 
-                       if (j->channels() == 0) {
-                               /* Some content (e.g. DCPs) can have streams with no channels */
-                               continue;
-                       }
+       if (earliest_content) {
+               which = CONTENT;
+       }
 
-                       /* 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);
+       if (!_black.done() && (!earliest_time || _black.position() < *earliest_time)) {
+               earliest_time = _black.position ();
+               which = BLACK;
+       }
 
-                       /* Gain */
-                       if (content->audio_gain() != 0) {
-                               shared_ptr<AudioBuffers> gain (new AudioBuffers (all.audio));
-                               gain->apply_gain (content->audio_gain ());
-                               all.audio = gain;
-                       }
+       if (!_silent.done() && (!earliest_time || _silent.position() < *earliest_time)) {
+               earliest_time = _silent.position ();
+               which = SILENT;
+       }
 
-                       /* 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)
-                                                       );
-                                       }
-                               }
-                       }
+       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 (_last_audio_time) {
+                       /* Sometimes the thing that happened last finishes fractionally before
+                          this silence.  Bodge the start time of the silence to fix it.  I'm
+                          not sure if this is the right solution --- maybe the last thing should
+                          be padded `forward' rather than this thing padding `back'.
+                       */
+                       period.from = min(period.from, *_last_audio_time);
+               }
+               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;
+       }
 
-                       if (_audio_processor) {
-                               dcp_mapped = _audio_processor->run (dcp_mapped);
+       /* Emit any audio that is ready */
+
+       /* 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_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_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) {
+                       /* 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));
+               }
 
-                       all.audio = dcp_mapped;
+               emit_audio (i->first, i->second);
+       }
 
-                       audio->accumulate_frames (
-                               all.audio.get(),
-                               content_frame - all.frame,
-                               offset.frames_round (_film->audio_frame_rate()),
-                               min (Frame (all.audio->frames()), request_frames)
-                               );
+       if (done) {
+               _shuffler->flush ();
+               for (list<pair<shared_ptr<PlayerVideo>, DCPTime> >::const_iterator i = _delay.begin(); i != _delay.end(); ++i) {
+                       do_emit_video(i->first, i->second);
                }
        }
 
-       return audio;
+       return done;
 }
 
-Frame
-Player::dcp_to_content_video (shared_ptr<const Piece> piece, DCPTime t) const
+optional<PositionImage>
+Player::subtitles_for_frame (DCPTime time) const
 {
-       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);
-       /* We're returning a frame index here so we need to floor() the conversion since we want to know the frame
-          that contains t, I think
-       */
-       return max (ContentTime (), ContentTime (s, piece->frc) + piece->content->trim_start ()).frames_floor (vc->video_frame_rate ());
+       list<PositionImage> subtitles;
+
+       int const vfr = _film->video_frame_rate();
+
+       BOOST_FOREACH (PlayerCaption i, _active_text[TEXT_SUBTITLE].get_burnt (DCPTimePeriod(time, time + DCPTime::from_frames(1, vfr)), _always_burn_subtitles)) {
+
+               /* Image subtitles */
+               list<PositionImage> c = transform_bitmap_texts (i.image);
+               copy (c.begin(), c.end(), back_inserter (subtitles));
+
+               /* Text subtitles (rendered to an image) */
+               if (!i.text.empty ()) {
+                       list<PositionImage> s = render_text (i.text, i.fonts, _video_container_size, time, vfr);
+                       copy (s.begin(), s.end(), back_inserter (subtitles));
+               }
+       }
+
+       if (subtitles.empty ()) {
+               return optional<PositionImage> ();
+       }
+
+       return merge (subtitles);
 }
 
-DCPTime
-Player::content_video_to_dcp (shared_ptr<const Piece> piece, Frame f) const
+void
+Player::video (weak_ptr<Piece> wp, ContentVideo video)
 {
-       shared_ptr<const VideoContent> vc = dynamic_pointer_cast<const VideoContent> (piece->content);
-       ContentTime const c = ContentTime::from_frames (f, vc->video_frame_rate ()) - piece->content->trim_start ();
-       return max (DCPTime (), DCPTime (c, piece->frc) + piece->content->position ());
+       shared_ptr<Piece> piece = wp.lock ();
+       if (!piece) {
+               return;
+       }
+
+       FrameRateChange frc(piece->content->active_video_frame_rate(), _film->video_frame_rate());
+       if (frc.skip && (video.frame % 2) == 1) {
+               return;
+       }
+
+       /* Time of the first frame we will emit */
+       DCPTime const time = content_video_to_dcp (piece, video.frame);
+
+       /* Discard if it's before the content's period or the last accurate seek.  We can't discard
+          if it's after the content's period here as in that case we still need to fill any gap between
+          `now' and the end of the content's period.
+       */
+       if (time < piece->content->position() || (_last_video_time && time < *_last_video_time)) {
+               return;
+       }
+
+       /* Fill gaps that we discover now that we have some video which needs to be emitted.
+          This is where we need to fill to.
+       */
+       DCPTime fill_to = min (time, piece->content->end());
+
+       if (_last_video_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 < fill_to || eyes != video.eyes) {
+                               if (last != _last_video.end()) {
+                                       shared_ptr<PlayerVideo> copy = last->second->shallow_copy();
+                                       copy->set_eyes (eyes);
+                                       emit_video (copy, 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 < fill_to; 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[wp].reset (
+               new PlayerVideo (
+                       video.image,
+                       piece->content->video->crop (),
+                       piece->content->video->fade (video.frame),
+                       piece->content->video->scale().size (
+                               piece->content->video, _video_container_size, _film->frame_size ()
+                               ),
+                       _video_container_size,
+                       video.eyes,
+                       video.part,
+                       piece->content->video->colour_conversion(),
+                       piece->content,
+                       video.frame
+                       )
+               );
+
+       DCPTime t = time;
+       for (int i = 0; i < frc.repeat; ++i) {
+               if (t < piece->content->end()) {
+                       emit_video (_last_video[wp], t);
+               }
+               t += one_video_frame ();
+       }
 }
 
-Frame
-Player::dcp_to_resampled_audio (shared_ptr<const Piece> piece, DCPTime t) const
+void
+Player::audio (weak_ptr<Piece> wp, AudioStreamPtr stream, ContentAudio content_audio)
 {
-       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 ());
+       DCPOMATIC_ASSERT (content_audio.audio->frames() > 0);
+
+       shared_ptr<Piece> piece = wp.lock ();
+       if (!piece) {
+               return;
+       }
+
+       shared_ptr<AudioContent> content = piece->content->audio;
+       DCPOMATIC_ASSERT (content);
+
+       /* Compute time in the DCP */
+       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());
+
+       /* Remove anything that comes before the start or after the end of the content */
+       if (time < piece->content->position()) {
+               pair<shared_ptr<AudioBuffers>, DCPTime> cut = discard_audio (content_audio.audio, time, piece->content->position());
+               if (!cut.first) {
+                       /* This audio is entirely discarded */
+                       return;
+               }
+               content_audio.audio = cut.first;
+               time = cut.second;
+       } else if (time > piece->content->end()) {
+               /* Discard it all */
+               return;
+       } else if (end > piece->content->end()) {
+               Frame const remaining_frames = DCPTime(piece->content->end() - time).frames_round(_film->audio_frame_rate());
+               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;
+       }
+
+       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());
 }
 
-ContentTime
-Player::dcp_to_content_subtitle (shared_ptr<const Piece> piece, DCPTime t) const
+void
+Player::bitmap_text_start (weak_ptr<Piece> wp, ContentBitmapCaption subtitle)
 {
-       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());
+       shared_ptr<Piece> piece = wp.lock ();
+       if (!piece) {
+               return;
+       }
+
+       /* Apply content's subtitle offsets */
+       subtitle.sub.rectangle.x += piece->content->subtitle->x_offset ();
+       subtitle.sub.rectangle.y += piece->content->subtitle->y_offset ();
+
+       /* Apply a corrective translation to keep the subtitle centred after the scale that is coming up */
+       subtitle.sub.rectangle.x -= subtitle.sub.rectangle.width * ((piece->content->subtitle->x_scale() - 1) / 2);
+       subtitle.sub.rectangle.y -= subtitle.sub.rectangle.height * ((piece->content->subtitle->y_scale() - 1) / 2);
+
+       /* Apply content's subtitle scale */
+       subtitle.sub.rectangle.width *= piece->content->subtitle->x_scale ();
+       subtitle.sub.rectangle.height *= piece->content->subtitle->y_scale ();
+
+       PlayerCaption ps;
+       ps.image.push_back (subtitle.sub);
+       DCPTime from (content_time_to_dcp (piece, subtitle.from()));
+
+       _active_text[subtitle.type()].add_from (wp, ps, from);
 }
 
-/** @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)
+void
+Player::plain_text_start (weak_ptr<Piece> wp, ContentTextCaption subtitle)
 {
-       list<shared_ptr<Piece> > subs = overlaps<SubtitleContent> (time, time + length);
+       shared_ptr<Piece> piece = wp.lock ();
+       if (!piece) {
+               return;
+       }
 
-       PlayerSubtitles ps (time, length);
+       PlayerCaption ps;
+       DCPTime const from (content_time_to_dcp (piece, subtitle.from()));
 
-       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;
+       if (from > piece->content->end()) {
+               return;
+       }
+
+       BOOST_FOREACH (dcp::SubtitleString s, subtitle.subs) {
+               s.set_h_position (s.h_position() + piece->content->subtitle->x_offset ());
+               s.set_v_position (s.v_position() + piece->content->subtitle->y_offset ());
+               float const xs = piece->content->subtitle->x_scale();
+               float const ys = piece->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);
 
-               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 ());
+               /* Then express aspect ratio changes */
+               if (fabs (1.0 - xs / ys) > dcp::ASPECT_ADJUST_EPSILON) {
+                       s.set_aspect_adjust (xs / ys);
+               }
 
-               list<ContentImageSubtitle> image = subtitle_decoder->get_image_subtitles (ContentTimePeriod (from, to), starting);
-               for (list<ContentImageSubtitle>::iterator i = image.begin(); i != image.end(); ++i) {
+               s.set_in (dcp::Time(from.seconds(), 1000));
+               ps.text.push_back (TextCaption (s, piece->content->subtitle->outline_width()));
+               ps.add_fonts (piece->content->subtitle->fonts ());
+       }
 
-                       /* Apply content's subtitle offsets */
-                       i->sub.rectangle.x += subtitle_content->subtitle_x_offset ();
-                       i->sub.rectangle.y += subtitle_content->subtitle_y_offset ();
+       _active_text[subtitle.type()].add_from (wp, ps, from);
+}
 
-                       /* Apply content's subtitle scale */
-                       i->sub.rectangle.width *= subtitle_content->subtitle_x_scale ();
-                       i->sub.rectangle.height *= subtitle_content->subtitle_y_scale ();
+void
+Player::subtitle_stop (weak_ptr<Piece> wp, ContentTime to, TextType type)
+{
+       if (!_active_text[type].have (wp)) {
+               return;
+       }
 
-                       /* 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);
+       shared_ptr<Piece> piece = wp.lock ();
+       if (!piece) {
+               return;
+       }
 
-                       ps.image.push_back (i->sub);
-               }
+       DCPTime const dcp_to = content_time_to_dcp (piece, to);
 
-               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);
-                               }
-                               ps.text.push_back (s);
-                               ps.add_fonts (subtitle_content->fonts ());
-                       }
-               }
+       if (dcp_to > piece->content->end()) {
+               return;
        }
 
-       return ps;
+       pair<PlayerCaption, DCPTime> from = _active_text[type].add_to (wp, dcp_to);
+
+       if (piece->content->subtitle->use() && !_always_burn_subtitles && !piece->content->subtitle->burn()) {
+               Text (from.first, type, DCPTimePeriod (from.second, dcp_to));
+       }
 }
 
-list<shared_ptr<Font> >
-Player::get_subtitle_fonts ()
+void
+Player::seek (DCPTime time, bool accurate)
 {
        if (!_have_valid_pieces) {
                setup_pieces ();
        }
 
-       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));
+       if (_shuffler) {
+               _shuffler->clear ();
+       }
+
+       _delay.clear ();
+
+       if (_audio_processor) {
+               _audio_processor->flush ();
+       }
+
+       _audio_merger.clear ();
+       for (int i = 0; i < TEXT_COUNT; ++i) {
+               _active_text[i].clear ();
+       }
+
+       BOOST_FOREACH (shared_ptr<Piece> i, _pieces) {
+               if (time < i->content->position()) {
+                       /* Before; seek to the start of the content */
+                       i->decoder->seek (dcp_to_content_time (i, i->content->position()), accurate);
+                       i->done = false;
+               } else if (i->content->position() <= time && time < i->content->end()) {
+                       /* During; seek to position */
+                       i->decoder->seek (dcp_to_content_time (i, time), accurate);
+                       i->done = false;
+               } else {
+                       /* After; this piece is done */
+                       i->done = true;
                }
        }
 
-       return fonts;
+       if (accurate) {
+               _last_video_time = time;
+               _last_video_eyes = EYES_LEFT;
+               _last_audio_time = time;
+       } else {
+               _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 ();
 }
 
-/** Set this player never to produce any video data */
 void
-Player::set_ignore_video ()
+Player::emit_video (shared_ptr<PlayerVideo> pv, DCPTime time)
 {
-       _ignore_video = true;
+       /* We need a delay to give a little wiggle room to ensure that relevent subtitles arrive at the
+          player before the video that requires them.
+       */
+       _delay.push_back (make_pair (pv, time));
+
+       if (pv->eyes() == EYES_BOTH || pv->eyes() == EYES_RIGHT) {
+               _last_video_time = time + one_video_frame();
+       }
+       _last_video_eyes = increment_eyes (pv->eyes());
+
+       if (_delay.size() < 3) {
+               return;
+       }
+
+       pair<shared_ptr<PlayerVideo>, DCPTime> to_do = _delay.front();
+       _delay.pop_front();
+       do_emit_video (to_do.first, to_do.second);
 }
 
-/** 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)
+Player::do_emit_video (shared_ptr<PlayerVideo> pv, DCPTime time)
 {
-       _always_burn_subtitles = burn;
+       if (pv->eyes() == EYES_BOTH || pv->eyes() == EYES_RIGHT) {
+               for (int i = 0; i < TEXT_COUNT; ++i) {
+                       _active_text[i].clear_before (time);
+               }
+       }
+
+       optional<PositionImage> subtitles = subtitles_for_frame (time);
+       if (subtitles) {
+               pv->set_subtitle (subtitles.get ());
+       }
+
+       Video (pv, time);
+}
+
+void
+Player::emit_audio (shared_ptr<AudioBuffers> data, DCPTime time)
+{
+       /* Log if the assert below is about to fail */
+       if (_last_audio_time && time != *_last_audio_time) {
+               _film->log()->log(String::compose("Out-of-sequence emit %1 vs %2", to_string(time), to_string(*_last_audio_time)), LogEntry::TYPE_WARNING);
+       }
+
+       /* 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)
+{
+       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;
+       }
+}
+
+DCPTime
+Player::one_video_frame () const
+{
+       return DCPTime::from_frames (1, _film->video_frame_rate ());
+}
+
+pair<shared_ptr<AudioBuffers>, DCPTime>
+Player::discard_audio (shared_ptr<const AudioBuffers> audio, DCPTime time, DCPTime discard_to) const
+{
+       DCPTime const discard_time = discard_to - time;
+       Frame const discard_frames = discard_time.frames_round(_film->audio_frame_rate());
+       Frame remaining_frames = audio->frames() - discard_frames;
+       if (remaining_frames <= 0) {
+               return make_pair(shared_ptr<AudioBuffers>(), DCPTime());
+       }
+       shared_ptr<AudioBuffers> cut (new AudioBuffers (audio->channels(), remaining_frames));
+       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 (PlayerProperty::DCP_DECODE_REDUCTION, false);
+}
+
+DCPTime
+Player::content_time_to_dcp (shared_ptr<Content> content, ContentTime t)
+{
+       if (_have_valid_pieces) {
+               setup_pieces ();
+       }
+
+       BOOST_FOREACH (shared_ptr<Piece> i, _pieces) {
+               if (i->content == content) {
+                       return content_time_to_dcp (i, t);
+               }
+       }
+
+       DCPOMATIC_ASSERT (false);
+       return DCPTime ();
 }