Attempts to simplify black-filling logic in Player.
[dcpomatic.git] / src / lib / player.cc
index 0360858cb2b19a2030b7c4d514a718c14cf3ebf8..32c0026b610b4596dbde9ee57024ae4985a7d3e3 100644 (file)
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2017 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -47,6 +47,7 @@
 #include "content_subtitle.h"
 #include "dcp_decoder.h"
 #include "image_decoder.h"
+#include "compose.hpp"
 #include <dcp/reel.h>
 #include <dcp/reel_sound_asset.h>
 #include <dcp/reel_subtitle_asset.h>
@@ -76,24 +77,6 @@ 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)
@@ -103,6 +86,7 @@ Player::Player (shared_ptr<const Film> film, shared_ptr<const Playlist> playlist
        , _always_burn_subtitles (false)
        , _fast (false)
        , _play_referenced (false)
+       , _audio_merger (_film->audio_frame_rate())
 {
        _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 +94,8 @@ 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);
 }
 
 void
@@ -139,18 +125,53 @@ Player::setup_pieces ()
                        decoder->audio->set_ignore ();
                }
 
-               if (decoder->audio && _fast) {
-                       decoder->audio->set_fast ();
-               }
-
                shared_ptr<DCPDecoder> dcp = dynamic_pointer_cast<DCPDecoder> (decoder);
                if (dcp && _play_referenced) {
                        dcp->set_decode_referenced ();
                }
 
-               _pieces.push_back (shared_ptr<Piece> (new Piece (i, decoder, frc)));
+               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 (decoder->audio) {
+                       decoder->audio->Data.connect (bind (&Player::audio, this, weak_ptr<Piece> (piece), _1, _2));
+               }
+
+               if (decoder->subtitle) {
+                       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));
+               }
+       }
+
+       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 ());
+                       }
+               }
+       }
+
+       if (!_play_referenced) {
+               BOOST_FOREACH (shared_ptr<Piece> i, _pieces) {
+                       shared_ptr<DCPContent> dc = dynamic_pointer_cast<DCPContent> (i->content);
+                       if (dc) {
+                               if (dc->reference_video()) {
+                                       _no_video.push_back (DCPTimePeriod (dc->position(), dc->end()));
+                               }
+                               if (dc->reference_audio()) {
+                                       _no_audio.push_back (DCPTimePeriod (dc->position(), dc->end()));
+                               }
+                       }
+               }
        }
 
+       _last_video_time = DCPTime ();
+       _last_audio_time = DCPTime ();
        _have_valid_pieces = true;
 }
 
