Basic template support (#485).
[dcpomatic.git] / src / lib / player.cc
index e3d88a54c212dbe36e3225a1f337090d76050d13..07bb097c2632a95df233497c7dd5a42aa1783c13 100644 (file)
 /*
-    Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2016 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    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 <stdint.h>
 #include "player.h"
 #include "film.h"
-#include "ffmpeg_decoder.h"
-#include "ffmpeg_content.h"
-#include "image_decoder.h"
-#include "image_content.h"
-#include "sndfile_decoder.h"
-#include "sndfile_content.h"
-#include "subtitle_content.h"
-#include "playlist.h"
+#include "audio_buffers.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 "scaler.h"
+#include "render_subtitles.h"
+#include "config.h"
+#include "content_video.h"
+#include "player_video.h"
+#include "frame_rate_change.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 "subtitle_content.h"
+#include "subtitle_decoder.h"
+#include "ffmpeg_content.h"
+#include "audio_content.h"
+#include "content_subtitle.h"
+#include "dcp_decoder.h"
+#include "image_decoder.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__), LogEntry::TYPE_GENERAL);
 
 using std::list;
 using std::cout;
 using std::min;
 using std::max;
+using std::min;
 using std::vector;
 using std::pair;
 using std::map;
+using std::make_pair;
+using std::copy;
 using boost::shared_ptr;
 using boost::weak_ptr;
 using boost::dynamic_pointer_cast;
 using boost::optional;
+using boost::scoped_ptr;
 
-class Piece
-{
-public:
-       Piece (shared_ptr<Content> c, shared_ptr<Decoder> d, FrameRateChange f)
-               : content (c)
-               , decoder (d)
-               , frc (f)
-       {}
-
-       shared_ptr<Content> content;
-       shared_ptr<Decoder> decoder;
-       FrameRateChange frc;
-};
-
-Player::Player (shared_ptr<const Film> f, shared_ptr<const Playlist> p)
-       : _film (f)
-       , _playlist (p)
-       , _video (true)
-       , _audio (true)
-       , _have_valid_pieces (false)
-       , _video_position (0)
-       , _audio_position (0)
-       , _audio_merger (f->audio_channels(), bind (&Film::time_to_audio_frames, f.get(), _1), bind (&Film::audio_frames_to_time, f.get(), _1))
-       , _last_emit_was_black (false)
-       , _just_did_inaccurate_seek (false)
-       , _approximate_size (false)
+static bool
+has_video (Content* c)
 {
-       _playlist_changed_connection = _playlist->Changed.connect (bind (&Player::playlist_changed, this));
-       _playlist_content_changed_connection = _playlist->ContentChanged.connect (bind (&Player::content_changed, this, _1, _2, _3));
-       _film_changed_connection = _film->Changed.connect (bind (&Player::film_changed, this, _1));
-       set_video_container_size (fit_ratio_within (_film->container()->ratio (), _film->full_frame ()));
+       return static_cast<bool>(c->video);
 }
 
-void
-Player::disable_video ()
+static bool
+has_audio (Content* c)
 {
-       _video = false;
+       return static_cast<bool>(c->audio);
 }
 
-void
-Player::disable_audio ()
+static bool
+has_subtitle (Content* c)
 {
-       _audio = false;
+       return static_cast<bool>(c->subtitle);
 }
 
-bool
-Player::pass ()
+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)
+       , _always_burn_subtitles (false)
+       , _fast (false)
+       , _play_referenced (false)
 {
-       if (!_have_valid_pieces) {
-               setup_pieces ();
-       }
-
-       /* Interrogate all our pieces to find the one with the earliest decoded data */
+       _film_changed_connection = _film->Changed.connect (bind (&Player::film_changed, this, _1));
+       _playlist_changed_connection = _playlist->Changed.connect (bind (&Player::playlist_changed, this));
+       _playlist_content_changed_connection = _playlist->ContentChanged.connect (bind (&Player::playlist_content_changed, this, _1, _2, _3));
+       set_video_container_size (_film->frame_size ());
 
-       shared_ptr<Piece> earliest_piece;
-       shared_ptr<Decoded> earliest_decoded;
-       DCPTime earliest_time = TIME_MAX;
-       DCPTime earliest_audio = TIME_MAX;
+       film_changed (Film::AUDIO_PROCESSOR);
+}
 
