In general the player assumes that it won't receive out of order video.
[dcpomatic.git] / src / lib / player.cc
index 924e60be219122251e50594039c5b4a57b75ea01..522b8304f533aa6674fd02fb1ccef6da3fb43bdb 100644 (file)
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -47,6 +47,8 @@
 #include "content_subtitle.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>
@@ -76,33 +78,17 @@ using boost::dynamic_pointer_cast;
 using boost::optional;
 using boost::scoped_ptr;
 
-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)
        , _ignore_video (false)
-       , _ignore_audio (false)
+       , _ignore_subtitle (false)
        , _always_burn_subtitles (false)
        , _fast (false)
        , _play_referenced (false)
+       , _audio_merger (_film->audio_frame_rate())
+       , _shuffler (0)
 {
        _film_changed_connection = _film->Changed.connect (bind (&Player::film_changed, this, _1));
        _playlist_changed_connection = _playlist->Changed.connect (bind (&Player::playlist_changed, this));
@@ -110,6 +96,13 @@ 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
@@ -117,13 +110,17 @@ Player::setup_pieces ()
 {
        _pieces.clear ();
 
+       delete _shuffler;
+       _shuffler = new Shuffler();
+       _shuffler->Video.connect(bind(&Player::video, this, _1, _2));
+
        BOOST_FOREACH (shared_ptr<Content> i, _playlist->content ()) {
 
                if (!i->paths_valid ()) {
                        continue;
                }
 
-               shared_ptr<Decoder> decoder = decoder_factory (i, _film->log());
+               shared_ptr<Decoder> decoder = decoder_factory (i, _film->log(), _fast);
                FrameRateChange frc (i->active_video_frame_rate(), _film->video_frame_rate());
 
                if (!decoder) {
@@ -135,36 +132,55 @@ Player::setup_pieces ()
                        decoder->video->set_ignore ();
                }
 
-               if (decoder->audio && _ignore_audio) {
-                       decoder->audio->set_ignore ();
-               }
-
-               if (decoder->audio && _fast) {
-                       decoder->audio->set_fast ();
+               if (decoder->subtitle && _ignore_subtitle) {
+                       decoder->subtitle->set_ignore ();
                }
 
                shared_ptr<DCPDecoder> dcp = dynamic_pointer_cast<DCPDecoder> (decoder);
                if (dcp && _play_referenced) {
-                       dcp->set_decode_referenced ();
+                       if (_play_referenced) {
+                               dcp->set_decode_referenced ();
+                       }
+                       dcp->set_forced_reduction (_dcp_decode_reduction);
                }
 
                shared_ptr<Piece> piece (new Piece (i, decoder, frc));
                _pieces.push_back (piece);
 
                if (decoder->video) {
-                       decoder->video->Data.connect (bind (&Player::video, this, weak_ptr<Piece> (piece), _1));
+                       if (i->video->frame_type() == VIDEO_FRAME_TYPE_3D_LEFT || i->video->frame_type() == VIDEO_FRAME_TYPE_3D_RIGHT) {
+                               decoder->video->Data.connect (bind (&Shuffler::video, _shuffler, weak_ptr<Piece>(piece), _1));
+                       } else {
+                               decoder->video->Data.connect (bind (&Player::video, this, weak_ptr<Piece>(piece), _1));
+                       }
                }
 
                if (decoder->audio) {
-                       decoder->audio->Data.connect (bind (&Player::audio, this, weak_ptr<Piece> (piece), _1));
+                       decoder->audio->Data.connect (bind (&Player::audio, this, weak_ptr<Piece> (piece), _1, _2));
                }
 
                if (decoder->subtitle) {
-                       decoder->subtitle->ImageData.connect (bind (&Player::image_subtitle, this, weak_ptr<Piece> (piece), _1));
-                       decoder->subtitle->TextData.connect (bind (&Player::text_subtitle, this, weak_ptr<Piece> (piece), _1));
+                       decoder->subtitle->ImageStart.connect (bind (&Player::image_subtitle_start, this, weak_ptr<Piece> (piece), _1));
+                       decoder->subtitle->TextStart.connect (bind (&Player::text_subtitle_start, this, weak_ptr<Piece> (piece), _1));
+                       decoder->subtitle->Stop.connect (bind (&Player::subtitle_stop, this, weak_ptr<Piece> (piece), _1));
                }
        }
 
+       _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 ());
+                       }
+               }
+       }
+
+       _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;
 }
 