@@ -169,10 +190,12 @@ Player::playlist_content_changed (weak_ptr<Content> w, int property, bool freque
                property == ContentProperty::TRIM_END ||
                property == ContentProperty::PATH ||
                property == VideoContentProperty::FRAME_TYPE ||
-               property == DCPContentProperty::CAN_BE_PLAYED ||
+               property == DCPContentProperty::NEEDS_ASSETS ||
+               property == DCPContentProperty::NEEDS_KDM ||
                property == SubtitleContentProperty::COLOUR ||
                property == SubtitleContentProperty::OUTLINE ||
-               property == SubtitleContentProperty::OUTLINE_COLOUR ||
+               property == SubtitleContentProperty::SHADOW ||
+               property == SubtitleContentProperty::EFFECT_COLOUR ||
                property == FFmpegContentProperty::SUBTITLE_STREAM ||
                property == VideoContentProperty::COLOUR_CONVERSION
                ) {
@@ -181,12 +204,16 @@ Player::playlist_content_changed (weak_ptr<Content> w, int property, bool freque
                Changed (frequent);
 
        } else if (
+               property == SubtitleContentProperty::LINE_SPACING ||
+               property == SubtitleContentProperty::OUTLINE_WIDTH ||
+               property == SubtitleContentProperty::Y_SCALE ||
+               property == SubtitleContentProperty::FADE_IN ||
+               property == SubtitleContentProperty::FADE_OUT ||
                property == ContentProperty::VIDEO_FRAME_RATE ||
                property == SubtitleContentProperty::USE ||
                property == SubtitleContentProperty::X_OFFSET ||
                property == SubtitleContentProperty::Y_OFFSET ||
                property == SubtitleContentProperty::X_SCALE ||
-               property == SubtitleContentProperty::Y_SCALE ||
                property == SubtitleContentProperty::FONTS ||
                property == VideoContentProperty::CROP ||
                property == VideoContentProperty::SCALE ||
@@ -201,10 +228,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
@@ -283,12 +316,11 @@ Player::transform_image_subtitles (list<ImageSubtitle> subs) const
 }
 
 shared_ptr<PlayerVideo>
-Player::black_player_video_frame (DCPTime time) const
+Player::black_player_video_frame () const
 {
        return shared_ptr<PlayerVideo> (
                new PlayerVideo (
                        shared_ptr<const ImageProxy> (new RawImageProxy (_black_image)),
-                       time,
                        Crop (),
                        optional<double> (),
                        _video_container_size,
@@ -300,225 +332,6 @@ Player::black_player_video_frame (DCPTime time) const
        );
 }
 
-/** @return All PlayerVideos at the given time.  There may be none if the content
- *  at `time' is a DCP which we are passing through (i.e. referring to by reference)
- *  or 2 if we have 3D.
- */
-list<shared_ptr<PlayerVideo> >
-Player::get_video (DCPTime time, bool accurate)
-{
-       if (!_have_valid_pieces) {
-               setup_pieces ();
-       }
-
-       /* Find subtitles for possible burn-in */
-
-       PlayerSubtitles ps = get_subtitles (time, DCPTime::from_frames (1, _film->video_frame_rate ()), false, true, accurate);
-
-       list<PositionImage> sub_images;
-
-       /* Image subtitles */
-       list<PositionImage> c = transform_image_subtitles (ps.image);
-       copy (c.begin(), c.end(), back_inserter (sub_images));
-
-       /* Text subtitles (rendered to an image) */
-       if (!ps.text.empty ()) {
-               list<PositionImage> s = render_subtitles (ps.text, ps.fonts, _video_container_size);
-               copy (s.begin (), s.end (), back_inserter (sub_images));
-       }
-
-       optional<PositionImage> subtitles;
-       if (!sub_images.empty ()) {
-               subtitles = merge (sub_images);
-       }
-
-       /* Find pieces containing video which is happening now */
-
-       list<shared_ptr<Piece> > ov = overlaps (
-               time,
-               time + DCPTime::from_frames (1, _film->video_frame_rate ()),
-               &has_video
-               );
-
-       list<shared_ptr<PlayerVideo> > pvf;
-
-       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 = last->content->video->frame_type ();
-
-               /* Get video from appropriate piece(s) */
-               BOOST_FOREACH (shared_ptr<Piece> piece, ov) {
-
-                       shared_ptr<VideoDecoder> decoder = piece->decoder->video;
-                       DCPOMATIC_ASSERT (decoder);
-
-                       shared_ptr<DCPContent> dcp_content = dynamic_pointer_cast<DCPContent> (piece->content);
-                       if (dcp_content && dcp_content->reference_video () && !_play_referenced) {
-                               continue;
-                       }
-
-                       bool const use =
-                               /* always use the last video */
-                               piece == last ||
-                               /* with a corresponding L/R eye if appropriate */
-                               (last_type == VIDEO_FRAME_TYPE_3D_LEFT && piece->content->video->frame_type() == VIDEO_FRAME_TYPE_3D_RIGHT) ||
-                               (last_type == VIDEO_FRAME_TYPE_3D_RIGHT && piece->content->video->frame_type() == VIDEO_FRAME_TYPE_3D_LEFT);
-
-                       if (use) {
-                               /* We want to use this piece */
-                               list<ContentVideo> content_video = decoder->get (dcp_to_content_video (piece, time), accurate);
-                               if (content_video.empty ()) {
-                                       pvf.push_back (black_player_video_frame (time));
-                               } else {
-                                       dcp::Size image_size = piece->content->video->scale().size (
-                                               piece->content->video, _video_container_size, _film->frame_size ()
-                                               );
-
-                                       for (list<ContentVideo>::const_iterator i = content_video.begin(); i != content_video.end(); ++i) {
-                                               pvf.push_back (
-                                                       shared_ptr<PlayerVideo> (
-                                                               new PlayerVideo (
-                                                                       i->image,
-                                                                       time,
-                                                                       piece->content->video->crop (),
-                                                                       piece->content->video->fade (i->frame.index()),
-                                                                       image_size,
-                                                                       _video_container_size,
-                                                                       i->frame.eyes(),
-                                                                       i->part,
-                                                                       piece->content->video->colour_conversion ()
-                                                                       )
-                                                               )
-                                                       );
-                                       }
-                               }
-                       } else {
-                               /* Discard unused video */
-                               decoder->get (dcp_to_content_video (piece, time), accurate);
-                       }
-               }
-       }
-
-       if (subtitles) {
-               BOOST_FOREACH (shared_ptr<PlayerVideo> p, pvf) {
-                       p->set_subtitle (subtitles.get ());
-               }
-       }
-
-       return pvf;
-}
-
-/** @return Audio data or 0 if the only audio data here is referenced DCP data */
-shared_ptr<AudioBuffers>
-Player::get_audio (DCPTime time, DCPTime length, bool accurate)
-{
-       if (!_have_valid_pieces) {
-               setup_pieces ();
-       }
-
-       Frame const length_frames = length.frames_round (_film->audio_frame_rate ());
-
-       shared_ptr<AudioBuffers> audio (new AudioBuffers (_film->audio_channels(), length_frames));
-       audio->make_silent ();
-
-       list<shared_ptr<Piece> > ov = overlaps (time, time + length, has_audio);
-       if (ov.empty ()) {
-               return audio;
-       }
-
-       bool all_referenced = true;
-       BOOST_FOREACH (shared_ptr<Piece> i, ov) {
-               shared_ptr<DCPContent> dcp_content = dynamic_pointer_cast<DCPContent> (i->content);
-               if (i->content->audio && (!dcp_content || !dcp_content->reference_audio ())) {
-                       /* There is audio content which is not from a DCP or not set to be referenced */
-                       all_referenced = false;
-               }
-       }
-
-       if (all_referenced && !_play_referenced) {
-               return shared_ptr<AudioBuffers> ();
-       }
-
-       BOOST_FOREACH (shared_ptr<Piece> i, ov) {
-
-               DCPOMATIC_ASSERT (i->content->audio);
-               shared_ptr<AudioDecoder> decoder = i->decoder->audio;
-               DCPOMATIC_ASSERT (decoder);
-
-               /* The time that we should request from the content */
-               DCPTime request = time - DCPTime::from_seconds (i->content->audio->delay() / 1000.0);
-               Frame request_frames = length_frames;
-               DCPTime offset;
-               if (request < DCPTime ()) {
-                       /* We went off the start of the content, so we will need to offset
-                          the stuff we get back.
-                       */
-                       offset = -request;
-                       request_frames += request.frames_round (_film->audio_frame_rate ());
-                       if (request_frames < 0) {
-                               request_frames = 0;
-                       }
-                       request = DCPTime ();
-               }
-
-               Frame const content_frame = dcp_to_resampled_audio (i, request);
-
-               BOOST_FOREACH (AudioStreamPtr j, i->content->audio->streams ()) {
-
-                       if (j->channels() == 0) {
-                               /* Some content (e.g. DCPs) can have streams with no channels */
-                               continue;
-                       }
-
-                       /* Audio from this piece's decoder stream (which might be more or less than what we asked for) */
-                       ContentAudio all = decoder->get (j, content_frame, request_frames, accurate);
-
-                       /* Gain */
-                       if (i->content->audio->gain() != 0) {
-                               shared_ptr<AudioBuffers> gain (new AudioBuffers (all.audio));
-                               gain->apply_gain (i->content->audio->gain ());
-                               all.audio = gain;
-                       }
-
-                       /* Remap channels */
-                       shared_ptr<AudioBuffers> dcp_mapped (new AudioBuffers (_film->audio_channels(), all.audio->frames()));
-                       dcp_mapped->make_silent ();
-                       AudioMapping map = j->mapping ();
-                       for (int i = 0; i < map.input_channels(); ++i) {
-                               for (int j = 0; j < _film->audio_channels(); ++j) {
-                                       if (map.get (i, j) > 0) {
-                                               dcp_mapped->accumulate_channel (
-                                                       all.audio.get(),
-                                                       i,
-                                                       j,
-                                                       map.get (i, j)
-                                                       );
-                                       }
-                               }
-                       }
-
-                       if (_audio_processor) {
-                               dcp_mapped = _audio_processor->run (dcp_mapped, _film->audio_channels ());
-                       }
-
-                       all.audio = dcp_mapped;
-
-                       audio->accumulate_frames (
-                               all.audio.get(),
-                               content_frame - all.frame,
-                               offset.frames_round (_film->audio_frame_rate()),
-                               min (Frame (all.audio->frames()), request_frames)
-                               );
-               }
-       }
-
-       return audio;
-}
-
 Frame
 Player::dcp_to_content_video (shared_ptr<const Piece> piece, DCPTime t) const
 {
@@ -553,8 +366,16 @@ 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 */
+       DCPTime const d = DCPTime::from_frames (f, _film->audio_frame_rate()) - DCPTime (piece->content->trim_start(), piece->frc);
+       return max (DCPTime (), d + piece->content->position ());
+}
+
 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);
