Allow separate X and Y scale for subtitles.
[dcpomatic.git] / src / lib / player.cc
index a84117a4e4ce0cb14821bcfea050d3818c4e242b..8063d1212971afe2e9bf682a84d253361b902bac 100644 (file)
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
 
 */
 
+#include <stdint.h>
 #include "player.h"
 #include "film.h"
 #include "ffmpeg_decoder.h"
 #include "ffmpeg_content.h"
-#include "imagemagick_decoder.h"
-#include "imagemagick_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 "job.h"
+#include "image.h"
+#include "image_proxy.h"
+#include "ratio.h"
+#include "resampler.h"
+#include "log.h"
+#include "scaler.h"
+#include "player_video_frame.h"
+#include "frame_rate_change.h"
+
+#define LOG_GENERAL(...) _film->log()->log (String::compose (__VA_ARGS__), Log::TYPE_GENERAL);
 
 using std::list;
 using std::cout;
+using std::min;
+using std::max;
 using std::vector;
+using std::pair;
+using std::map;
 using boost::shared_ptr;
 using boost::weak_ptr;
 using boost::dynamic_pointer_cast;
@@ -40,11 +56,16 @@ Player::Player (shared_ptr<const Film> f, shared_ptr<const Playlist> p)
        , _playlist (p)
        , _video (true)
        , _audio (true)
-       , _subtitles (true)
-       , _have_valid_decoders (false)
+       , _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)
 {
-       _playlist->Changed.connect (bind (&Player::playlist_changed, this));
-       _playlist->ContentChanged.connect (bind (&Player::content_changed, this, _1, _2));
+       _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 (_film->frame_size ());
 }
 
 void
@@ -59,259 +80,568 @@ Player::disable_audio ()
        _audio = false;
 }
 