@@ -186,10 +202,10 @@ Player::playlist_content_changed (weak_ptr<Content> w, int property, bool freque
                property == DCPContentProperty::NEEDS_ASSETS ||
                property == DCPContentProperty::NEEDS_KDM ||
                property == SubtitleContentProperty::COLOUR ||
-               property == SubtitleContentProperty::OUTLINE ||
-               property == SubtitleContentProperty::SHADOW ||
+               property == SubtitleContentProperty::EFFECT ||
                property == SubtitleContentProperty::EFFECT_COLOUR ||
                property == FFmpegContentProperty::SUBTITLE_STREAM ||
+               property == FFmpegContentProperty::FILTERS ||
                property == VideoContentProperty::COLOUR_CONVERSION
                ) {
 
@@ -221,10 +237,16 @@ Player::playlist_content_changed (weak_ptr<Content> w, int property, bool freque
 void
 Player::set_video_container_size (dcp::Size s)
 {
+       if (s == _video_container_size) {
+               return;
+       }
+
        _video_container_size = s;
 
        _black_image.reset (new Image (AV_PIX_FMT_RGB24, _video_container_size, true));
        _black_image->make_black ();
+
+       Changed (false);
 }
 
 void
@@ -303,17 +325,16 @@ 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
                )
@@ -341,8 +362,8 @@ DCPTime
 Player::content_video_to_dcp (shared_ptr<const Piece> piece, Frame f) const
 {
        /* See comment in dcp_to_content_video */
-       DCPTime const d = DCPTime::from_frames (f * piece->frc.factor(), piece->frc.dcp) - DCPTime (piece->content->trim_start (), piece->frc);
-       return max (DCPTime (), d + piece->content->position ());
+       DCPTime const d = DCPTime::from_frames (f * piece->frc.factor(), piece->frc.dcp) - DCPTime(piece->content->trim_start(), piece->frc);
+       return d + piece->content->position();
 }
 
 Frame
@@ -354,8 +375,17 @@ Player::dcp_to_resampled_audio (shared_ptr<const Piece> piece, DCPTime t) const
        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_subtitle (shared_ptr<const Piece> piece, DCPTime t) const
+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);
@@ -363,7 +393,7 @@ Player::dcp_to_content_subtitle (shared_ptr<const Piece> piece, DCPTime t) const
 }
 
 DCPTime
-Player::content_subtitle_to_dcp (shared_ptr<const Piece> piece, ContentTime t) const
+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());
 }
@@ -396,11 +426,10 @@ Player::set_ignore_video ()
        _ignore_video = true;
 }
 
-/** Set this player never to produce any audio data */
 void
-Player::set_ignore_audio ()
+Player::set_ignore_subtitle ()
 {
-       _ignore_audio = true;
+       _ignore_subtitle = true;
 }
 
 /** Set whether or not this player should always burn text subtitles into the image,
@@ -413,6 +442,7 @@ Player::set_always_burn_subtitles (bool burn)
        _always_burn_subtitles = burn;
 }
 
+/** Sets up the player to be faster, possibly at the expense of quality */
 void
 Player::set_fast ()
 {
@@ -440,7 +470,7 @@ Player::get_reel_assets ()
 
                scoped_ptr<DCPDecoder> decoder;
                try {
-                       decoder.reset (new DCPDecoder (j, _film->log()));
+                       decoder.reset (new DCPDecoder (j, _film->log(), false));
                } catch (...) {
                        return a;
                }
@@ -493,39 +523,151 @@ Player::get_reel_assets ()
        return a;
 }
 