@@ -562,87 +383,11 @@ 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());
 }
 
-/** @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, bool accurate)
-{
-       list<shared_ptr<Piece> > subs = overlaps (time, time + length, has_subtitle);
-
-       PlayerSubtitles ps (time, length);
-
-       for (list<shared_ptr<Piece> >::const_iterator j = subs.begin(); j != subs.end(); ++j) {
-               if (!(*j)->content->subtitle->use () || (!_always_burn_subtitles && (burnt != (*j)->content->subtitle->burn ()))) {
-                       continue;
-               }
-
-               shared_ptr<DCPContent> dcp_content = dynamic_pointer_cast<DCPContent> ((*j)->content);
-               if (dcp_content && dcp_content->reference_subtitle () && !_play_referenced) {
-                       continue;
-               }
-
-               shared_ptr<SubtitleDecoder> subtitle_decoder = (*j)->decoder->subtitle;
-               ContentTime const from = dcp_to_content_subtitle (*j, time);
-               /* XXX: this video_frame_rate() should be the rate that the subtitle content has been prepared for */
-               ContentTime const to = from + ContentTime::from_frames (1, _film->video_frame_rate ());
-
-               list<ContentImageSubtitle> image = subtitle_decoder->get_image (ContentTimePeriod (from, to), starting, accurate);
-               for (list<ContentImageSubtitle>::iterator i = image.begin(); i != image.end(); ++i) {
-
-                       /* Apply content's subtitle offsets */
-                       i->sub.rectangle.x += (*j)->content->subtitle->x_offset ();
-                       i->sub.rectangle.y += (*j)->content->subtitle->y_offset ();
-
-                       /* Apply content's subtitle scale */
-                       i->sub.rectangle.width *= (*j)->content->subtitle->x_scale ();
-                       i->sub.rectangle.height *= (*j)->content->subtitle->y_scale ();
-
-                       /* Apply a corrective translation to keep the subtitle centred after that scale */
-                       i->sub.rectangle.x -= i->sub.rectangle.width * ((*j)->content->subtitle->x_scale() - 1);
-                       i->sub.rectangle.y -= i->sub.rectangle.height * ((*j)->content->subtitle->y_scale() - 1);
-
-                       ps.image.push_back (i->sub);
-               }
-
-               list<ContentTextSubtitle> text = subtitle_decoder->get_text (ContentTimePeriod (from, to), starting, accurate);
-               BOOST_FOREACH (ContentTextSubtitle& ts, text) {
-                       BOOST_FOREACH (dcp::SubtitleString s, ts.subs) {
-                               s.set_h_position (s.h_position() + (*j)->content->subtitle->x_offset ());
-                               s.set_v_position (s.v_position() + (*j)->content->subtitle->y_offset ());
-                               float const xs = (*j)->content->subtitle->x_scale();
-                               float const ys = (*j)->content->subtitle->y_scale();
-                               float size = s.size();
-
-                               /* Adjust size to express the common part of the scaling;
-                                  e.g. if xs = ys = 0.5 we scale size by 2.
-                               */
-                               if (xs > 1e-5 && ys > 1e-5) {
-                                       size *= 1 / min (1 / xs, 1 / ys);
-                               }
-                               s.set_size (size);
-
-                               /* Then express aspect ratio changes */
-                               if (fabs (1.0 - xs / ys) > dcp::ASPECT_ADJUST_EPSILON) {
-                                       s.set_aspect_adjust (xs / ys);
-                               }
-                               s.set_in (dcp::Time(content_subtitle_to_dcp (*j, ts.period().from).seconds(), 1000));
-                               s.set_out (dcp::Time(content_subtitle_to_dcp (*j, ts.period().to).seconds(), 1000));
-                               ps.text.push_back (s);
-                               ps.add_fonts ((*j)->content->subtitle->fonts ());
-                       }
-               }
-       }
-
-       return ps;
-}
-
 list<shared_ptr<Font> >
 Player::get_subtitle_fonts ()
 {
@@ -671,13 +416,6 @@ Player::set_ignore_video ()
        _ignore_video = true;
 }
 