-void
-Player::disable_subtitles ()
-{
-       _subtitles = false;
-}
-
 bool
 Player::pass ()
 {
-       if (!_have_valid_decoders) {
-               setup_decoders ();
-               _have_valid_decoders = true;
+       if (!_have_valid_pieces) {
+               setup_pieces ();
        }
-       
-       bool done = true;
-       
-       if (_video_decoder < _video_decoders.size ()) {
 
-               /* Run video decoder; this may also produce audio */
-               
-               if (_video_decoders[_video_decoder]->pass ()) {
-                       _video_decoder++;
+       Time earliest_t = TIME_MAX;
+       shared_ptr<Piece> earliest;
+       enum {
+               VIDEO,
+               AUDIO
+       } type = VIDEO;
+
+       for (list<shared_ptr<Piece> >::iterator i = _pieces.begin(); i != _pieces.end(); ++i) {
+               if ((*i)->decoder->done () || (*i)->content->length_after_trim() == 0) {
+                       continue;
                }
-               
-               if (_video_decoder < _video_decoders.size ()) {
-                       done = false;
+
+               shared_ptr<VideoDecoder> vd = dynamic_pointer_cast<VideoDecoder> ((*i)->decoder);
+               shared_ptr<AudioDecoder> ad = dynamic_pointer_cast<AudioDecoder> ((*i)->decoder);
+
+               if (_video && vd) {
+                       if ((*i)->video_position < earliest_t) {
+                               earliest_t = (*i)->video_position;
+                               earliest = *i;
+                               type = VIDEO;
+                       }
                }
-               
-       } else if (!_video && _playlist->audio_from() == Playlist::AUDIO_FFMPEG && _sequential_audio_decoder < _audio_decoders.size ()) {
 
-               /* We're not producing video, so we may need to run FFmpeg content to get the audio */
-               
-               if (_audio_decoders[_sequential_audio_decoder]->pass ()) {
-                       _sequential_audio_decoder++;
+               if (_audio && ad && ad->has_audio ()) {
+                       if ((*i)->audio_position < earliest_t) {
+                               earliest_t = (*i)->audio_position;
+                               earliest = *i;
+                               type = AUDIO;
+                       }
                }
-               
-               if (_sequential_audio_decoder < _audio_decoders.size ()) {
-                       done = false;
+       }
+
+       if (!earliest) {
+               flush ();
+               return true;
+       }
+
+       switch (type) {
+       case VIDEO:
+               if (earliest_t > _video_position) {
+                       emit_black ();
+               } else {
+                       if (earliest->repeating ()) {
+                               earliest->repeat (this);
+                       } else {
+                               earliest->decoder->pass ();
+                       }
                }
-               
-       } else if (_playlist->audio_from() == Playlist::AUDIO_SNDFILE) {
+               break;
+
+       case AUDIO:
+               if (earliest_t > _audio_position) {
+                       emit_silence (_film->time_to_audio_frames (earliest_t - _audio_position));
+               } else {
+                       earliest->decoder->pass ();
+
+                       if (earliest->decoder->done()) {
+                               shared_ptr<AudioContent> ac = dynamic_pointer_cast<AudioContent> (earliest->content);
+                               assert (ac);
+                               shared_ptr<Resampler> re = resampler (ac, false);
+                               if (re) {
+                                       shared_ptr<const AudioBuffers> b = re->flush ();
+                                       if (b->frames ()) {
+                                               process_audio (
+                                                       earliest,
+                                                       b,
+                                                       ac->audio_length() * ac->output_audio_frame_rate() / ac->content_audio_frame_rate(),
+                                                       true
+                                                       );
+                                       }
+                               }
+                       }
+               }
+               break;
+       }
 
-               /* We're getting audio from SndfileContent */
-               
-               for (vector<shared_ptr<AudioDecoder> >::iterator i = _audio_decoders.begin(); i != _audio_decoders.end(); ++i) {
-                       if (!(*i)->pass ()) {
-                               done = false;
+       if (_audio) {
+               boost::optional<Time> audio_done_up_to;
+               for (list<shared_ptr<Piece> >::iterator i = _pieces.begin(); i != _pieces.end(); ++i) {
+                       if ((*i)->decoder->done ()) {
+                               continue;
+                       }
+
+                       shared_ptr<AudioDecoder> ad = dynamic_pointer_cast<AudioDecoder> ((*i)->decoder);
+                       if (ad && ad->has_audio ()) {
+                               audio_done_up_to = min (audio_done_up_to.get_value_or (TIME_MAX), (*i)->audio_position);
                        }
                }
 
-               Audio (_audio_buffers, _audio_time.get());
-               _audio_buffers.reset ();
-               _audio_time = boost::none;
+               if (audio_done_up_to) {
+                       TimedAudioBuffers<Time> tb = _audio_merger.pull (audio_done_up_to.get ());
+                       Audio (tb.audio, tb.time);
+                       _audio_position += _film->audio_frames_to_time (tb.audio->frames ());
+               }
        }
-
-       return done;
+               
+       return false;
 }
 
+/** @param extra Amount of extra time to add to the content frame's time (for repeat) */
 void
-Player::set_progress (shared_ptr<Job> job)
+Player::process_video (weak_ptr<Piece> weak_piece, shared_ptr<const ImageProxy> image, Eyes eyes, Part part, bool same, VideoContent::Frame frame, Time extra)
 {
-       /* Assume progress can be divined from how far through the video we are */
-
-       if (_video_decoder >= _video_decoders.size() || !_playlist->video_length()) {
+       /* 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.image = image;
+       _last_incoming_video.eyes = eyes;
+       _last_incoming_video.part = part;
+       _last_incoming_video.same = same;
+       _last_incoming_video.frame = frame;
+       _last_incoming_video.extra = extra;
+       
+       shared_ptr<Piece> piece = weak_piece.lock ();
+       if (!piece) {
                return;
        }
 
-       job->set_progress ((_video_start[_video_decoder] + _video_decoders[_video_decoder]->video_frame()) / _playlist->video_length ());
-}
+       shared_ptr<VideoContent> content = dynamic_pointer_cast<VideoContent> (piece->content);
+       assert (content);
 
-void
-Player::process_video (shared_ptr<Image> i, bool same, shared_ptr<Subtitle> s, double t)
-{
-       Video (i, same, s, _video_start[_video_decoder] + t);
-}
+       FrameRateChange frc (content->video_frame_rate(), _film->video_frame_rate());
+       if (frc.skip && (frame % 2) == 1) {
+               return;
+       }
 
-void
-Player::process_audio (weak_ptr<const AudioContent> c, shared_ptr<AudioBuffers> b, double t)
-{
-       AudioMapping mapping = _film->audio_mapping ();
-       if (!_audio_buffers) {
-               _audio_buffers.reset (new AudioBuffers (mapping.dcp_channels(), b->frames ()));
-               _audio_buffers->make_silent ();
-               _audio_time = t;
-               if (_playlist->audio_from() == Playlist::AUDIO_FFMPEG) {
-                       _audio_time = _audio_time.get() + _audio_start[_sequential_audio_decoder];
+       Time const relative_time = (frame * frc.factor() * TIME_HZ / _film->video_frame_rate());
+       if (content->trimmed (relative_time)) {
+               return;
+       }
+
+       Time const time = content->position() + relative_time + extra - content->trim_start ();
+       libdcp::Size const image_size = content->scale().size (content, _video_container_size, _film->frame_size ());
+
+       shared_ptr<PlayerVideoFrame> pi (
+               new PlayerVideoFrame (
+                       image,
+                       content->crop(),
+                       image_size,
+                       _video_container_size,
+                       _film->scaler(),
+                       eyes,
+                       part,
+                       content->colour_conversion()
+                       )
+               );
+       
+       if (_film->with_subtitles ()) {
+               for (list<Subtitle>::const_iterator i = _subtitles.begin(); i != _subtitles.end(); ++i) {
+                       if (i->covers (time)) {
+                               /* This may be true for more than one of _subtitles, but the last (latest-starting)
+                                  one is the one we want to use, so that's ok.
+                               */
+                               Position<int> const container_offset (
+                                       (_video_container_size.width - image_size.width) / 2,
+                                       (_video_container_size.height - image_size.width) / 2
+                                       );
+                               
+                               pi->set_subtitle (i->out_image(), i->out_position() + container_offset);
+                       }
                }
        }
 
-       for (int i = 0; i < b->channels(); ++i) {
-               list<libdcp::Channel> dcp = mapping.content_to_dcp (AudioMapping::Channel (c, i));
-               for (list<libdcp::Channel>::iterator j = dcp.begin(); j != dcp.end(); ++j) {
-                       _audio_buffers->accumulate (b, i, static_cast<int> (*j));
+       /* Clear out old subtitles */
+       for (list<Subtitle>::iterator i = _subtitles.begin(); i != _subtitles.end(); ) {
+               list<Subtitle>::iterator j = i;
+               ++j;
+               
+               if (i->ends_before (time)) {
+                       _subtitles.erase (i);
                }
+
+               i = j;
        }
 
-       if (_playlist->audio_from() == Playlist::AUDIO_FFMPEG) {
-               /* We can just emit this audio now as it will all be here */
-               Audio (_audio_buffers, t);
-               _audio_buffers.reset ();
-               _audio_time = boost::none;
+#ifdef DCPOMATIC_DEBUG
+       _last_video = piece->content;
+#endif
+
+       Video (pi, same, time);
+
+       _last_emit_was_black = false;
+       _video_position = piece->video_position = (time + TIME_HZ / _film->video_frame_rate());
+
+       if (frc.repeat > 1 && !piece->repeating ()) {
+               piece->set_repeat (_last_incoming_video, frc.repeat - 1);
        }
 }
 
-/** @return true on error */
-bool
-Player::seek (double t)
+/** @param already_resampled true if this data has already been through the chain up to the resampler */
+void
+Player::process_audio (weak_ptr<Piece> weak_piece, shared_ptr<const AudioBuffers> audio, AudioContent::Frame frame, bool already_resampled)
 {
-       if (!_have_valid_decoders) {
-               setup_decoders ();
-               _have_valid_decoders = true;
+       shared_ptr<Piece> piece = weak_piece.lock ();
+       if (!piece) {
+               return;
        }
 
-       /* Find the decoder that contains this position */
-       _video_decoder = 0;
-       while (_video_decoder < _video_decoders.size ()) {
-               if (t < _video_start[_video_decoder]) {
-                       assert (_video_decoder);
-                       --_video_decoder;
-                       break;
+       shared_ptr<AudioContent> content = dynamic_pointer_cast<AudioContent> (piece->content);
+       assert (content);
+
+       if (!already_resampled) {
+               /* Gain */
+               if (content->audio_gain() != 0) {
+                       shared_ptr<AudioBuffers> gain (new AudioBuffers (audio));
+                       gain->apply_gain (content->audio_gain ());
+                       audio = gain;
+               }
+               
+               /* Resample */
+               if (content->content_audio_frame_rate() != content->output_audio_frame_rate()) {
+                       shared_ptr<Resampler> r = resampler (content, true);
+                       pair<shared_ptr<const AudioBuffers>, AudioContent::Frame> ro = r->run (audio, frame);
+                       audio = ro.first;
+                       frame = ro.second;
                }
+       }
+       
+       Time const relative_time = _film->audio_frames_to_time (frame);
 
-               t -= _video_start[_video_decoder];
-               ++_video_decoder;
+       if (content->trimmed (relative_time)) {
+               return;
        }
+
+       Time time = content->position() + (content->audio_delay() * TIME_HZ / 1000) + relative_time - content->trim_start ();
        
-       if (_video_decoder < _video_decoders.size()) {
-               _video_decoders[_video_decoder]->seek (t);
-       } else {
-               return true;
+       /* Remap channels */
+       shared_ptr<AudioBuffers> dcp_mapped (new AudioBuffers (_film->audio_channels(), audio->frames()));
+       dcp_mapped->make_silent ();
+
+       AudioMapping map = content->audio_mapping ();
+       for (int i = 0; i < map.content_channels(); ++i) {
+               for (int j = 0; j < _film->audio_channels(); ++j) {
+                       if (map.get (i, static_cast<libdcp::Channel> (j)) > 0) {
+                               dcp_mapped->accumulate_channel (
+                                       audio.get(),
+                                       i,
+                                       static_cast<libdcp::Channel> (j),
+                                       map.get (i, static_cast<libdcp::Channel> (j))
+                                       );
+                       }
+               }
        }
 
-       /* XXX: don't seek audio because we don't need to... */
+       audio = dcp_mapped;
 
-       return false;
-}
+       /* We must cut off anything that comes before the start of all time */
+       if (time < 0) {
+               int const frames = - time * _film->audio_frame_rate() / TIME_HZ;
+               if (frames >= audio->frames ()) {
+                       return;
+               }
+
+               shared_ptr<AudioBuffers> trimmed (new AudioBuffers (audio->channels(), audio->frames() - frames));
+               trimmed->copy_from (audio.get(), audio->frames() - frames, frames, 0);
 
+               audio = trimmed;
+               time = 0;
+       }
+
+       _audio_merger.push (audio, time);
+       piece->audio_position += _film->audio_frames_to_time (audio->frames ());
+}
 
 void
-Player::seek_back ()
+Player::flush ()
 {
-       /* XXX */
+       TimedAudioBuffers<Time> tb = _audio_merger.flush ();
+       if (_audio && tb.audio) {
+               Audio (tb.audio, tb.time);
+               _audio_position += _film->audio_frames_to_time (tb.audio->frames ());
+       }
+
+       while (_video && _video_position < _audio_position) {
+               emit_black ();
+       }
+
+       while (_audio && _audio_position < _video_position) {
+               emit_silence (_film->time_to_audio_frames (_video_position - _audio_position));
+       }
+       
 }
 
+/** 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
+ */
 void
-Player::seek_forward ()
+Player::seek (Time t, bool accurate)
 {
-       /* XXX */
-}
+       if (!_have_valid_pieces) {
+               setup_pieces ();
+       }
+
+       if (_pieces.empty ()) {
+               return;
+       }
+
+       for (list<shared_ptr<Piece> >::iterator i = _pieces.begin(); i != _pieces.end(); ++i) {
+               shared_ptr<VideoContent> vc = dynamic_pointer_cast<VideoContent> ((*i)->content);
+               if (!vc) {
+                       continue;
+               }
+
+               /* s is the offset of t from the start position of this content */
+               Time s = t - vc->position ();
+               s = max (static_cast<Time> (0), s);
+               s = min (vc->length_after_trim(), s);
+
+               /* Hence set the piece positions to the `global' time */
+               (*i)->video_position = (*i)->audio_position = vc->position() + s;
+
+               /* And seek the decoder */
+               dynamic_pointer_cast<VideoDecoder>((*i)->decoder)->seek (
+                       vc->time_to_content_video_frames (s + vc->trim_start ()), accurate
+                       );
 
+               (*i)->reset_repeat ();
+       }
+
+       _video_position = _audio_position = t;
+
+       /* XXX: don't seek audio because we don't need to... */
+}
 
 void
-Player::setup_decoders ()
+Player::setup_pieces ()
 {
-       _video_decoders.clear ();
-       _video_decoder = 0;
-       _audio_decoders.clear ();
-       _sequential_audio_decoder = 0;
+       list<shared_ptr<Piece> > old_pieces = _pieces;
 
-       _video_start.clear();
-       _audio_start.clear();
+       _pieces.clear ();
+
+       ContentList content = _playlist->content ();
+       sort (content.begin(), content.end(), ContentSorter ());
+
+       for (ContentList::iterator i = content.begin(); i != content.end(); ++i) {
+
+               if (!(*i)->paths_valid ()) {
+                       continue;
+               }
+
+               shared_ptr<Piece> piece (new Piece (*i));
 
-       double video_so_far = 0;
-       double audio_so_far = 0;
-       
-       list<shared_ptr<const VideoContent> > vc = _playlist->video ();
-       for (list<shared_ptr<const VideoContent> >::iterator i = vc.begin(); i != vc.end(); ++i) {
-               
-               shared_ptr<const VideoContent> video_content;
-               shared_ptr<const AudioContent> audio_content;
-               shared_ptr<VideoDecoder> video_decoder;
-               shared_ptr<AudioDecoder> audio_decoder;
-               
                /* XXX: into content? */
-               
+
                shared_ptr<const FFmpegContent> fc = dynamic_pointer_cast<const FFmpegContent> (*i);
                if (fc) {
-                       shared_ptr<FFmpegDecoder> fd (
-                               new FFmpegDecoder (
-                                       _film, fc, _video,
-                                       _audio && _playlist->audio_from() == Playlist::AUDIO_FFMPEG,
-                                       _subtitles
-                                       )
-                               );
+                       shared_ptr<FFmpegDecoder> fd (new FFmpegDecoder (_film, fc, _video, _audio));
                        
-                       video_content = fc;
-                       audio_content = fc;
-                       video_decoder = fd;
-                       audio_decoder = fd;
+                       fd->Video.connect (bind (&Player::process_video, this, weak_ptr<Piece> (piece), _1, _2, _3, _4, _5, 0));
+                       fd->Audio.connect (bind (&Player::process_audio, this, weak_ptr<Piece> (piece), _1, _2, false));
+                       fd->Subtitle.connect (bind (&Player::process_subtitle, this, weak_ptr<Piece> (piece), _1, _2, _3, _4));
+
+                       fd->seek (fc->time_to_content_video_frames (fc->trim_start ()), true);
+                       piece->decoder = fd;
                }
                
-               shared_ptr<const ImageMagickContent> ic = dynamic_pointer_cast<const ImageMagickContent> (*i);
+               shared_ptr<const ImageContent> ic = dynamic_pointer_cast<const ImageContent> (*i);
                if (ic) {
-                       video_content = ic;
-                       video_decoder.reset (new ImageMagickDecoder (_film, ic));
+                       bool reusing = false;
+                       
+                       /* 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) {
+                                       piece = *j;
+                                       reusing = true;
+                               }
+                       }
+
+                       if (!reusing) {
+                               shared_ptr<ImageDecoder> id (new ImageDecoder (_film, ic));
+                               id->Video.connect (bind (&Player::process_video, this, weak_ptr<Piece> (piece), _1, _2, _3, _4, _5, 0));
+                               piece->decoder = id;
+                       }
                }
-               
-               video_decoder->connect_video (shared_from_this ());
-               _video_decoders.push_back (video_decoder);
-               _video_start.push_back (video_so_far);
-               video_so_far += video_content->video_length() / video_content->video_frame_rate();
-
-               if (audio_decoder && _playlist->audio_from() == Playlist::AUDIO_FFMPEG) {
-                       audio_decoder->Audio.connect (bind (&Player::process_audio, this, audio_content, _1, _2));
-                       _audio_decoders.push_back (audio_decoder);
-                       _audio_start.push_back (audio_so_far);
-                       audio_so_far += double(audio_content->audio_length()) / audio_content->audio_frame_rate();
+
+               shared_ptr<const SndfileContent> sc = dynamic_pointer_cast<const SndfileContent> (*i);
+               if (sc) {
+                       shared_ptr<AudioDecoder> sd (new SndfileDecoder (_film, sc));
+                       sd->Audio.connect (bind (&Player::process_audio, this, weak_ptr<Piece> (piece), _1, _2, false));
+
+                       piece->decoder = sd;
                }
+
+               _pieces.push_back (piece);
        }
-       
-       _video_decoder = 0;
-       _sequential_audio_decoder = 0;
 
-       if (_playlist->audio_from() == Playlist::AUDIO_SNDFILE) {
+       _have_valid_pieces = true;
+}
+
+void
+Player::content_changed (weak_ptr<Content> w, int property, bool frequent)
+{
+       shared_ptr<Content> c = w.lock ();
+       if (!c) {
+               return;
+       }
+
+       if (
+               property == ContentProperty::POSITION || property == ContentProperty::LENGTH ||
+               property == ContentProperty::TRIM_START || property == ContentProperty::TRIM_END ||
+               property == VideoContentProperty::VIDEO_FRAME_TYPE 
+               ) {
                
-               list<shared_ptr<const AudioContent> > ac = _playlist->audio ();
-               for (list<shared_ptr<const AudioContent> >::iterator i = ac.begin(); i != ac.end(); ++i) {
-                       
-                       shared_ptr<const SndfileContent> sc = dynamic_pointer_cast<const SndfileContent> (*i);
-                       assert (sc);
-                       
-                       shared_ptr<AudioDecoder> d (new SndfileDecoder (_film, sc));
-                       d->Audio.connect (bind (&Player::process_audio, this, sc, _1, _2));
-                       _audio_decoders.push_back (d);
-                       _audio_start.push_back (audio_so_far);
+               _have_valid_pieces = false;
+               Changed (frequent);
+
+       } else if (
+               property == SubtitleContentProperty::SUBTITLE_X_OFFSET ||
+               property == SubtitleContentProperty::SUBTITLE_Y_OFFSET ||
+               property == SubtitleContentProperty::SUBTITLE_X_SCALE ||
+               property == SubtitleContentProperty::SUBTITLE_Y_SCALE
+               ) {
+
+               for (list<Subtitle>::iterator i = _subtitles.begin(); i != _subtitles.end(); ++i) {
+                       i->update (_film, _video_container_size);
                }
+               
+               Changed (frequent);
+
+       } else if (
+               property == VideoContentProperty::VIDEO_CROP || property == VideoContentProperty::VIDEO_SCALE ||
+               property == VideoContentProperty::VIDEO_FRAME_RATE
+               ) {
+               
+               Changed (frequent);
+
+       } else if (property == ContentProperty::PATH) {
+
+               _have_valid_pieces = false;
+               Changed (frequent);
        }
 }
 
-double
-Player::last_video_time () const
+void
+Player::playlist_changed ()
 {
-       return _video_start[_video_decoder] + _video_decoders[_video_decoder]->last_content_time ();
+       _have_valid_pieces = false;
+       Changed (false);
 }
 
 void
-Player::content_changed (weak_ptr<Content> w, int p)
+Player::set_video_container_size (libdcp::Size s)
 {
-       shared_ptr<Content> c = w.lock ();
-       if (!c) {
+       _video_container_size = s;
+
+       shared_ptr<Image> im (new Image (PIX_FMT_RGB24, _video_container_size, true));
+       im->make_black ();
+       
+       _black_frame.reset (
+               new PlayerVideoFrame (
+                       shared_ptr<ImageProxy> (new RawImageProxy (im, _film->log ())),
+                       Crop(),
+                       _video_container_size,
+                       _video_container_size,
+                       Scaler::from_id ("bicubic"),
+                       EYES_BOTH,
+                       PART_WHOLE,
+                       ColourConversion ()
+                       )
+               );
+}
+
+shared_ptr<Resampler>
+Player::resampler (shared_ptr<AudioContent> c, bool create)
+{
+       map<shared_ptr<AudioContent>, shared_ptr<Resampler> >::iterator i = _resamplers.find (c);
+       if (i != _resamplers.end ()) {
+               return i->second;
+       }
+
+       if (!create) {
+               return shared_ptr<Resampler> ();
+       }
+
+       LOG_GENERAL (
+               "Creating new resampler for %1 to %2 with %3 channels", c->content_audio_frame_rate(), c->output_audio_frame_rate(), c->audio_channels()
+               );
+
+       shared_ptr<Resampler> r (new Resampler (c->content_audio_frame_rate(), c->output_audio_frame_rate(), c->audio_channels()));
+       _resamplers[c] = r;
+       return r;
+}
+
+void
+Player::emit_black ()
+{
+#ifdef DCPOMATIC_DEBUG
+       _last_video.reset ();
+#endif
+
+       Video (_black_frame, _last_emit_was_black, _video_position);
+       _video_position += _film->video_frames_to_time (1);
+       _last_emit_was_black = true;
+}
+
+void
+Player::emit_silence (OutputAudioFrame most)
+{
+       if (most == 0) {
                return;
        }
+       
+       OutputAudioFrame N = min (most, _film->audio_frame_rate() / 2);
+       shared_ptr<AudioBuffers> silence (new AudioBuffers (_film->audio_channels(), N));
+       silence->make_silent ();
+       Audio (silence, _audio_position);
+       _audio_position += _film->audio_frames_to_time (N);
+}
 
-       if (p == VideoContentProperty::VIDEO_LENGTH) {
-               if (dynamic_pointer_cast<FFmpegContent> (c)) {
-                       /* FFmpeg content length changes are serious; we need new decoders */
-                       _have_valid_decoders = false;
-               }
+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.
+       */
+
+       if (p == Film::SCALER || p == Film::WITH_SUBTITLES || p == Film::CONTAINER || p == Film::VIDEO_FRAME_RATE) {
+               Changed (false);
        }
 }
 
 void
-Player::playlist_changed ()
+Player::process_subtitle (weak_ptr<Piece> weak_piece, shared_ptr<Image> image, dcpomatic::Rect<double> rect, Time from, Time to)
+{
+       if (!image) {
+               /* A null image means that we should stop any current subtitles at `from' */
+               for (list<Subtitle>::iterator i = _subtitles.begin(); i != _subtitles.end(); ++i) {
+                       i->set_stop (from);
+               }
+       } else {
+               _subtitles.push_back (Subtitle (_film, _video_container_size, weak_piece, image, rect, from, to));
+       }
+}
+
+/** 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 ()
 {
-       _have_valid_decoders = false;
+       if (!_last_incoming_video.image || !_have_valid_pieces) {
+               return false;
+       }
+
+       process_video (
+               _last_incoming_video.weak_piece,
+               _last_incoming_video.image,
+               _last_incoming_video.eyes,
+               _last_incoming_video.part,
+               _last_incoming_video.same,
+               _last_incoming_video.frame,
+               _last_incoming_video.extra
+               );
+
+       return true;
 }