-list<shared_ptr<Piece> >
-Player::overlaps (DCPTime from, DCPTime to, boost::function<bool (Content *)> valid)
+bool
+Player::pass ()
 {
        if (!_have_valid_pieces) {
                setup_pieces ();
        }
 
-       list<shared_ptr<Piece> > overlaps;
+       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;
+       }
+
+       /* Find the decoder or empty which is farthest behind where we are and make it emit some data */
+
+       shared_ptr<Piece> earliest_content;
+       optional<DCPTime> earliest_time;
+
        BOOST_FOREACH (shared_ptr<Piece> i, _pieces) {
-               if (valid (i->content.get ()) && i->content->position() < to && i->content->end() > from) {
-                       overlaps.push_back (i);
+               if (i->done) {
+                       continue;
+               }
+
+               DCPTime const t = content_time_to_dcp (i, i->decoder->position());
+               if (t > i->content->end()) {
+                       i->done = true;
+               } else {
+
+                       /* Given two choices at the same time, pick the one with a subtitle so we see it before
+                          the video.
+                       */
+                       if (!earliest_time || t < *earliest_time || (t == *earliest_time && i->decoder->subtitle)) {
+                               earliest_time = t;
+                               earliest_content = i;
+                       }
                }
        }
 
-       return overlaps;
+       bool done = false;
+
+       enum {
+               NONE,
+               CONTENT,
+               BLACK,
+               SILENT
+       } which = NONE;
+
+       if (earliest_content) {
+               which = CONTENT;
+       }
+
+       if (!_black.done() && (!earliest_time || _black.position() < *earliest_time)) {
+               earliest_time = _black.position ();
+               which = BLACK;
+       }
+
+       if (!_silent.done() && (!earliest_time || _silent.position() < *earliest_time)) {
+               earliest_time = _silent.position ();
+               which = SILENT;
+       }
+
+       switch (which) {
+       case CONTENT:
+               earliest_content->done = earliest_content->decoder->pass ();
+               break;
+       case BLACK:
+               emit_video (black_player_video_frame(EYES_BOTH), _black.position());
+               _black.set_position (_black.position() + one_video_frame());
+               break;
+       case SILENT:
+       {
+               DCPTimePeriod period (_silent.period_at_position());
+               if (period.duration() > one_video_frame()) {
+                       period.to = period.from + one_video_frame();
+               }
+               fill_audio (period);
+               _silent.set_position (period.to);
+               break;
+       }
+       case NONE:
+               done = true;
+               break;
+       }
+
+       /* Emit any audio that is ready */
+
+       /* 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));
+               }
+
+               emit_audio (i->first, i->second);
+       }
+
+       if (done) {
+               _shuffler->flush ();
+       }
+       return done;
 }
 
-bool
-Player::pass ()
+optional<PositionImage>
+Player::subtitles_for_frame (DCPTime time) const
 {
-       if (!_have_valid_pieces) {
-               setup_pieces ();
-       }
+       list<PositionImage> subtitles;
 
-       shared_ptr<Piece> earliest;
-       DCPTime earliest_position;
-       BOOST_FOREACH (shared_ptr<Piece> i, _pieces) {
-               /* Convert i->decoder->position() to DCPTime and work out the earliest */
+       BOOST_FOREACH (PlayerSubtitles i, _active_subtitles.get_burnt (DCPTimePeriod(time, time + DCPTime::from_frames(1, _film->video_frame_rate())),  _always_burn_subtitles)) {
+
+               /* Image subtitles */
+               list<PositionImage> c = transform_image_subtitles (i.image);
+               copy (c.begin(), c.end(), back_inserter (subtitles));
+
+               /* Text subtitles (rendered to an image) */
+               if (!i.text.empty ()) {
+                       list<PositionImage> s = render_subtitles (i.text, i.fonts, _video_container_size, time);
+                       copy (s.begin(), s.end(), back_inserter (subtitles));
+               }
        }
 
-       earliest->decoder->pass ();
+       if (subtitles.empty ()) {
+               return optional<PositionImage> ();
+       }
 
-       /* XXX: collect audio and maybe emit some */
+       return merge (subtitles);
 }
 
 void
@@ -536,58 +678,357 @@ Player::video (weak_ptr<Piece> wp, ContentVideo video)
                return;
        }
 
-       /* Get subs to burn in and burn them in */
+       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);
 
-       /* Fill gaps */
+       /* Discard if it's outside the content's period or if it's before the last accurate seek */
+       if (
+               time < piece->content->position() ||
+               time >= piece->content->end() ||
+               (_last_video_time && time < *_last_video_time)) {
+               return;
+       }
 
-       DCPTime time = content_video_to_dcp (piece, video.frame.index());
+       /* Fill gaps that we discover now that we have some video which needs to be emitted */
 
-       dcp::Size image_size = piece->content->video->scale().size (
-               piece->content->video, _video_container_size, _film->frame_size ()
-               );
+       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 < time || eyes != video.eyes) {
+                               if (last != _last_video.end()) {
+                                       last->second->set_eyes (eyes);
+                                       emit_video (last->second, j);
+                               } else {
+                                       emit_video (black_player_video_frame(eyes), j);
+                               }
+                               if (eyes == EYES_RIGHT) {
+                                       j += one_video_frame();
+                               }
+                               eyes = increment_eyes (eyes);
+                       }
+               } else {
+                       for (DCPTime j = fill_from; j < time; j += one_video_frame()) {
+                               if (last != _last_video.end()) {
+                                       emit_video (last->second, j);
+                               } else {
+                                       emit_video (black_player_video_frame(EYES_BOTH), j);
+                               }
+                       }
+               }
+       }
 
-       Video (
-               shared_ptr<PlayerVideo> (
-                       new PlayerVideo (
-                               video.image,
-                               time,
-                               piece->content->video->crop (),
-                               piece->content->video->fade (video.frame.index()),
-                               image_size,
-                               _video_container_size,
-                               video.frame.eyes(),
-                               video.part,
-                               piece->content->video->colour_conversion ()
-                               )
+       _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 ()
                        )
                );
 