-/** Set this player never to produce any audio data */
-void
-Player::set_ignore_audio ()
-{
-       _ignore_audio = true;
-}
-
 /** Set whether or not this player should always burn text subtitles into the image,
  *  regardless of the content settings.
  *  @param burn true to always burn subtitles, false to obey content settings.
@@ -722,32 +460,41 @@ Player::get_reel_assets ()
 
                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 (
-                                               k->main_picture (),
-                                               DCPTimePeriod (from, from + DCPTime::from_frames (k->main_picture()->duration(), _film->video_frame_rate()))
-                                               )
+                                       ReferencedReelAsset (ra, DCPTimePeriod (from, from + DCPTime::from_frames (ra->duration(), ffr)))
                                        );
                        }
 
                        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 (
-                                               k->main_sound (),
-                                               DCPTimePeriod (from, from + DCPTime::from_frames (k->main_sound()->duration(), _film->video_frame_rate()))
-                                               )
+                                       ReferencedReelAsset (ra, DCPTimePeriod (from, from + DCPTime::from_frames (ra->duration(), ffr)))
                                        );
                        }
 
                        if (j->reference_subtitle ()) {
-                               DCPOMATIC_ASSERT (k->main_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 (
-                                               k->main_subtitle (),
-                                               DCPTimePeriod (from, from + DCPTime::from_frames (k->main_subtitle()->duration(), _film->video_frame_rate()))
-                                               )
+                                       ReferencedReelAsset (ra, DCPTimePeriod (from, from + DCPTime::from_frames (ra->duration(), ffr)))
                                        );
                        }
 
@@ -759,19 +506,441 @@ 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;
+       bool filled = false;
+
+       if (_last_video_time && !_playlist->video_content_at(*_last_video_time) && *_last_video_time < _playlist->length()) {
+               /* _last_video_time is the time just after the last video we emitted, and there is no video content
+                  at this time so we need to emit some black.
+               */
+               emit_video (black_player_video_frame(), *_last_video_time);
+               filled = true;
+       } else if (_playlist->length() == DCPTime()) {
+               /* Special case of an empty Film; just give one black frame */
+               emit_video (black_player_video_frame(), DCPTime());
+               filled = true;
+       }
+
+       if (_last_audio_time && !_playlist->audio_content_at(*_last_audio_time) && *_last_audio_time < _playlist->length()) {
+               /* _last_audio_time is the time just after the last audio we emitted.  There is no audio here
+                  so we need to emit some silence.
+               */
+               shared_ptr<Content> next = _playlist->next_audio_content(*_last_audio_time);
+               DCPTimePeriod period (*_last_audio_time, next ? next->position() : _playlist->length());
+               if (period.duration() > one_video_frame()) {
+                       period = DCPTimePeriod (*_last_audio_time, *_last_audio_time + one_video_frame());
+               }
+               fill_audio (period);
+               filled = true;
+       }
+
+       /* Now pass() the decoder which is farthest behind where we are */
+
+       shared_ptr<Piece> earliest;
+       DCPTime earliest_content;
+
        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) {
+                       DCPTime const t = content_time_to_dcp (i, i->decoder->position());
+                       if (!earliest || t < earliest_content) {
+                               earliest_content = t;
+                               earliest = i;
+                       }
                }
        }
 