-       for (list<shared_ptr<Piece> >::iterator i = _pieces.begin(); i != _pieces.end(); ++i) {
+void
+Player::setup_pieces ()
+{
+       _pieces.clear ();
 
-               shared_ptr<Decoded> dec = (*i)->decoder->peek ();
+       BOOST_FOREACH (shared_ptr<Content> i, _playlist->content ()) {
 
-               if (dec) {
-                       dec->set_dcp_times ((*i)->frc.speed_up, (*i)->content->position());
+               if (!i->paths_valid ()) {
+                       continue;
                }
 
-               if (dec && dec->dcp_time < earliest_time) {
-                       earliest_piece = *i;
-                       earliest_decoded = dec;
-                       earliest_time = dec->dcp_time;
-               }
+               shared_ptr<Decoder> decoder = decoder_factory (i, _film->log());
+               FrameRateChange frc (i->active_video_frame_rate(), _film->video_frame_rate());
 
-               if (dynamic_pointer_cast<DecodedAudio> (dec) && dec->dcp_time < earliest_audio) {
-                       earliest_audio = dec->dcp_time;
+               if (!decoder) {
+                       /* Not something that we can decode; e.g. Atmos content */
+                       continue;
                }
-       }
-               
-       if (!earliest_piece) {
-               flush ();
-               return true;
-       }
-
-       if (earliest_audio != TIME_MAX) {
-               TimedAudioBuffers<DCPTime> tb = _audio_merger.pull (earliest_audio);
-               Audio (tb.audio, tb.time);
-               /* This assumes that the audio_frames_to_time conversion is exact
-                  so that there are no accumulated errors caused by rounding.
-               */
-               _audio_position += _film->audio_frames_to_time (tb.audio->frames ());
-       }
-
-       /* Emit the earliest thing */
-
-       shared_ptr<DecodedVideo> dv = dynamic_pointer_cast<DecodedVideo> (earliest_decoded);
-       shared_ptr<DecodedAudio> da = dynamic_pointer_cast<DecodedAudio> (earliest_decoded);
-       shared_ptr<DecodedSubtitle> ds = dynamic_pointer_cast<DecodedSubtitle> (earliest_decoded);
-
-       /* Will be set to false if we shouldn't consume the peeked DecodedThing */
-       bool consume = true;
-
-       /* This is the margin either side of _{video,audio}_position that we will accept
-          as a starting point for a frame consecutive to the previous.
-       */
-       DCPTime const margin = TIME_HZ / (2 * _film->video_frame_rate ());
-       
-       if (dv && _video) {
-
-               if (_just_did_inaccurate_seek) {
-
-                       /* Just emit; no subtlety */
-                       emit_video (earliest_piece, dv);
-                       step_video_position (dv);
-                       
-               } else if (dv->dcp_time - _video_position > margin) {
-
-                       /* Too far ahead */
-
-                       list<shared_ptr<Piece> >::iterator i = _pieces.begin();
-                       while (i != _pieces.end() && ((*i)->content->position() >= _video_position || _video_position >= (*i)->content->end())) {
-                               ++i;
-                       }
-
-                       if (i == _pieces.end() || !_last_incoming_video.video || !_have_valid_pieces) {
-                               /* We're outside all video content */
-                               emit_black ();
-                       } else {
-                               /* We're inside some video; repeat the frame */
-                               _last_incoming_video.video->dcp_time = _video_position;
-                               emit_video (_last_incoming_video.weak_piece, _last_incoming_video.video);
-                               step_video_position (_last_incoming_video.video);
-                       }
 
-                       consume = false;
-
-               } else if (abs (dv->dcp_time - _video_position) < margin) {
-                       /* We're ok */
-                       emit_video (earliest_piece, dv);
-                       step_video_position (dv);
-               } else {
-                       /* Too far behind: skip */
+               if (decoder->video && _ignore_video) {
+                       decoder->video->set_ignore ();
                }
 
-               _just_did_inaccurate_seek = false;
+               if (decoder->audio && _ignore_audio) {
+                       decoder->audio->set_ignore ();
+               }
 
-       } else if (da && _audio) {
+               if (decoder->audio && _fast) {
+                       decoder->audio->set_fast ();
+               }
 
-               if (da->dcp_time - _audio_position > margin) {
-                       /* Too far ahead */
-                       emit_silence (da->dcp_time - _audio_position);
-                       consume = false;
-               } else if (abs (da->dcp_time - _audio_position) < margin) {
-                       /* We're ok */
-                       emit_audio (earliest_piece, da);
-               } else {
-                       /* Too far behind: skip */
+               shared_ptr<DCPDecoder> dcp = dynamic_pointer_cast<DCPDecoder> (decoder);
+               if (dcp && _play_referenced) {
+                       dcp->set_decode_referenced ();
                }
-               
-       } else if (ds && _video) {
-               _in_subtitle.piece = earliest_piece;
-               _in_subtitle.subtitle = ds;
-               update_subtitle ();
+
+               _pieces.push_back (shared_ptr<Piece> (new Piece (i, decoder, frc)));
        }
 
-       if (consume) {
-               earliest_piece->decoder->consume ();
-       }                       
-       
-       return false;
+       _have_valid_pieces = true;
 }
 
 void
-Player::emit_video (weak_ptr<Piece> weak_piece, shared_ptr<DecodedVideo> video)
+Player::playlist_content_changed (weak_ptr<Content> w, int property, bool frequent)
 {
-       /* Keep a note of what came in so that we can repeat it if required */
-       _last_incoming_video.weak_piece = weak_piece;
-       _last_incoming_video.video = video;
-       
-       shared_ptr<Piece> piece = weak_piece.lock ();
-       if (!piece) {
+       shared_ptr<Content> c = w.lock ();
+       if (!c) {
                return;
        }
 
-       shared_ptr<VideoContent> content = dynamic_pointer_cast<VideoContent> (piece->content);
-       assert (content);
-
-       FrameRateChange frc (content->video_frame_rate(), _film->video_frame_rate());
+       if (
+               property == ContentProperty::POSITION ||
+               property == ContentProperty::LENGTH ||
+               property == ContentProperty::TRIM_START ||
+               property == ContentProperty::TRIM_END ||
+               property == ContentProperty::PATH ||
+               property == VideoContentProperty::FRAME_TYPE ||
+               property == DCPContentProperty::CAN_BE_PLAYED ||
+               property == SubtitleContentProperty::COLOUR ||
+               property == SubtitleContentProperty::OUTLINE ||
+               property == SubtitleContentProperty::SHADOW ||
+               property == SubtitleContentProperty::EFFECT_COLOUR ||
+               property == FFmpegContentProperty::SUBTITLE_STREAM ||
+               property == VideoContentProperty::COLOUR_CONVERSION
+               ) {
 
-       float const ratio = content->ratio() ? content->ratio()->ratio() : content->video_size_after_crop().ratio();
-       libdcp::Size image_size = fit_ratio_within (ratio, _video_container_size);
-       if (_approximate_size) {
-               image_size.width &= ~3;
-               image_size.height &= ~3;
-       }
+               _have_valid_pieces = false;
+               Changed (frequent);
 
-       shared_ptr<PlayerImage> pi (
-               new PlayerImage (
-                       video->image,
-                       content->crop(),
-                       image_size,
-                       _video_container_size,
-                       _film->scaler()
-                       )
-               );
-       
-       if (
-               _film->with_subtitles () &&
-               _out_subtitle.image &&
-               video->dcp_time >= _out_subtitle.from && video->dcp_time <= _out_subtitle.to
+       } else if (
+               property == SubtitleContentProperty::LINE_SPACING ||
+               property == SubtitleContentProperty::Y_SCALE
                ) {
 
-               Position<int> const container_offset (
-                       (_video_container_size.width - image_size.width) / 2,
-                       (_video_container_size.height - image_size.height) / 2
-                       );
+               /* These changes just need the pieces' decoders to be reset.
+                  It's quite possible that other changes could be handled by
+                  this branch rather than the _have_valid_pieces = false branch
+                  above.  This would make things a lot faster.
+               */
 
-               pi->set_subtitle (_out_subtitle.image, _out_subtitle.position + container_offset);
+               reset_pieces ();
+               Changed (frequent);
+
+       } else if (
+               property == ContentProperty::VIDEO_FRAME_RATE ||
+               property == SubtitleContentProperty::USE ||
+               property == SubtitleContentProperty::X_OFFSET ||
+               property == SubtitleContentProperty::Y_OFFSET ||
+               property == SubtitleContentProperty::X_SCALE ||
+               property == SubtitleContentProperty::FONTS ||
+               property == VideoContentProperty::CROP ||
+               property == VideoContentProperty::SCALE ||
+               property == VideoContentProperty::FADE_IN ||
+               property == VideoContentProperty::FADE_OUT
+               ) {
+
+               Changed (frequent);
        }
-                                           
-#ifdef DCPOMATIC_DEBUG
-       _last_video = piece->content;
-#endif
-
-       Video (pi, video->eyes, content->colour_conversion(), video->same, video->dcp_time);
-       
-       _last_emit_was_black = false;
 }
 
 void
-Player::step_video_position (shared_ptr<DecodedVideo> video)
+Player::set_video_container_size (dcp::Size s)
 {
-       /* This is a bit of a hack; don't update _video_position if EYES_RIGHT is on its way */
-       if (video->eyes != EYES_LEFT) {
-               /* This assumes that the video_frames_to_time conversion is exact
-                  so that there are no accumulated errors caused by rounding.
-               */
-               _video_position += _film->video_frames_to_time (1);
-       }
+       _video_container_size = s;
+
+       _black_image.reset (new Image (AV_PIX_FMT_RGB24, _video_container_size, true));
+       _black_image->make_black ();
 }
 
 void
-Player::emit_audio (weak_ptr<Piece> weak_piece, shared_ptr<DecodedAudio> audio)
+Player::playlist_changed ()
 {
-       shared_ptr<Piece> piece = weak_piece.lock ();
-       if (!piece) {
-               return;
-       }
-
-       shared_ptr<AudioContent> content = dynamic_pointer_cast<AudioContent> (piece->content);
-       assert (content);
-
-       /* Gain */
-       if (content->audio_gain() != 0) {
-               shared_ptr<AudioBuffers> gain (new AudioBuffers (audio->data));
-               gain->apply_gain (content->audio_gain ());
-               audio->data = gain;
-       }
+       _have_valid_pieces = false;
+       Changed (false);
+}
 
-       if (content->trimmed (audio->dcp_time - content->position ())) {
-               return;
-       }
+void
+Player::film_changed (Film::Property p)
+{
+       /* Here we should notice Film properties that affect our output, and
+          alert listeners that our output now would be different to how it was
+          last time we were run.
+       */
 
-       /* Remap channels */
-       shared_ptr<AudioBuffers> dcp_mapped (new AudioBuffers (_film->audio_channels(), audio->data->frames()));
-       dcp_mapped->make_silent ();
-       list<pair<int, libdcp::Channel> > map = content->audio_mapping().content_to_dcp ();
-       for (list<pair<int, libdcp::Channel> >::iterator i = map.begin(); i != map.end(); ++i) {
-               if (i->first < audio->data->channels() && i->second < dcp_mapped->channels()) {
-                       dcp_mapped->accumulate_channel (audio->data.get(), i->first, i->second);
+       if (p == Film::CONTAINER) {
+               Changed (false);
+       } else if (p == Film::VIDEO_FRAME_RATE) {
+               /* Pieces contain a FrameRateChange which contains the DCP frame rate,
+                  so we need new pieces here.
+               */
+               _have_valid_pieces = false;
+               Changed (false);
+       } else if (p == Film::AUDIO_PROCESSOR) {
+               if (_film->audio_processor ()) {
+                       _audio_processor = _film->audio_processor()->clone (_film->audio_frame_rate ());
                }
        }
+}
 
-       audio->data = dcp_mapped;
+list<PositionImage>
+Player::transform_image_subtitles (list<ImageSubtitle> subs) const
+{
+       list<PositionImage> all;
 
-       /* Delay */
-       audio->dcp_time += content->audio_delay() * TIME_HZ / 1000;
-       if (audio->dcp_time < 0) {
-               int const frames = - audio->dcp_time * _film->audio_frame_rate() / TIME_HZ;
-               if (frames >= audio->data->frames ()) {
-                       return;
+       for (list<ImageSubtitle>::const_iterator i = subs.begin(); i != subs.end(); ++i) {
+               if (!i->image) {
+                       continue;
                }
 
-               shared_ptr<AudioBuffers> trimmed (new AudioBuffers (audio->data->channels(), audio->data->frames() - frames));
-               trimmed->copy_from (audio->data.get(), audio->data->frames() - frames, frames, 0);
-
-               audio->data = trimmed;
-               audio->dcp_time = 0;
+               /* We will scale the subtitle up to fit _video_container_size */
+               dcp::Size scaled_size (i->rectangle.width * _video_container_size.width, i->rectangle.height * _video_container_size.height);
+
+               /* Then we need a corrective translation, consisting of two parts:
+                *
+                * 1.  that which is the result of the scaling of the subtitle by _video_container_size; this will be
+                *     rect.x * _video_container_size.width and rect.y * _video_container_size.height.
+                *
+                * 2.  that to shift the origin of the scale by subtitle_scale to the centre of the subtitle; this will be
+                *     (width_before_subtitle_scale * (1 - subtitle_x_scale) / 2) and
+                *     (height_before_subtitle_scale * (1 - subtitle_y_scale) / 2).
+                *
+                * Combining these two translations gives these expressions.
+                */
+
+               all.push_back (
+                       PositionImage (
+                               i->image->scale (
+                                       scaled_size,
+                                       dcp::YUV_TO_RGB_REC601,
+                                       i->image->pixel_format (),
+                                       true,
+                                       _fast
+                                       ),
+                               Position<int> (
+                                       lrint (_video_container_size.width * i->rectangle.x),
+                                       lrint (_video_container_size.height * i->rectangle.y)
+                                       )
+                               )
+                       );
        }
 
-       _audio_merger.push (audio->data, audio->dcp_time);
+       return all;
 }
 
-void
-Player::flush ()
+shared_ptr<PlayerVideo>
+Player::black_player_video_frame (DCPTime time) const
 {
-       TimedAudioBuffers<DCPTime> tb = _audio_merger.flush ();
-       if (tb.audio) {
-               Audio (tb.audio, tb.time);
-               _audio_position += _film->audio_frames_to_time (tb.audio->frames ());
-       }
-
-       while (_video_position < _audio_position) {
-               emit_black ();
-       }
-
-       while (_audio_position < _video_position) {
-               emit_silence (_video_position - _audio_position);
-       }
-       
+       return shared_ptr<PlayerVideo> (
+               new PlayerVideo (
+                       shared_ptr<const ImageProxy> (new RawImageProxy (_black_image)),
+                       time,
+                       Crop (),
+                       optional<double> (),
+                       _video_container_size,
+                       _video_container_size,
+                       EYES_BOTH,
+                       PART_WHOLE,
+                       PresetColourConversion::all().front().conversion
+               )
+       );
 }
 
-/** Seek so that the next pass() will yield (approximately) the requested frame.
- *  Pass accurate = true to try harder to get close to the request.
- *  @return true on error
+/** @return All PlayerVideos at the given time.  There may be none if the content
+ *  at `time' is a DCP which we are passing through (i.e. referring to by reference)
+ *  or 2 if we have 3D.
  */
-void
-Player::seek (DCPTime t, bool accurate)
+list<shared_ptr<PlayerVideo> >
+Player::get_video (DCPTime time, bool accurate)
 {
        if (!_have_valid_pieces) {
                setup_pieces ();
        }
 
-       if (_pieces.empty ()) {
-               return;
-       }
+       /* Find subtitles for possible burn-in */
 
-       for (list<shared_ptr<Piece> >::iterator i = _pieces.begin(); i != _pieces.end(); ++i) {
-               /* s is the offset of t from the start position of this content */
-               DCPTime s = t - (*i)->content->position ();
-               s = max (static_cast<DCPTime> (0), s);
-               s = min ((*i)->content->length_after_trim(), s);
+       PlayerSubtitles ps = get_subtitles (time, DCPTime::from_frames (1, _film->video_frame_rate ()), false, true, accurate);
 
-               /* Convert this to the content time */
-               ContentTime ct = (s * (*i)->frc.speed_up) + (*i)->content->trim_start ();
+       list<PositionImage> sub_images;
 
-               /* And seek the decoder */
-               (*i)->decoder->seek (ct, accurate);
+       /* 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, time);
+               copy (s.begin (), s.end (), back_inserter (sub_images));
        }
 
-       _video_position = time_round_up (t, TIME_HZ / _film->video_frame_rate());
-       _audio_position = time_round_up (t, TIME_HZ / _film->audio_frame_rate());
+       optional<PositionImage> subtitles;
+       if (!sub_images.empty ()) {
+               subtitles = merge (sub_images);
+       }
 
-       _audio_merger.clear (_audio_position);
+       /* Find pieces containing video which is happening now */
 
-       if (!accurate) {
-               /* We just did an inaccurate seek, so it's likely that the next thing seen
-                  out of pass() will be a fair distance from _{video,audio}_position.  Setting
-                  this flag stops pass() from trying to fix that: we assume that if it
-                  was an inaccurate seek then the caller does not care too much about
-                  inserting black/silence to keep the time tidy.
-               */
-               _just_did_inaccurate_seek = true;
-       }
-}
+       list<shared_ptr<Piece> > ov = overlaps (
+               time,
+               time + DCPTime::from_frames (1, _film->video_frame_rate ()),
+               &has_video
+               );
 
-void
-Player::setup_pieces ()
-{
-       list<shared_ptr<Piece> > old_pieces = _pieces;
-       _pieces.clear ();
+       list<shared_ptr<PlayerVideo> > pvf;
 
-       ContentList content = _playlist->content ();
+       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 ();
 
-       for (ContentList::iterator i = content.begin(); i != content.end(); ++i) {
+               /* Get video from appropriate piece(s) */
+               BOOST_FOREACH (shared_ptr<Piece> piece, ov) {
 
-               shared_ptr<Decoder> decoder;
-               optional<FrameRateChange> frc;
+                       shared_ptr<VideoDecoder> decoder = piece->decoder->video;
+                       DCPOMATIC_ASSERT (decoder);
 
-               shared_ptr<const FFmpegContent> fc = dynamic_pointer_cast<const FFmpegContent> (*i);
-               if (fc) {
-                       decoder.reset (new FFmpegDecoder (_film, fc, _video, _audio));
-                       frc = FrameRateChange (fc->video_frame_rate(), _film->video_frame_rate());
-               }
-               
-               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<DCPContent> dcp_content = dynamic_pointer_cast<DCPContent> (piece->content);
+                       if (dcp_content && dcp_content->reference_video () && !_play_referenced) {
+                               continue;
                        }
 
-                       if (!decoder) {
-                               decoder.reset (new ImageDecoder (_film, ic));
+                       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);
                        }
+               }
+       }
 
-                       frc = FrameRateChange (ic->video_frame_rate(), _film->video_frame_rate());
+       if (subtitles) {
+               BOOST_FOREACH (shared_ptr<PlayerVideo> p, pvf) {
+                       p->set_subtitle (subtitles.get ());
                }
+       }
+
+       return pvf;
+}
 
-               shared_ptr<const SndfileContent> sc = dynamic_pointer_cast<const SndfileContent> (*i);
-               if (sc) {
-                       decoder.reset (new SndfileDecoder (_film, sc));
+/** @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 ();
+       }
 
-                       /* Working out the frc for this content is a bit tricky: what if it overlaps
-                          two pieces of video content with different frame rates?  For now, use
-                          the one with the best overlap.
-                       */
+       Frame const length_frames = length.frames_round (_film->audio_frame_rate ());
 
-                       DCPTime best_overlap_t = 0;
-                       shared_ptr<VideoContent> best_overlap;
-                       for (ContentList::iterator j = content.begin(); j != content.end(); ++j) {
-                               shared_ptr<VideoContent> vc = dynamic_pointer_cast<VideoContent> (*j);
-                               if (!vc) {
-                                       continue;
-                               }
+       shared_ptr<AudioBuffers> audio (new AudioBuffers (_film->audio_channels(), length_frames));
+       audio->make_silent ();
 
-                               DCPTime const overlap = max (vc->position(), sc->position()) - min (vc->end(), sc->end());
-                               if (overlap > best_overlap_t) {
-                                       best_overlap = vc;
-                                       best_overlap_t = overlap;
-                               }
-                       }
+       list<shared_ptr<Piece> > ov = overlaps (time, time + length, has_audio);
+       if (ov.empty ()) {
+               return audio;
+       }
 
-                       if (best_overlap) {
-                               frc = FrameRateChange (best_overlap->video_frame_rate(), _film->video_frame_rate ());
-                       } else {
-                               /* No video overlap; e.g. if the DCP is just audio */
-                               frc = FrameRateChange (_film->video_frame_rate(), _film->video_frame_rate ());
-                       }
+       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;
                }
+       }
 
-               decoder->seek ((*i)->trim_start (), true);
-               
-               _pieces.push_back (shared_ptr<Piece> (new Piece (*i, decoder, frc.get ())));
+       if (all_referenced && !_play_referenced) {
+               return shared_ptr<AudioBuffers> ();
        }
 
-       _have_valid_pieces = true;
+       BOOST_FOREACH (shared_ptr<Piece> i, ov) {
 
-       /* The Piece for the _last_incoming_video will no longer be valid */
-       _last_incoming_video.video.reset ();
+               DCPOMATIC_ASSERT (i->content->audio);
+               shared_ptr<AudioDecoder> decoder = i->decoder->audio;
+               DCPOMATIC_ASSERT (decoder);
 
-       _video_position = _audio_position = 0;
-}
+               /* 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 ();
+               }
 
-void
-Player::content_changed (weak_ptr<Content> w, int property, bool frequent)
-{
-       shared_ptr<Content> c = w.lock ();
-       if (!c) {
-               return;
-       }
+               Frame const content_frame = dcp_to_resampled_audio (i, request);
 
-       if (
-               property == ContentProperty::POSITION || property == ContentProperty::LENGTH ||
-               property == ContentProperty::TRIM_START || property == ContentProperty::TRIM_END ||
-               property == VideoContentProperty::VIDEO_FRAME_TYPE 
-               ) {
-               
-               _have_valid_pieces = false;
-               Changed (frequent);
+               BOOST_FOREACH (AudioStreamPtr j, i->content->audio->streams ()) {
 
-       } else if (property == SubtitleContentProperty::SUBTITLE_OFFSET || property == SubtitleContentProperty::SUBTITLE_SCALE) {
+                       if (j->channels() == 0) {
+                               /* Some content (e.g. DCPs) can have streams with no channels */
+                               continue;
+                       }
 
-               update_subtitle ();
-               Changed (frequent);
+                       /* 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);
 
-       } else if (property == VideoContentProperty::VIDEO_CROP || property == VideoContentProperty::VIDEO_RATIO) {
-               
-               Changed (frequent);
+                       /* 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;
+                       }
 
-       } else if (property == ContentProperty::PATH) {
+                       /* 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)
+                                                       );
+                                       }
+                               }
+                       }
 
-               Changed (frequent);
+                       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;
 }
 
-void
-Player::playlist_changed ()
+Frame
+Player::dcp_to_content_video (shared_ptr<const Piece> piece, DCPTime t) const
 {
-       _have_valid_pieces = false;
-       Changed (false);
+       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 ();
 }
 
-void
-Player::set_video_container_size (libdcp::Size s)
+DCPTime
+Player::content_video_to_dcp (shared_ptr<const Piece> piece, Frame f) const
 {
-       _video_container_size = s;
-
-       shared_ptr<Image> im (new Image (PIX_FMT_RGB24, _video_container_size, true));
-       im->make_black ();
-       
-       _black_frame.reset (
-               new PlayerImage (
-                       im,
-                       Crop(),
-                       _video_container_size,
-                       _video_container_size,
-                       Scaler::from_id ("bicubic")
-                       )
-               );
+       /* 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 ());
 }
 
-void
-Player::emit_black ()
+Frame
+Player::dcp_to_resampled_audio (shared_ptr<const Piece> piece, DCPTime t) const
 {
-#ifdef DCPOMATIC_DEBUG
-       _last_video.reset ();
-#endif
+       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 ());
+}
 
-       Video (_black_frame, EYES_BOTH, ColourConversion(), _last_emit_was_black, _video_position);
-       _video_position += _film->video_frames_to_time (1);
-       _last_emit_was_black = true;
+ContentTime
+Player::dcp_to_content_subtitle (shared_ptr<const Piece> piece, DCPTime t) const
+{
+       DCPTime s = t - piece->content->position ();
+       s = min (piece->content->length_after_trim(), s);
+       return max (ContentTime (), ContentTime (s, piece->frc) + piece->content->trim_start());
 }
 
-void
-Player::emit_silence (DCPTime most)
+DCPTime
+Player::content_subtitle_to_dcp (shared_ptr<const Piece> piece, ContentTime t) const
 {
-       if (most == 0) {
-               return;
-       }
-       
-       DCPTime t = min (most, TIME_HZ / 2);
-       shared_ptr<AudioBuffers> silence (new AudioBuffers (_film->audio_channels(), t * _film->audio_frame_rate() / TIME_HZ));
-       silence->make_silent ();
-       Audio (silence, _audio_position);
-       
-       _audio_position += t;
+       return max (DCPTime (), DCPTime (t - piece->content->trim_start(), piece->frc) + piece->content->position());
 }
 
-void
-Player::film_changed (Film::Property p)
+/** @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)
 {
-       /* Here we should notice Film properties that affect our output, and
-          alert listeners that our output now would be different to how it was
-          last time we were run.
-       */
+       list<shared_ptr<Piece> > subs = overlaps (time, time + length, has_subtitle);
 
-       if (p == Film::SCALER || p == Film::WITH_SUBTITLES || p == Film::CONTAINER) {
-               Changed (false);
+       PlayerSubtitles ps (time);
+
+       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;
 }
 
-void
-Player::update_subtitle ()
+list<shared_ptr<Font> >
+Player::get_subtitle_fonts ()
 {
-       shared_ptr<Piece> piece = _in_subtitle.piece.lock ();
-       if (!piece) {
-               return;
+       if (!_have_valid_pieces) {
+               setup_pieces ();
        }
 
-       if (!_in_subtitle.subtitle->image) {
-               _out_subtitle.image.reset ();
-               return;
+       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));
+               }
        }
 
-       shared_ptr<SubtitleContent> sc = dynamic_pointer_cast<SubtitleContent> (piece->content);
-       assert (sc);
-
-       dcpomatic::Rect<double> in_rect = _in_subtitle.subtitle->rect;
-       libdcp::Size scaled_size;
-
-       in_rect.y += sc->subtitle_offset ();
-
-       /* We will scale the subtitle up to fit _video_container_size, and also by the additional subtitle_scale */
-       scaled_size.width = in_rect.width * _video_container_size.width * sc->subtitle_scale ();
-       scaled_size.height = in_rect.height * _video_container_size.height * sc->subtitle_scale ();
-
-       /* 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_scale) / 2) and
-        *     (height_before_subtitle_scale * (1 - subtitle_scale) / 2).
-        *
-        * Combining these two translations gives these expressions.
-        */
-       
-       _out_subtitle.position.x = rint (_video_container_size.width * (in_rect.x + (in_rect.width * (1 - sc->subtitle_scale ()) / 2)));
-       _out_subtitle.position.y = rint (_video_container_size.height * (in_rect.y + (in_rect.height * (1 - sc->subtitle_scale ()) / 2)));
-
-       _out_subtitle.image = _in_subtitle.subtitle->image->scale (
-               scaled_size,
-               Scaler::from_id ("bicubic"),
-               PIX_FMT_RGBA,
-               true
-               );
-
-       _out_subtitle.from = _in_subtitle.subtitle->dcp_time;
-       _out_subtitle.to = _in_subtitle.subtitle->dcp_time_to;
+       return fonts;
 }
 
-/** Re-emit the last frame that was emitted, using current settings for crop, ratio, scaler and subtitles.
- *  @return false if this could not be done.
- */
-bool
-Player::repeat_last_video ()
+/** Set this player never to produce any video data */
+void
+Player::set_ignore_video ()
 {
-       if (!_last_incoming_video.video || !_have_valid_pieces) {
-               return false;
-       }
-
-       emit_video (
-               _last_incoming_video.weak_piece,
-               _last_incoming_video.video
-               );
-
-       return true;
+       _ignore_video = true;
 }
 
+/** Set this player never to produce any audio data */
 void
-Player::set_approximate_size ()
+Player::set_ignore_audio ()
 {
-       _approximate_size = true;
+       _ignore_audio = true;
 }
-                             
-
-PlayerImage::PlayerImage (
-       shared_ptr<const Image> in,
-       Crop crop,
-       libdcp::Size inter_size,
-       libdcp::Size out_size,
-       Scaler const * scaler
-       )
-       : _in (in)
-       , _crop (crop)
-       , _inter_size (inter_size)
-       , _out_size (out_size)
-       , _scaler (scaler)
+
+/** Set whether or not this player should always burn text subtitles into the image,
+ *  regardless of the content settings.
+ *  @param burn true to always burn subtitles, false to obey content settings.
+ */
+void
+Player::set_always_burn_subtitles (bool burn)
 {
+       _always_burn_subtitles = burn;
+}
 
+void
+Player::set_fast ()
+{
+       _fast = true;
+       _have_valid_pieces = false;
 }
 
 void
-PlayerImage::set_subtitle (shared_ptr<const Image> image, Position<int> pos)
+Player::set_play_referenced ()
 {
-       _subtitle_image = image;
-       _subtitle_position = pos;
+       _play_referenced = true;
+       _have_valid_pieces = false;
 }
 
-shared_ptr<Image>
-PlayerImage::image (AVPixelFormat format, bool aligned)
+list<ReferencedReelAsset>
+Player::get_reel_assets ()
 {
-       shared_ptr<Image> out = _in->crop_scale_window (_crop, _inter_size, _out_size, _scaler, format, aligned);
-       
-       Position<int> const container_offset ((_out_size.width - _inter_size.width) / 2, (_out_size.height - _inter_size.width) / 2);
+       list<ReferencedReelAsset> a;
 
-       if (_subtitle_image) {
-               out->alpha_blend (_subtitle_image, _subtitle_position);
+       BOOST_FOREACH (shared_ptr<Content> i, _playlist->content ()) {
+               shared_ptr<DCPContent> j = dynamic_pointer_cast<DCPContent> (i);
+               if (!j) {
+                       continue;
+               }
+
+               scoped_ptr<DCPDecoder> decoder;
+               try {
+                       decoder.reset (new DCPDecoder (j, _film->log()));
+               } catch (...) {
+                       return a;
+               }
+
+               int64_t offset = 0;
+               BOOST_FOREACH (shared_ptr<dcp::Reel> k, decoder->reels()) {
+                       DCPTime const from = i->position() + DCPTime::from_frames (offset, _film->video_frame_rate());
+                       if (j->reference_video ()) {
+                               a.push_back (
+                                       ReferencedReelAsset (
+                                               k->main_picture (),
+                                               DCPTimePeriod (from, from + DCPTime::from_frames (k->main_picture()->duration(), _film->video_frame_rate()))
+                                               )
+                                       );
+                       }
+
+                       if (j->reference_audio ()) {
+                               a.push_back (
+                                       ReferencedReelAsset (
+                                               k->main_sound (),
+                                               DCPTimePeriod (from, from + DCPTime::from_frames (k->main_sound()->duration(), _film->video_frame_rate()))
+                                               )
+                                       );
+                       }
+
+                       if (j->reference_subtitle ()) {
+                               DCPOMATIC_ASSERT (k->main_subtitle ());
+                               a.push_back (
+                                       ReferencedReelAsset (
+                                               k->main_subtitle (),
+                                               DCPTimePeriod (from, from + DCPTime::from_frames (k->main_subtitle()->duration(), _film->video_frame_rate()))
+                                               )
+                                       );
+                       }
+
+                       /* Assume that main picture duration is the length of the reel */
+                       offset += k->main_picture()->duration ();
+               }
+       }
+
+       return a;
+}
+
+list<shared_ptr<Piece> >
+Player::overlaps (DCPTime from, DCPTime to, boost::function<bool (Content *)> valid)
+{
+       if (!_have_valid_pieces) {
+               setup_pieces ();
+       }
+
+       list<shared_ptr<Piece> > overlaps;
+       BOOST_FOREACH (shared_ptr<Piece> i, _pieces) {
+               if (valid (i->content.get ()) && i->content->position() < to && i->content->end() > from) {
+                       overlaps.push_back (i);
+               }
        }
 
-       return out;
+       return overlaps;
 }
 
+void
+Player::reset_pieces ()
+{
+       BOOST_FOREACH (shared_ptr<Piece> i, _pieces) {
+               i->decoder->reset ();
+       }
+}