+       DCPTime t = time;
+       for (int i = 0; i < frc.repeat; ++i) {
+               emit_video (_last_video[wp], t);
+               t += one_video_frame ();
+       }
+}
+
+void
+Player::audio (weak_ptr<Piece> wp, AudioStreamPtr stream, ContentAudio content_audio)
+{
+       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());
 }
 
 void
-Player::audio (weak_ptr<Piece> piece, ContentAudio video)
+Player::image_subtitle_start (weak_ptr<Piece> wp, ContentImageSubtitle subtitle)
 {
-       /* gain, remap, processor */
-       /* Put into merge buffer */
+       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 content's subtitle scale */
+       subtitle.sub.rectangle.width *= piece->content->subtitle->x_scale ();
+       subtitle.sub.rectangle.height *= piece->content->subtitle->y_scale ();
+
+       /* Apply a corrective translation to keep the subtitle centred after that scale */
+       subtitle.sub.rectangle.x -= subtitle.sub.rectangle.width * (piece->content->subtitle->x_scale() - 1);
+       subtitle.sub.rectangle.y -= subtitle.sub.rectangle.height * (piece->content->subtitle->y_scale() - 1);
+
+       PlayerSubtitles ps;
+       ps.image.push_back (subtitle.sub);
+       DCPTime from (content_time_to_dcp (piece, subtitle.from()));
+
+       _active_subtitles.add_from (wp, ps, from);
 }
 
 void
-Player::image_subtitle (weak_ptr<Piece> piece, ContentImageSubtitle subtitle)
+Player::text_subtitle_start (weak_ptr<Piece> wp, ContentTextSubtitle subtitle)
 {
-       /* Store for video to see */
+       shared_ptr<Piece> piece = wp.lock ();
+       if (!piece) {
+               return;
+       }
+
+       PlayerSubtitles ps;
+       DCPTime const from (content_time_to_dcp (piece, subtitle.from()));
+
+       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);
+
+               /* 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(from.seconds(), 1000));
+               ps.text.push_back (SubtitleString (s, piece->content->subtitle->outline_width()));
+               ps.add_fonts (piece->content->subtitle->fonts ());
+       }
+
+       _active_subtitles.add_from (wp, ps, from);
 }
 
 void
-Player::text_subtitle (weak_ptr<Piece> piece, ContentTextSubtitle subtitle)
+Player::subtitle_stop (weak_ptr<Piece> wp, ContentTime to)
 {
-       /* Store for video to see, or emit */
+       if (!_active_subtitles.have (wp)) {
+               return;
+       }
+
+       shared_ptr<Piece> piece = wp.lock ();
+       if (!piece) {
+               return;
+       }
+
+       DCPTime const dcp_to = content_time_to_dcp (piece, to);
+
+       pair<PlayerSubtitles, DCPTime> from = _active_subtitles.add_to (wp, dcp_to);
+
+       if (piece->content->subtitle->use() && !_always_burn_subtitles && !piece->content->subtitle->burn()) {
+               Subtitle (from.first, DCPTimePeriod (from.second, dcp_to));
+       }
 }
 
 void
 Player::seek (DCPTime time, bool accurate)
 {
+       if (!_have_valid_pieces) {
+               setup_pieces ();
+       }
+
+       if (_shuffler) {
+               _shuffler->clear ();
+       }
+
+       if (_audio_processor) {
+               _audio_processor->flush ();
+       }
+
+       _audio_merger.clear ();
+       _active_subtitles.clear ();
+
+       BOOST_FOREACH (shared_ptr<Piece> i, _pieces) {
+               if (time < i->content->position()) {
+                       /* Before; seek to 0 */
+                       i->decoder->seek (ContentTime(), 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;
+               }
+       }
+
        if (accurate) {
-               _last_video = time - DCPTime::from_frames (1, _film->video_frame_rate ());
+               _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 ();
+}
+
+void
+Player::emit_video (shared_ptr<PlayerVideo> pv, DCPTime time)
+{
+       optional<PositionImage> subtitles = subtitles_for_frame (time);
+       if (subtitles) {
+               pv->set_subtitle (subtitles.get ());
+       }
+
+       Video (pv, time);
+
+       if (pv->eyes() == EYES_BOTH || pv->eyes() == EYES_RIGHT) {
+               _last_video_time = time + one_video_frame();
+               _active_subtitles.clear_before (time);
+       }
+       _last_video_eyes = increment_eyes (pv->eyes());
+}
+
+void
+Player::emit_audio (shared_ptr<AudioBuffers> data, DCPTime time)
+{
+       /* 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 (false);
 }