-       return overlaps;
+       if (!filled && earliest) {
+               earliest->done = earliest->decoder->pass ();
+       }
+
+       /* Emit any audio that is ready */
+
+       DCPTime pull_to = _playlist->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;
+               }
+       }
+
+       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) {
+                       /* There has been an accurate seek and we have received some audio before the seek time;
+                          discard it.
+                       */
+                       pair<shared_ptr<AudioBuffers>, DCPTime> cut = discard_audio (i->first, i->second, *_last_audio_time);
+                       if (!cut.first) {
+                               continue;
+                       }
+                       *i = cut;
+               }
+
+               if (_last_audio_time) {
+                       fill_audio (DCPTimePeriod (*_last_audio_time, i->second));
+               }
+
+               emit_audio (i->first, i->second);
+       }
+
+       return !earliest && !filled;
+}
+
+optional<PositionImage>
+Player::subtitles_for_frame (DCPTime time) const
+{
+       list<PositionImage> subtitles;
+
+       BOOST_FOREACH (PlayerSubtitles i, _active_subtitles.get_burnt (time, _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));
+               }
+       }
+
+       if (subtitles.empty ()) {
+               return optional<PositionImage> ();
+       }
+
+       return merge (subtitles);
+}
+
+void
+Player::video (weak_ptr<Piece> wp, ContentVideo video)
+{
+       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 and period of the frame we will emit */
+       DCPTime const time = content_video_to_dcp (piece, video.frame);
+       DCPTimePeriod const period (time, time + one_video_frame());
+
+       /* Fill gaps that we discover now that we have some video which needs to be emitted */
+
+       optional<DCPTime> fill_to;
+       if (_last_video_time) {
+               fill_to = _last_video_time;
+       }
+
+       if (fill_to) {
+               /* XXX: this may not work for 3D */
+               BOOST_FOREACH (DCPTimePeriod i, subtract(DCPTimePeriod (*fill_to, time), _no_video)) {
+                       for (DCPTime j = i.from; j < i.to; j += one_video_frame()) {
+                               LastVideoMap::const_iterator k = _last_video.find (wp);
+                               if (k != _last_video.end ()) {
+                                       emit_video (k->second, j);
+                               } else {
+                                       emit_video (black_player_video_frame(), j);
+                               }
+                       }
+               }
+       }
+
+       /* 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;
+       }
+
+       _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 ()
+                       )
+               );
+
+       emit_video (_last_video[wp], time);
+}
+
+/** Do our common processing on some audio */
+void
+Player::audio_transform (shared_ptr<AudioContent> content, AudioStreamPtr stream, ContentAudio content_audio, DCPTime time)
+{
+       DCPOMATIC_ASSERT (content_audio.audio->frames() > 0);
+
+       /* Gain */
+
+       if (content->gain() != 0) {
+               shared_ptr<AudioBuffers> gain (new AudioBuffers (content_audio.audio));
+               gain->apply_gain (content->gain ());
+               content_audio.audio = gain;
+       }
+
+       /* 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> 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) + DCPTime::from_seconds (content->delay() / 1000.0);
+       /* 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;
+       }
+
+       audio_transform (content, stream, content_audio, time);
+}
+
+void
+Player::image_subtitle_start (weak_ptr<Piece> wp, ContentImageSubtitle subtitle)
+{
+       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::text_subtitle_start (weak_ptr<Piece> wp, ContentTextSubtitle subtitle)
+{
+       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::subtitle_stop (weak_ptr<Piece> wp, ContentTime to)
+{
+       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 (_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 = time;
+               _last_audio_time = time;
+       } else {
+               _last_video_time = optional<DCPTime>();
+               _last_audio_time = optional<DCPTime>();
+       }
+
+       _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 ());
+       }
+
+       cout << "Player emit @ " << to_string(time) << "\n";
+       Video (pv, time);
+
+       if (pv->eyes() == EYES_BOTH || pv->eyes() == EYES_RIGHT) {
+               _last_video_time = time + one_video_frame();
+               _active_subtitles.clear_before (time);
+       }
+}
+
+void
+Player::emit_audio (shared_ptr<AudioBuffers> data, DCPTime 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);
+
+       BOOST_FOREACH (DCPTimePeriod i, subtract(period, _no_audio)) {
+               DCPTime t = i.from;
+               while (t < i.to) {
+                       DCPTime block = min (DCPTime::from_seconds (0.5), i.to - t);
+                       Frame const samples = block.frames_round(_film->audio_frame_rate());
+                       if (samples) {
+                               shared_ptr<AudioBuffers> silence (new AudioBuffers (_film->audio_channels(), samples));
+                               silence->make_silent ();
+                               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);
 }