From ea910e250a0fb3b0ad3ce0cf32dd27b24c17cd1d Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Wed, 11 Dec 2013 10:31:18 +0000
Subject: Various work on better seeking (and seeking of audio).

---
 src/lib/ffmpeg_decoder.h | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'src/lib/ffmpeg_decoder.h')

diff --git a/src/lib/ffmpeg_decoder.h b/src/lib/ffmpeg_decoder.h
index 11f83ed97..f54ee2496 100644
--- a/src/lib/ffmpeg_decoder.h
+++ b/src/lib/ffmpeg_decoder.h
@@ -52,7 +52,7 @@ public:
 	~FFmpegDecoder ();
 
 	void pass ();
-	void seek (VideoContent::Frame, bool);
+	void seek (Time time, bool);
 	bool done () const;
 
 private:
@@ -74,6 +74,11 @@ private:
 	void maybe_add_subtitle ();
 	boost::shared_ptr<AudioBuffers> deinterleave_audio (uint8_t** data, int size);
 
+	bool seek_overrun_finished (Time) const;
+	bool seek_final_finished (int, int) const;
+	int minimal_run (boost::function<bool (int)>);
+	void seek_and_flush (int64_t);
+
 	AVCodecContext* _subtitle_codec_context; ///< may be 0 if there is no subtitle
 	AVCodec* _subtitle_codec;		 ///< may be 0 if there is no subtitle
 	
-- 
cgit v1.2.3


From 097a1fb413bbbb89182161d4c1a31daa5419ec96 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Fri, 13 Dec 2013 10:06:18 +0000
Subject: Time -> DCPTime.

---
 src/lib/analyse_audio_job.cc  |  2 +-
 src/lib/analyse_audio_job.h   |  2 +-
 src/lib/audio_content.cc      |  4 +-
 src/lib/audio_content.h       |  4 +-
 src/lib/audio_merger.h        |  2 +-
 src/lib/content.cc            | 18 ++++-----
 src/lib/content.h             | 30 +++++++--------
 src/lib/decoder.h             |  2 +-
 src/lib/ffmpeg_content.cc     |  2 +-
 src/lib/ffmpeg_content.h      |  2 +-
 src/lib/ffmpeg_decoder.cc     | 14 +++----
 src/lib/ffmpeg_decoder.h      |  4 +-
 src/lib/film.cc               | 12 +++---
 src/lib/film.h                | 12 +++---
 src/lib/image_content.cc      |  2 +-
 src/lib/image_content.h       |  2 +-
 src/lib/image_decoder.cc      |  2 +-
 src/lib/image_decoder.h       |  2 +-
 src/lib/job.cc                |  2 +-
 src/lib/player.cc             | 34 ++++++++---------
 src/lib/player.h              | 30 +++++++--------
 src/lib/playlist.cc           | 20 +++++-----
 src/lib/playlist.h            |  6 +--
 src/lib/sndfile_content.cc    |  2 +-
 src/lib/sndfile_content.h     |  2 +-
 src/lib/sndfile_decoder.cc    |  2 +-
 src/lib/sndfile_decoder.h     |  2 +-
 src/lib/subtitle_decoder.cc   |  2 +-
 src/lib/subtitle_decoder.h    |  6 +--
 src/lib/timer.cc              | 14 +++----
 src/lib/timer.h               | 18 ++++-----
 src/lib/types.h               |  5 ++-
 src/lib/video_content.cc      |  4 +-
 src/lib/video_content.h       |  4 +-
 src/tools/server_test.cc      |  2 +-
 src/wx/audio_plot.cc          |  2 +-
 src/wx/film_editor.cc         |  4 +-
 src/wx/film_editor.h          |  6 +--
 src/wx/film_viewer.cc         |  8 ++--
 src/wx/film_viewer.h          |  4 +-
 src/wx/timecode.cc            | 26 ++++++-------
 src/wx/timecode.h             |  8 ++--
 src/wx/timeline.cc            | 86 +++++++++++++++++++++----------------------
 src/wx/timeline.h             | 10 ++---
 src/wx/timeline_dialog.cc     |  8 ++--
 src/wx/timeline_dialog.h      |  6 +--
 src/wx/timing_panel.cc        | 10 ++---
 src/wx/timing_panel.h         | 12 +++---
 test/ffmpeg_seek_test.cc      | 12 +++---
 test/long_ffmpeg_seek_test.cc | 12 +++---
 test/play_test.cc             |  6 +--
 51 files changed, 247 insertions(+), 246 deletions(-)

(limited to 'src/lib/ffmpeg_decoder.h')

diff --git a/src/lib/analyse_audio_job.cc b/src/lib/analyse_audio_job.cc
index 8186f9de4..3f84bf16d 100644
--- a/src/lib/analyse_audio_job.cc
+++ b/src/lib/analyse_audio_job.cc
@@ -81,7 +81,7 @@ AnalyseAudioJob::run ()
 }
 
 void
-AnalyseAudioJob::audio (shared_ptr<const AudioBuffers> b, Time)
+AnalyseAudioJob::audio (shared_ptr<const AudioBuffers> b, DCPTime)
 {
 	for (int i = 0; i < b->frames(); ++i) {
 		for (int j = 0; j < b->channels(); ++j) {
diff --git a/src/lib/analyse_audio_job.h b/src/lib/analyse_audio_job.h
index 3d4881983..2e93ef500 100644
--- a/src/lib/analyse_audio_job.h
+++ b/src/lib/analyse_audio_job.h
@@ -33,7 +33,7 @@ public:
 	void run ();
 
 private:
-	void audio (boost::shared_ptr<const AudioBuffers>, Time);
+	void audio (boost::shared_ptr<const AudioBuffers>, DCPTime);
 
 	boost::weak_ptr<AudioContent> _content;
 	OutputAudioFrame _done;
diff --git a/src/lib/audio_content.cc b/src/lib/audio_content.cc
index 0c4586681..de743571b 100644
--- a/src/lib/audio_content.cc
+++ b/src/lib/audio_content.cc
@@ -39,7 +39,7 @@ int const AudioContentProperty::AUDIO_GAIN = 203;
 int const AudioContentProperty::AUDIO_DELAY = 204;
 int const AudioContentProperty::AUDIO_MAPPING = 205;
 
-AudioContent::AudioContent (shared_ptr<const Film> f, Time s)
+AudioContent::AudioContent (shared_ptr<const Film> f, DCPTime s)
 	: Content (f, s)
 	, _audio_gain (0)
 	, _audio_delay (0)
@@ -157,7 +157,7 @@ AudioContent::technical_summary () const
  *  the `controlling' video content is active.
  */
 AudioContent::Frame
-AudioContent::time_to_content_audio_frames (Time t, Time at) const
+AudioContent::time_to_content_audio_frames (DCPTime t, DCPTime at) const
 {
 	shared_ptr<const Film> film = _film.lock ();
 	assert (film);
diff --git a/src/lib/audio_content.h b/src/lib/audio_content.h
index 10114e10d..e1b38bd97 100644
--- a/src/lib/audio_content.h
+++ b/src/lib/audio_content.h
@@ -43,7 +43,7 @@ class AudioContent : public virtual Content
 public:
 	typedef int64_t Frame;
 	
-	AudioContent (boost::shared_ptr<const Film>, Time);
+	AudioContent (boost::shared_ptr<const Film>, DCPTime);
 	AudioContent (boost::shared_ptr<const Film>, boost::filesystem::path);
 	AudioContent (boost::shared_ptr<const Film>, boost::shared_ptr<const cxml::Node>);
 	AudioContent (boost::shared_ptr<const Film>, std::vector<boost::shared_ptr<Content> >);
@@ -74,7 +74,7 @@ public:
 		return _audio_delay;
 	}
 
-	Frame time_to_content_audio_frames (Time, Time) const;
+	Frame time_to_content_audio_frames (DCPTime, DCPTime) const;
 	
 private:
 	/** Gain to apply to audio in dB */
diff --git a/src/lib/audio_merger.h b/src/lib/audio_merger.h
index 6ad33fb37..2a1cc761b 100644
--- a/src/lib/audio_merger.h
+++ b/src/lib/audio_merger.h
@@ -102,7 +102,7 @@ public:
 	}
 
 	void
-	clear (Time t)
+	clear (DCPTime t)
 	{
 		_last_pull = t;
 		_buffers.reset (new AudioBuffers (_buffers->channels(), 0));
diff --git a/src/lib/content.cc b/src/lib/content.cc
index f09012765..7db349617 100644
--- a/src/lib/content.cc
+++ b/src/lib/content.cc
@@ -54,7 +54,7 @@ Content::Content (shared_ptr<const Film> f)
 
 }
 
-Content::Content (shared_ptr<const Film> f, Time p)
+Content::Content (shared_ptr<const Film> f, DCPTime p)
 	: _film (f)
 	, _position (p)
 	, _trim_start (0)
@@ -83,9 +83,9 @@ Content::Content (shared_ptr<const Film> f, shared_ptr<const cxml::Node> node)
 		_paths.push_back ((*i)->content ());
 	}
 	_digest = node->string_child ("Digest");
-	_position = node->number_child<Time> ("Position");
-	_trim_start = node->number_child<Time> ("TrimStart");
-	_trim_end = node->number_child<Time> ("TrimEnd");
+	_position = node->number_child<DCPTime> ("Position");
+	_trim_start = node->number_child<DCPTime> ("TrimStart");
+	_trim_end = node->number_child<DCPTime> ("TrimEnd");
 }
 
 Content::Content (shared_ptr<const Film> f, vector<shared_ptr<Content> > c)
@@ -146,7 +146,7 @@ Content::signal_changed (int p)
 }
 
 void
-Content::set_position (Time p)
+Content::set_position (DCPTime p)
 {
 	{
 		boost::mutex::scoped_lock lm (_mutex);
@@ -157,7 +157,7 @@ Content::set_position (Time p)
 }
 
 void
-Content::set_trim_start (Time t)
+Content::set_trim_start (DCPTime t)
 {
 	{
 		boost::mutex::scoped_lock lm (_mutex);
@@ -168,7 +168,7 @@ Content::set_trim_start (Time t)
 }
 
 void
-Content::set_trim_end (Time t)
+Content::set_trim_end (DCPTime t)
 {
 	{
 		boost::mutex::scoped_lock lm (_mutex);
@@ -200,7 +200,7 @@ Content::technical_summary () const
 	return String::compose ("%1 %2 %3", path_summary(), digest(), position());
 }
 
-Time
+DCPTime
 Content::length_after_trim () const
 {
 	return full_length() - trim_start() - trim_end();
@@ -210,7 +210,7 @@ Content::length_after_trim () const
  *  @return true if this time is trimmed by our trim settings.
  */
 bool
-Content::trimmed (Time t) const
+Content::trimmed (DCPTime t) const
 {
 	return (t < trim_start() || t > (full_length() - trim_end ()));
 }
diff --git a/src/lib/content.h b/src/lib/content.h
index 9cf6d866a..1eee02e01 100644
--- a/src/lib/content.h
+++ b/src/lib/content.h
@@ -49,7 +49,7 @@ class Content : public boost::enable_shared_from_this<Content>, public boost::no
 {
 public:
 	Content (boost::shared_ptr<const Film>);
-	Content (boost::shared_ptr<const Film>, Time);
+	Content (boost::shared_ptr<const Film>, DCPTime);
 	Content (boost::shared_ptr<const Film>, boost::filesystem::path);
 	Content (boost::shared_ptr<const Film>, boost::shared_ptr<const cxml::Node>);
 	Content (boost::shared_ptr<const Film>, std::vector<boost::shared_ptr<Content> >);
@@ -60,7 +60,7 @@ public:
 	virtual std::string technical_summary () const;
 	virtual std::string information () const = 0;
 	virtual void as_xml (xmlpp::Node *) const;
-	virtual Time full_length () const = 0;
+	virtual DCPTime full_length () const = 0;
 	virtual std::string identifier () const;
 
 	boost::shared_ptr<Content> clone () const;
@@ -92,41 +92,41 @@ public:
 		return _digest;
 	}
 
-	void set_position (Time);
+	void set_position (DCPTime);
 
-	/** Time that this content starts; i.e. the time that the first
+	/** DCPTime that this content starts; i.e. the time that the first
 	 *  bit of the content (trimmed or not) will happen.
 	 */
-	Time position () const {
+	DCPTime position () const {
 		boost::mutex::scoped_lock lm (_mutex);
 		return _position;
 	}
 
-	void set_trim_start (Time);
+	void set_trim_start (DCPTime);
 
-	Time trim_start () const {
+	DCPTime trim_start () const {
 		boost::mutex::scoped_lock lm (_mutex);
 		return _trim_start;
 	}
 
-	void set_trim_end (Time);
+	void set_trim_end (DCPTime);
 	
-	Time trim_end () const {
+	DCPTime trim_end () const {
 		boost::mutex::scoped_lock lm (_mutex);
 		return _trim_end;
 	}
 	
-	Time end () const {
+	DCPTime end () const {
 		return position() + length_after_trim() - 1;
 	}
 
-	Time length_after_trim () const;
+	DCPTime length_after_trim () const;
 	
 	void set_change_signals_frequent (bool f) {
 		_change_signals_frequent = f;
 	}
 
-	bool trimmed (Time) const;
+	bool trimmed (DCPTime) const;
 
 	boost::signals2::signal<void (boost::weak_ptr<Content>, int, bool)> Changed;
 
@@ -145,9 +145,9 @@ protected:
 	
 private:
 	std::string _digest;
-	Time _position;
-	Time _trim_start;
-	Time _trim_end;
+	DCPTime _position;
+	DCPTime _trim_start;
+	DCPTime _trim_end;
 	bool _change_signals_frequent;
 };
 
diff --git a/src/lib/decoder.h b/src/lib/decoder.h
index 908d3aae5..aa36d41b4 100644
--- a/src/lib/decoder.h
+++ b/src/lib/decoder.h
@@ -50,7 +50,7 @@ public:
 	 *  time.  Pass accurate = true to try harder to get close to
 	 *  the request.
 	 */
-	virtual void seek (Time time, bool accurate) = 0;
+	virtual void seek (DCPTime time, bool accurate) = 0;
 
 	virtual bool done () const = 0;
 
diff --git a/src/lib/ffmpeg_content.cc b/src/lib/ffmpeg_content.cc
index b6df2e929..65a8d24f1 100644
--- a/src/lib/ffmpeg_content.cc
+++ b/src/lib/ffmpeg_content.cc
@@ -445,7 +445,7 @@ FFmpegSubtitleStream::as_xml (xmlpp::Node* root) const
 	FFmpegStream::as_xml (root);
 }
 
-Time
+DCPTime
 FFmpegContent::full_length () const
 {
 	shared_ptr<const Film> film = _film.lock ();
diff --git a/src/lib/ffmpeg_content.h b/src/lib/ffmpeg_content.h
index 7ff159b85..ba73c0f9b 100644
--- a/src/lib/ffmpeg_content.h
+++ b/src/lib/ffmpeg_content.h
@@ -134,7 +134,7 @@ public:
 	std::string technical_summary () const;
 	std::string information () const;
 	void as_xml (xmlpp::Node *) const;
-	Time full_length () const;
+	DCPTime full_length () const;
 
 	std::string identifier () const;
 	
diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc
index ed0574c61..2cb18c557 100644
--- a/src/lib/ffmpeg_decoder.cc
+++ b/src/lib/ffmpeg_decoder.cc
@@ -351,7 +351,7 @@ FFmpegDecoder::minimal_run (boost::function<bool (int)> finished)
 }
 
 bool
-FFmpegDecoder::seek_overrun_finished (Time seek) const
+FFmpegDecoder::seek_overrun_finished (DCPTime seek) const
 {
 	return (
 		_video_position >= _ffmpeg_content->time_to_content_video_frames (seek) ||
@@ -366,7 +366,7 @@ FFmpegDecoder::seek_final_finished (int n, int done) const
 }
 
 void
-FFmpegDecoder::seek_and_flush (Time t)
+FFmpegDecoder::seek_and_flush (DCPTime t)
 {
 	int64_t const initial_v = ((_ffmpeg_content->time_to_content_video_frames (t) / _ffmpeg_content->video_frame_rate()) - _video_pts_offset) /
 		av_q2d (_format_context->streams[_video_stream]->time_base);
@@ -394,15 +394,15 @@ FFmpegDecoder::seek_and_flush (Time t)
 }
 
 void
-FFmpegDecoder::seek (Time time, bool accurate)
+FFmpegDecoder::seek (DCPTime time, bool accurate)
 {
 	/* If we are doing an accurate seek, our initial shot will be 200ms (200 being
 	   a number plucked from the air) earlier than we want to end up.  The loop below
 	   will hopefully then step through to where we want to be.
 	*/
 
-	Time pre_roll = accurate ? (0.2 * TIME_HZ) : 0;
-	Time initial_seek = time - pre_roll;
+	DCPTime pre_roll = accurate ? (0.2 * TIME_HZ) : 0;
+	DCPTime initial_seek = time - pre_roll;
 	if (initial_seek < 0) {
 		initial_seek = 0;
 	}
@@ -625,8 +625,8 @@ FFmpegDecoder::decode_subtitle_packet ()
 	double const packet_time = static_cast<double> (sub.pts) / AV_TIME_BASE;
 	
 	/* hence start time for this sub */
-	Time const from = (packet_time + (double (sub.start_display_time) / 1e3)) * TIME_HZ;
-	Time const to = (packet_time + (double (sub.end_display_time) / 1e3)) * TIME_HZ;
+	DCPTime const from = (packet_time + (double (sub.start_display_time) / 1e3)) * TIME_HZ;
+	DCPTime const to = (packet_time + (double (sub.end_display_time) / 1e3)) * TIME_HZ;
 
 	AVSubtitleRect const * rect = sub.rects[0];
 
diff --git a/src/lib/ffmpeg_decoder.h b/src/lib/ffmpeg_decoder.h
index f54ee2496..06e0ef8a5 100644
--- a/src/lib/ffmpeg_decoder.h
+++ b/src/lib/ffmpeg_decoder.h
@@ -52,7 +52,7 @@ public:
 	~FFmpegDecoder ();
 
 	void pass ();
-	void seek (Time time, bool);
+	void seek (DCPTime time, bool);
 	bool done () const;
 
 private:
@@ -74,7 +74,7 @@ private:
 	void maybe_add_subtitle ();
 	boost::shared_ptr<AudioBuffers> deinterleave_audio (uint8_t** data, int size);
 
-	bool seek_overrun_finished (Time) const;
+	bool seek_overrun_finished (DCPTime) const;
 	bool seek_final_finished (int, int) const;
 	int minimal_run (boost::function<bool (int)>);
 	void seek_and_flush (int64_t);
diff --git a/src/lib/film.cc b/src/lib/film.cc
index b61991a45..8e93667d5 100644
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -842,7 +842,7 @@ Film::move_content_later (shared_ptr<Content> c)
 	_playlist->move_later (c);
 }
 
-Time
+DCPTime
 Film::length () const
 {
 	return _playlist->length ();
@@ -867,7 +867,7 @@ Film::content_paths_valid () const
 }
 
 FrameRateChange
-Film::active_frame_rate_change (Time t) const
+Film::active_frame_rate_change (DCPTime t) const
 {
 	return _playlist->active_frame_rate_change (t, video_frame_rate ());
 }
@@ -891,24 +891,24 @@ Film::playlist_changed ()
 }	
 
 OutputAudioFrame
-Film::time_to_audio_frames (Time t) const
+Film::time_to_audio_frames (DCPTime t) const
 {
 	return t * audio_frame_rate () / TIME_HZ;
 }
 
 OutputVideoFrame
-Film::time_to_video_frames (Time t) const
+Film::time_to_video_frames (DCPTime t) const
 {
 	return t * video_frame_rate () / TIME_HZ;
 }
 
-Time
+DCPTime
 Film::audio_frames_to_time (OutputAudioFrame f) const
 {
 	return f * TIME_HZ / audio_frame_rate ();
 }
 
-Time
+DCPTime
 Film::video_frames_to_time (OutputVideoFrame f) const
 {
 	return f * TIME_HZ / video_frame_rate ();
diff --git a/src/lib/film.h b/src/lib/film.h
index 6573bd5b7..a0ace9981 100644
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -103,19 +103,19 @@ public:
 
 	OutputAudioFrame audio_frame_rate () const;
 
-	OutputAudioFrame time_to_audio_frames (Time) const;
-	OutputVideoFrame time_to_video_frames (Time) const;
-	Time video_frames_to_time (OutputVideoFrame) const;
-	Time audio_frames_to_time (OutputAudioFrame) const;
+	OutputAudioFrame time_to_audio_frames (DCPTime) const;
+	OutputVideoFrame time_to_video_frames (DCPTime) const;
+	DCPTime video_frames_to_time (OutputVideoFrame) const;
+	DCPTime audio_frames_to_time (OutputAudioFrame) const;
 
 	/* Proxies for some Playlist methods */
 
 	ContentList content () const;
-	Time length () const;
+	DCPTime length () const;
 	bool has_subtitles () const;
 	OutputVideoFrame best_video_frame_rate () const;
 	bool content_paths_valid () const;
-	FrameRateChange active_frame_rate_change (Time) const;
+	FrameRateChange active_frame_rate_change (DCPTime) const;
 
 	libdcp::KDM
 	make_kdm (
diff --git a/src/lib/image_content.cc b/src/lib/image_content.cc
index 8eba33f3a..0f9526071 100644
--- a/src/lib/image_content.cc
+++ b/src/lib/image_content.cc
@@ -120,7 +120,7 @@ ImageContent::set_video_length (VideoContent::Frame len)
 	signal_changed (ContentProperty::LENGTH);
 }
 
-Time
+DCPTime
 ImageContent::full_length () const
 {
 	shared_ptr<const Film> film = _film.lock ();
diff --git a/src/lib/image_content.h b/src/lib/image_content.h
index 47c5a20e3..88c178faa 100644
--- a/src/lib/image_content.h
+++ b/src/lib/image_content.h
@@ -41,7 +41,7 @@ public:
 	std::string summary () const;
 	std::string technical_summary () const;
 	void as_xml (xmlpp::Node *) const;
-	Time full_length () const;
+	DCPTime full_length () const;
 
 	std::string identifier () const;
 	
diff --git a/src/lib/image_decoder.cc b/src/lib/image_decoder.cc
index bf3bc344b..723690247 100644
--- a/src/lib/image_decoder.cc
+++ b/src/lib/image_decoder.cc
@@ -77,7 +77,7 @@ ImageDecoder::pass ()
 }
 
 void
-ImageDecoder::seek (Time time, bool)
+ImageDecoder::seek (DCPTime time, bool)
 {
 	_video_position = _video_content->time_to_content_video_frames (time);
 }
diff --git a/src/lib/image_decoder.h b/src/lib/image_decoder.h
index 1f5f0b9d2..346fffdf7 100644
--- a/src/lib/image_decoder.h
+++ b/src/lib/image_decoder.h
@@ -37,7 +37,7 @@ public:
 	/* Decoder */
 
 	void pass ();
-	void seek (Time, bool);
+	void seek (DCPTime, bool);
 	bool done () const;
 
 private:
diff --git a/src/lib/job.cc b/src/lib/job.cc
index 9981934ec..05a90524c 100644
--- a/src/lib/job.cc
+++ b/src/lib/job.cc
@@ -198,7 +198,7 @@ Job::set_state (State s)
 	}
 }
 
-/** @return Time (in seconds) that this sub-job has been running */
+/** @return DCPTime (in seconds) that this sub-job has been running */
 int
 Job::elapsed_time () const
 {
diff --git a/src/lib/player.cc b/src/lib/player.cc
index 184c9811f..be22ae242 100644
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -100,10 +100,10 @@ public:
 	
 	shared_ptr<Content> content;
 	shared_ptr<Decoder> decoder;
-	/** Time of the last video we emitted relative to the start of the DCP */
-	Time video_position;
-	/** Time of the last audio we emitted relative to the start of the DCP */
-	Time audio_position;
+	/** DCPTime of the last video we emitted relative to the start of the DCP */
+	DCPTime video_position;
+	/** DCPTime of the last audio we emitted relative to the start of the DCP */
+	DCPTime audio_position;
 
 	IncomingVideo repeat_video;
 	int repeat_to_do;
@@ -146,7 +146,7 @@ Player::pass ()
 		setup_pieces ();
 	}
 
-	Time earliest_t = TIME_MAX;
+	DCPTime earliest_t = TIME_MAX;
 	shared_ptr<Piece> earliest;
 	enum {
 		VIDEO,
@@ -218,7 +218,7 @@ Player::pass ()
 	}
 
 	if (_audio) {
-		boost::optional<Time> audio_done_up_to;
+		boost::optional<DCPTime> audio_done_up_to;
 		for (list<shared_ptr<Piece> >::iterator i = _pieces.begin(); i != _pieces.end(); ++i) {
 			if ((*i)->decoder->done ()) {
 				continue;
@@ -230,7 +230,7 @@ Player::pass ()
 		}
 
 		if (audio_done_up_to) {
-			TimedAudioBuffers<Time> tb = _audio_merger.pull (audio_done_up_to.get ());
+			TimedAudioBuffers<DCPTime> tb = _audio_merger.pull (audio_done_up_to.get ());
 			Audio (tb.audio, tb.time);
 			_audio_position += _film->audio_frames_to_time (tb.audio->frames ());
 		}
@@ -241,7 +241,7 @@ Player::pass ()
 
 /** @param extra Amount of extra time to add to the content frame's time (for repeat) */
 void
-Player::process_video (weak_ptr<Piece> weak_piece, shared_ptr<const Image> image, Eyes eyes, bool same, VideoContent::Frame frame, Time extra)
+Player::process_video (weak_ptr<Piece> weak_piece, shared_ptr<const Image> image, Eyes eyes, bool same, VideoContent::Frame frame, DCPTime extra)
 {
 	/* Keep a note of what came in so that we can repeat it if required */
 	_last_incoming_video.weak_piece = weak_piece;
@@ -264,12 +264,12 @@ Player::process_video (weak_ptr<Piece> weak_piece, shared_ptr<const Image> image
 		return;
 	}
 
-	Time const relative_time = (frame * frc.factor() * TIME_HZ / _film->video_frame_rate());
+	DCPTime 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 ();
+	DCPTime const time = content->position() + relative_time + extra - content->trim_start ();
 	float const ratio = content->ratio() ? content->ratio()->ratio() : content->video_size_after_crop().ratio();
 	libdcp::Size const image_size = fit_ratio_within (ratio, _video_container_size);
 
@@ -333,13 +333,13 @@ Player::process_audio (weak_ptr<Piece> weak_piece, shared_ptr<const AudioBuffers
 		frame = ro.second;
 	}
 	
-	Time const relative_time = _film->audio_frames_to_time (frame);
+	DCPTime const relative_time = _film->audio_frames_to_time (frame);
 
 	if (content->trimmed (relative_time)) {
 		return;
 	}
 
-	Time time = content->position() + (content->audio_delay() * TIME_HZ / 1000) + relative_time - content->trim_start ();
+	DCPTime time = content->position() + (content->audio_delay() * TIME_HZ / 1000) + relative_time - content->trim_start ();
 	
 	/* Remap channels */
 	shared_ptr<AudioBuffers> dcp_mapped (new AudioBuffers (_film->audio_channels(), audio->frames()));
@@ -374,7 +374,7 @@ Player::process_audio (weak_ptr<Piece> weak_piece, shared_ptr<const AudioBuffers
 void
 Player::flush ()
 {
-	TimedAudioBuffers<Time> tb = _audio_merger.flush ();
+	TimedAudioBuffers<DCPTime> tb = _audio_merger.flush ();
 	if (tb.audio) {
 		Audio (tb.audio, tb.time);
 		_audio_position += _film->audio_frames_to_time (tb.audio->frames ());
@@ -395,7 +395,7 @@ Player::flush ()
  *  @return true on error
  */
 void
-Player::seek (Time t, bool accurate)
+Player::seek (DCPTime t, bool accurate)
 {
 	if (!_have_valid_pieces) {
 		setup_pieces ();
@@ -412,8 +412,8 @@ Player::seek (Time t, bool accurate)
 		}
 
 		/* 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);
+		DCPTime s = t - vc->position ();
+		s = max (static_cast<DCPTime> (0), s);
 		s = min (vc->length_after_trim(), s);
 
 		/* Hence set the piece positions to the `global' time */
@@ -613,7 +613,7 @@ Player::film_changed (Film::Property p)
 }
 
 void
-Player::process_subtitle (weak_ptr<Piece> weak_piece, shared_ptr<Image> image, dcpomatic::Rect<double> rect, Time from, Time to)
+Player::process_subtitle (weak_ptr<Piece> weak_piece, shared_ptr<Image> image, dcpomatic::Rect<double> rect, DCPTime from, DCPTime to)
 {
 	_in_subtitle.piece = weak_piece;
 	_in_subtitle.image = image;
diff --git a/src/lib/player.h b/src/lib/player.h
index 11cc99e77..364d66249 100644
--- a/src/lib/player.h
+++ b/src/lib/player.h
@@ -50,7 +50,7 @@ public:
 	Eyes eyes;
 	bool same;
 	VideoContent::Frame frame;
-	Time extra;
+	DCPTime extra;
 };
 
 /** A wrapper for an Image which contains some pending operations; these may
@@ -84,9 +84,9 @@ public:
 	void disable_audio ();
 
 	bool pass ();
-	void seek (Time, bool);
+	void seek (DCPTime, bool);
 
-	Time video_position () const {
+	DCPTime video_position () const {
 		return _video_position;
 	}
 
@@ -101,10 +101,10 @@ public:
 	 *  Fourth parameter is true if the image is the same as the last one that was emitted.
 	 *  Fifth parameter is the time.
 	 */
-	boost::signals2::signal<void (boost::shared_ptr<PlayerImage>, Eyes, ColourConversion, bool, Time)> Video;
+	boost::signals2::signal<void (boost::shared_ptr<PlayerImage>, Eyes, ColourConversion, bool, DCPTime)> Video;
 	
 	/** Emitted when some audio data is ready */
-	boost::signals2::signal<void (boost::shared_ptr<const AudioBuffers>, Time)> Audio;
+	boost::signals2::signal<void (boost::shared_ptr<const AudioBuffers>, DCPTime)> Audio;
 
 	/** Emitted when something has changed such that if we went back and emitted
 	 *  the last frame again it would look different.  This is not emitted after
@@ -118,13 +118,13 @@ private:
 	friend class PlayerWrapper;
 	friend class Piece;
 
-	void process_video (boost::weak_ptr<Piece>, boost::shared_ptr<const Image>, Eyes, bool, VideoContent::Frame, Time);
+	void process_video (boost::weak_ptr<Piece>, boost::shared_ptr<const Image>, Eyes, bool, VideoContent::Frame, DCPTime);
 	void process_audio (boost::weak_ptr<Piece>, boost::shared_ptr<const AudioBuffers>, AudioContent::Frame);
-	void process_subtitle (boost::weak_ptr<Piece>, boost::shared_ptr<Image>, dcpomatic::Rect<double>, Time, Time);
+	void process_subtitle (boost::weak_ptr<Piece>, boost::shared_ptr<Image>, dcpomatic::Rect<double>, DCPTime, DCPTime);
 	void setup_pieces ();
 	void playlist_changed ();
 	void content_changed (boost::weak_ptr<Content>, int, bool);
-	void do_seek (Time, bool);
+	void do_seek (DCPTime, bool);
 	void flush ();
 	void emit_black ();
 	void emit_silence (OutputAudioFrame);
@@ -143,11 +143,11 @@ private:
 	std::list<boost::shared_ptr<Piece> > _pieces;
 
 	/** The time after the last video that we emitted */
-	Time _video_position;
+	DCPTime _video_position;
 	/** The time after the last audio that we emitted */
-	Time _audio_position;
+	DCPTime _audio_position;
 
-	AudioMerger<Time, AudioContent::Frame> _audio_merger;
+	AudioMerger<DCPTime, AudioContent::Frame> _audio_merger;
 
 	libdcp::Size _video_container_size;
 	boost::shared_ptr<PlayerImage> _black_frame;
@@ -157,15 +157,15 @@ private:
 		boost::weak_ptr<Piece> piece;
 		boost::shared_ptr<Image> image;
 		dcpomatic::Rect<double> rect;
-		Time from;
-		Time to;
+		DCPTime from;
+		DCPTime to;
 	} _in_subtitle;
 
 	struct {
 		boost::shared_ptr<Image> image;
 		Position<int> position;
-		Time from;
-		Time to;
+		DCPTime from;
+		DCPTime to;
 	} _out_subtitle;
 
 #ifdef DCPOMATIC_DEBUG
diff --git a/src/lib/playlist.cc b/src/lib/playlist.cc
index 581235adc..9fc62f8be 100644
--- a/src/lib/playlist.cc
+++ b/src/lib/playlist.cc
@@ -81,7 +81,7 @@ Playlist::maybe_sequence_video ()
 	_sequencing_video = true;
 	
 	ContentList cl = _content;
-	Time next = 0;
+	DCPTime next = 0;
 	for (ContentList::iterator i = _content.begin(); i != _content.end(); ++i) {
 		if (!dynamic_pointer_cast<VideoContent> (*i)) {
 			continue;
@@ -254,10 +254,10 @@ Playlist::best_dcp_frame_rate () const
 	return best->dcp;
 }
 
-Time
+DCPTime
 Playlist::length () const
 {
-	Time len = 0;
+	DCPTime len = 0;
 	for (ContentList::const_iterator i = _content.begin(); i != _content.end(); ++i) {
 		len = max (len, (*i)->end() + 1);
 	}
@@ -279,10 +279,10 @@ Playlist::reconnect ()
 	}
 }
 
-Time
+DCPTime
 Playlist::video_end () const
 {
-	Time end = 0;
+	DCPTime end = 0;
 	for (ContentList::const_iterator i = _content.begin(); i != _content.end(); ++i) {
 		if (dynamic_pointer_cast<const VideoContent> (*i)) {
 			end = max (end, (*i)->end ());
@@ -293,7 +293,7 @@ Playlist::video_end () const
 }
 
 FrameRateChange
-Playlist::active_frame_rate_change (Time t, int dcp_video_frame_rate) const
+Playlist::active_frame_rate_change (DCPTime t, int dcp_video_frame_rate) const
 {
 	for (ContentList::const_iterator i = _content.begin(); i != _content.end(); ++i) {
 		shared_ptr<const VideoContent> vc = dynamic_pointer_cast<const VideoContent> (*i);
@@ -331,7 +331,7 @@ Playlist::content () const
 void
 Playlist::repeat (ContentList c, int n)
 {
-	pair<Time, Time> range (TIME_MAX, 0);
+	pair<DCPTime, DCPTime> range (TIME_MAX, 0);
 	for (ContentList::iterator i = c.begin(); i != c.end(); ++i) {
 		range.first = min (range.first, (*i)->position ());
 		range.second = max (range.second, (*i)->position ());
@@ -339,7 +339,7 @@ Playlist::repeat (ContentList c, int n)
 		range.second = max (range.second, (*i)->end ());
 	}
 
-	Time pos = range.second;
+	DCPTime pos = range.second;
 	for (int i = 0; i < n; ++i) {
 		for (ContentList::iterator i = c.begin(); i != c.end(); ++i) {
 			shared_ptr<Content> copy = (*i)->clone ();
@@ -372,7 +372,7 @@ Playlist::move_earlier (shared_ptr<Content> c)
 		return;
 	}
 	
-	Time const p = (*previous)->position ();
+	DCPTime const p = (*previous)->position ();
 	(*previous)->set_position (p + c->length_after_trim ());
 	c->set_position (p);
 	sort (_content.begin(), _content.end(), ContentSorter ());
@@ -399,7 +399,7 @@ Playlist::move_later (shared_ptr<Content> c)
 		return;
 	}
 
-	Time const p = (*next)->position ();
+	DCPTime const p = (*next)->position ();
 	(*next)->set_position (c->position ());
 	c->set_position (p + c->length_after_trim ());
 	sort (_content.begin(), _content.end(), ContentSorter ());
diff --git a/src/lib/playlist.h b/src/lib/playlist.h
index d3cf50a27..a985bf93d 100644
--- a/src/lib/playlist.h
+++ b/src/lib/playlist.h
@@ -71,11 +71,11 @@ public:
 
 	std::string video_identifier () const;
 
-	Time length () const;
+	DCPTime length () const;
 	
 	int best_dcp_frame_rate () const;
-	Time video_end () const;
-	FrameRateChange active_frame_rate_change (Time, int dcp_frame_rate) const;
+	DCPTime video_end () const;
+	FrameRateChange active_frame_rate_change (DCPTime, int dcp_frame_rate) const;
 
 	void set_sequence_video (bool);
 	void maybe_sequence_video ();
diff --git a/src/lib/sndfile_content.cc b/src/lib/sndfile_content.cc
index 89db865d5..1c872cf96 100644
--- a/src/lib/sndfile_content.cc
+++ b/src/lib/sndfile_content.cc
@@ -141,7 +141,7 @@ SndfileContent::as_xml (xmlpp::Node* node) const
 	_audio_mapping.as_xml (node->add_child("AudioMapping"));
 }
 
-Time
+DCPTime
 SndfileContent::full_length () const
 {
 	shared_ptr<const Film> film = _film.lock ();
diff --git a/src/lib/sndfile_content.h b/src/lib/sndfile_content.h
index 701ff16b2..c88764c1b 100644
--- a/src/lib/sndfile_content.h
+++ b/src/lib/sndfile_content.h
@@ -44,7 +44,7 @@ public:
 	std::string technical_summary () const;
 	std::string information () const;
 	void as_xml (xmlpp::Node *) const;
-	Time full_length () const;
+	DCPTime full_length () const;
 
 	/* AudioContent */
 	int audio_channels () const {
diff --git a/src/lib/sndfile_decoder.cc b/src/lib/sndfile_decoder.cc
index 0cca25257..b5a7f139b 100644
--- a/src/lib/sndfile_decoder.cc
+++ b/src/lib/sndfile_decoder.cc
@@ -120,7 +120,7 @@ SndfileDecoder::done () const
 }
 
 void
-SndfileDecoder::seek (Time t, bool accurate)
+SndfileDecoder::seek (DCPTime t, bool accurate)
 {
 	/* XXX */
 }
diff --git a/src/lib/sndfile_decoder.h b/src/lib/sndfile_decoder.h
index c3db1c294..470cab956 100644
--- a/src/lib/sndfile_decoder.h
+++ b/src/lib/sndfile_decoder.h
@@ -30,7 +30,7 @@ public:
 	~SndfileDecoder ();
 
 	void pass ();
-	void seek (Time, bool);
+	void seek (DCPTime, bool);
 	bool done () const;
 
 	int audio_channels () const;
diff --git a/src/lib/subtitle_decoder.cc b/src/lib/subtitle_decoder.cc
index c06f3d718..8dbc01dc2 100644
--- a/src/lib/subtitle_decoder.cc
+++ b/src/lib/subtitle_decoder.cc
@@ -33,7 +33,7 @@ SubtitleDecoder::SubtitleDecoder (shared_ptr<const Film> f)
  *  Image may be 0 to say that there is no current subtitle.
  */
 void
-SubtitleDecoder::subtitle (shared_ptr<Image> image, dcpomatic::Rect<double> rect, Time from, Time to)
+SubtitleDecoder::subtitle (shared_ptr<Image> image, dcpomatic::Rect<double> rect, DCPTime from, DCPTime to)
 {
 	Subtitle (image, rect, from, to);
 }
diff --git a/src/lib/subtitle_decoder.h b/src/lib/subtitle_decoder.h
index eeeadbd3f..8a2a0c1b2 100644
--- a/src/lib/subtitle_decoder.h
+++ b/src/lib/subtitle_decoder.h
@@ -23,7 +23,7 @@
 #include "types.h"
 
 class Film;
-class TimedSubtitle;
+class DCPTimedSubtitle;
 class Image;
 
 class SubtitleDecoder : public virtual Decoder
@@ -31,8 +31,8 @@ class SubtitleDecoder : public virtual Decoder
 public:
 	SubtitleDecoder (boost::shared_ptr<const Film>);
 
-	boost::signals2::signal<void (boost::shared_ptr<Image>, dcpomatic::Rect<double>, Time, Time)> Subtitle;
+	boost::signals2::signal<void (boost::shared_ptr<Image>, dcpomatic::Rect<double>, DCPTime, DCPTime)> Subtitle;
 
 protected:
-	void subtitle (boost::shared_ptr<Image>, dcpomatic::Rect<double>, Time, Time);
+	void subtitle (boost::shared_ptr<Image>, dcpomatic::Rect<double>, DCPTime, DCPTime);
 };
diff --git a/src/lib/timer.cc b/src/lib/timer.cc
index 69a7e3aa9..a20a08b07 100644
--- a/src/lib/timer.cc
+++ b/src/lib/timer.cc
@@ -31,14 +31,14 @@
 using namespace std;
 
 /** @param n Name to use when giving output */
-PeriodTimer::PeriodTimer (string n)
+PeriodDCPTimer::PeriodDCPTimer (string n)
 	: _name (n)
 {
 	gettimeofday (&_start, 0);
 }
 
-/** Destroy PeriodTimer and output the time elapsed since its construction */
-PeriodTimer::~PeriodTimer ()
+/** Destroy PeriodDCPTimer and output the time elapsed since its construction */
+PeriodDCPTimer::~PeriodDCPTimer ()
 {
 	struct timeval stop;
 	gettimeofday (&stop, 0);
@@ -48,7 +48,7 @@ PeriodTimer::~PeriodTimer ()
 /** @param n Name to use when giving output.
  *  @param s Initial state.
  */
-StateTimer::StateTimer (string n, string s)
+StateDCPTimer::StateDCPTimer (string n, string s)
 	: _name (n)
 {
 	struct timeval t;
@@ -59,7 +59,7 @@ StateTimer::StateTimer (string n, string s)
 
 /** @param s New state that the caller is in */
 void
-StateTimer::set_state (string s)
+StateDCPTimer::set_state (string s)
 {
 	double const last = _time;
 	struct timeval t;
@@ -74,8 +74,8 @@ StateTimer::set_state (string s)
 	_state = s;
 }
 
-/** Destroy StateTimer and generate a summary of the state timings on cout */
-StateTimer::~StateTimer ()
+/** Destroy StateDCPTimer and generate a summary of the state timings on cout */
+StateDCPTimer::~StateDCPTimer ()
 {
 	if (_state.empty ()) {
 		return;
diff --git a/src/lib/timer.h b/src/lib/timer.h
index 4a5aa12de..8ec392aa6 100644
--- a/src/lib/timer.h
+++ b/src/lib/timer.h
@@ -29,16 +29,16 @@
 #include <map>
 #include <sys/time.h>
 
-/** @class PeriodTimer
+/** @class PeriodDCPTimer
  *  @brief A class to allow timing of a period within the caller.
  *
  *  On destruction, it will output the time since its construction.
  */
-class PeriodTimer
+class PeriodDCPTimer
 {
 public:
-	PeriodTimer (std::string n);
-	~PeriodTimer ();
+	PeriodDCPTimer (std::string n);
+	~PeriodDCPTimer ();
 	
 private:
 
@@ -48,19 +48,19 @@ private:
 	struct timeval _start;
 };
 
-/** @class StateTimer
+/** @class StateDCPTimer
  *  @brief A class to allow measurement of the amount of time a program
  *  spends in one of a set of states.
  *
  *  Once constructed, the caller can call set_state() whenever
- *  its state changes.	When StateTimer is destroyed, it will
+ *  its state changes.	When StateDCPTimer is destroyed, it will
  *  output (to cout) a summary of the time spent in each state.
  */
-class StateTimer
+class StateDCPTimer
 {
 public:
-	StateTimer (std::string n, std::string s);
-	~StateTimer ();
+	StateDCPTimer (std::string n, std::string s);
+	~StateDCPTimer ();
 
 	void set_state (std::string s);
 
diff --git a/src/lib/types.h b/src/lib/types.h
index 448b6c154..1ab6a94d4 100644
--- a/src/lib/types.h
+++ b/src/lib/types.h
@@ -38,9 +38,10 @@ class AudioBuffers;
  */
 #define SERVER_LINK_VERSION 1
 
-typedef int64_t Time;
+typedef int64_t DCPTime;
 #define TIME_MAX INT64_MAX
-#define TIME_HZ	 ((Time) 96000)
+#define TIME_HZ	 ((DCPTime) 96000)
+typedef int64_t ContentTime;
 typedef int64_t OutputAudioFrame;
 typedef int	OutputVideoFrame;
 typedef std::vector<boost::shared_ptr<Content> > ContentList;
diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc
index c61a2455f..ebec8b6db 100644
--- a/src/lib/video_content.cc
+++ b/src/lib/video_content.cc
@@ -59,7 +59,7 @@ VideoContent::VideoContent (shared_ptr<const Film> f)
 	setup_default_colour_conversion ();
 }
 
-VideoContent::VideoContent (shared_ptr<const Film> f, Time s, VideoContent::Frame len)
+VideoContent::VideoContent (shared_ptr<const Film> f, DCPTime s, VideoContent::Frame len)
 	: Content (f, s)
 	, _video_length (len)
 	, _video_frame_rate (0)
@@ -355,7 +355,7 @@ VideoContent::video_size_after_crop () const
  *  is that of the next complete frame which starts after `t'.
  */
 VideoContent::Frame
-VideoContent::time_to_content_video_frames (Time t) const
+VideoContent::time_to_content_video_frames (DCPTime t) const
 {
 	shared_ptr<const Film> film = _film.lock ();
 	assert (film);
diff --git a/src/lib/video_content.h b/src/lib/video_content.h
index effca5c61..f008143fa 100644
--- a/src/lib/video_content.h
+++ b/src/lib/video_content.h
@@ -43,7 +43,7 @@ public:
 	typedef int Frame;
 
 	VideoContent (boost::shared_ptr<const Film>);
-	VideoContent (boost::shared_ptr<const Film>, Time, VideoContent::Frame);
+	VideoContent (boost::shared_ptr<const Film>, DCPTime, VideoContent::Frame);
 	VideoContent (boost::shared_ptr<const Film>, boost::filesystem::path);
 	VideoContent (boost::shared_ptr<const Film>, boost::shared_ptr<const cxml::Node>);
 	VideoContent (boost::shared_ptr<const Film>, std::vector<boost::shared_ptr<Content> >);
@@ -123,7 +123,7 @@ public:
 	libdcp::Size video_size_after_3d_split () const;
 	libdcp::Size video_size_after_crop () const;
 
-	VideoContent::Frame time_to_content_video_frames (Time) const;
+	VideoContent::Frame time_to_content_video_frames (DCPTime) const;
 
 protected:
 	void take_from_video_examiner (boost::shared_ptr<VideoExaminer>);
diff --git a/src/tools/server_test.cc b/src/tools/server_test.cc
index f0a44954f..3c40139b8 100644
--- a/src/tools/server_test.cc
+++ b/src/tools/server_test.cc
@@ -47,7 +47,7 @@ static shared_ptr<FileLog> log_ (new FileLog ("servomatictest.log"));
 static int frame = 0;
 
 void
-process_video (shared_ptr<PlayerImage> image, Eyes eyes, ColourConversion conversion, Time)
+process_video (shared_ptr<PlayerImage> image, Eyes eyes, ColourConversion conversion, DCPTime)
 {
 	shared_ptr<DCPVideoFrame> local  (new DCPVideoFrame (image->image(), frame, eyes, conversion, film->video_frame_rate(), 250000000, log_));
 	shared_ptr<DCPVideoFrame> remote (new DCPVideoFrame (image->image(), frame, eyes, conversion, film->video_frame_rate(), 250000000, log_));
diff --git a/src/wx/audio_plot.cc b/src/wx/audio_plot.cc
index f78885772..96de34d40 100644
--- a/src/wx/audio_plot.cc
+++ b/src/wx/audio_plot.cc
@@ -145,7 +145,7 @@ AudioPlot::paint ()
 	gc->SetPen (*wxLIGHT_GREY_PEN);
 	gc->StrokePath (grid);
 
-	gc->DrawText (_("Time"), data_width, _height - _y_origin + db_label_height / 2);
+	gc->DrawText (_("DCPTime"), data_width, _height - _y_origin + db_label_height / 2);
 	
 	if (_type_visible[AudioPoint::PEAK]) {
 		for (int c = 0; c < MAX_AUDIO_CHANNELS; ++c) {
diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index 564b90d28..14982e0d3 100644
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@ -279,7 +279,7 @@ FilmEditor::make_content_panel ()
 		b->Add (_content_earlier, 1, wxEXPAND);
 		_content_later = new wxButton (_content_panel, wxID_DOWN);
 		b->Add (_content_later, 1, wxEXPAND);
-		_content_timeline = new wxButton (_content_panel, wxID_ANY, _("Timeline..."));
+		_content_timeline = new wxButton (_content_panel, wxID_ANY, _("DCPTimeline..."));
 		b->Add (_content_timeline, 1, wxEXPAND | wxLEFT | wxRIGHT);
 
 		s->Add (b, 0, wxALL, 4);
@@ -936,7 +936,7 @@ FilmEditor::content_timeline_clicked ()
 		_timeline_dialog = 0;
 	}
 	
-	_timeline_dialog = new TimelineDialog (this, _film);
+	_timeline_dialog = new DCPTimelineDialog (this, _film);
 	_timeline_dialog->Show ();
 }
 
diff --git a/src/wx/film_editor.h b/src/wx/film_editor.h
index 23c87e678..dadb583ae 100644
--- a/src/wx/film_editor.h
+++ b/src/wx/film_editor.h
@@ -33,9 +33,9 @@ class wxNotebook;
 class wxListCtrl;
 class wxListEvent;
 class Film;
-class TimelineDialog;
+class DCPTimelineDialog;
 class Ratio;
-class Timecode;
+class DCPTimecode;
 class FilmEditorPanel;
 class SubtitleContent;
 
@@ -156,5 +156,5 @@ private:
 	std::vector<Ratio const *> _ratios;
 
 	bool _generally_sensitive;
-	TimelineDialog* _timeline_dialog;
+	DCPTimelineDialog* _timeline_dialog;
 };
diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index fbca835c2..cc2f67b15 100644
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -164,7 +164,7 @@ FilmViewer::timer ()
 	
 	fetch_next_frame ();
 
-	Time const len = _film->length ();
+	DCPTime const len = _film->length ();
 
 	if (len) {
 		int const new_slider_position = 4096 * _player->video_position() / len;
@@ -275,7 +275,7 @@ FilmViewer::check_play_state ()
 }
 
 void
-FilmViewer::process_video (shared_ptr<PlayerImage> image, Eyes eyes, Time t)
+FilmViewer::process_video (shared_ptr<PlayerImage> image, Eyes eyes, DCPTime t)
 {
 	if (eyes == EYES_RIGHT) {
 		return;
@@ -288,7 +288,7 @@ FilmViewer::process_video (shared_ptr<PlayerImage> image, Eyes eyes, Time t)
 }
 
 void
-FilmViewer::set_position_text (Time t)
+FilmViewer::set_position_text (DCPTime t)
 {
 	if (!_film) {
 		_frame_number->SetLabel ("0");
@@ -371,7 +371,7 @@ FilmViewer::back_clicked ()
 	   We want to see the one before it, so we need to go back 2.
 	*/
 
-	Time p = _player->video_position() - _film->video_frames_to_time (2);
+	DCPTime p = _player->video_position() - _film->video_frames_to_time (2);
 	if (p < 0) {
 		p = 0;
 	}
diff --git a/src/wx/film_viewer.h b/src/wx/film_viewer.h
index c99c73440..0e5c49c6d 100644
--- a/src/wx/film_viewer.h
+++ b/src/wx/film_viewer.h
@@ -59,7 +59,7 @@ private:
 	void slider_moved ();
 	void play_clicked ();
 	void timer ();
-	void process_video (boost::shared_ptr<PlayerImage>, Eyes, Time);
+	void process_video (boost::shared_ptr<PlayerImage>, Eyes, DCPTime);
 	void calculate_sizes ();
 	void check_play_state ();
 	void fetch_current_frame_again ();
@@ -68,7 +68,7 @@ private:
 	void back_clicked ();
 	void forward_clicked ();
 	void player_changed (bool);
-	void set_position_text (Time);
+	void set_position_text (DCPTime);
 
 	boost::shared_ptr<Film> _film;
 	boost::shared_ptr<Player> _player;
diff --git a/src/wx/timecode.cc b/src/wx/timecode.cc
index 033bd2bd0..b23ff2a39 100644
--- a/src/wx/timecode.cc
+++ b/src/wx/timecode.cc
@@ -26,7 +26,7 @@ using std::string;
 using std::cout;
 using boost::lexical_cast;
 
-Timecode::Timecode (wxWindow* parent)
+DCPTimecode::DCPTimecode (wxWindow* parent)
 	: wxPanel (parent)
 {
 	wxClientDC dc (parent);
@@ -69,11 +69,11 @@ Timecode::Timecode (wxWindow* parent)
 
 	_fixed = add_label_to_sizer (_sizer, this, wxT ("42"), false);
 	
-	_hours->Bind	  (wxEVT_COMMAND_TEXT_UPDATED,   boost::bind (&Timecode::changed, this));
-	_minutes->Bind	  (wxEVT_COMMAND_TEXT_UPDATED,   boost::bind (&Timecode::changed, this));
-	_seconds->Bind	  (wxEVT_COMMAND_TEXT_UPDATED,   boost::bind (&Timecode::changed, this));
-	_frames->Bind	  (wxEVT_COMMAND_TEXT_UPDATED,   boost::bind (&Timecode::changed, this));
-	_set_button->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&Timecode::set_clicked, this));
+	_hours->Bind	  (wxEVT_COMMAND_TEXT_UPDATED,   boost::bind (&DCPTimecode::changed, this));
+	_minutes->Bind	  (wxEVT_COMMAND_TEXT_UPDATED,   boost::bind (&DCPTimecode::changed, this));
+	_seconds->Bind	  (wxEVT_COMMAND_TEXT_UPDATED,   boost::bind (&DCPTimecode::changed, this));
+	_frames->Bind	  (wxEVT_COMMAND_TEXT_UPDATED,   boost::bind (&DCPTimecode::changed, this));
+	_set_button->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&DCPTimecode::set_clicked, this));
 
 	_set_button->Enable (false);
 
@@ -83,7 +83,7 @@ Timecode::Timecode (wxWindow* parent)
 }
 
 void
-Timecode::set (Time t, int fps)
+DCPTimecode::set (DCPTime t, int fps)
 {
 	int const h = t / (3600 * TIME_HZ);
 	t -= h * 3600 * TIME_HZ;
@@ -101,10 +101,10 @@ Timecode::set (Time t, int fps)
 	_fixed->SetLabel (wxString::Format ("%02d:%02d:%02d.%02d", h, m, s, f));
 }
 
-Time
-Timecode::get (int fps) const
+DCPTime
+DCPTimecode::get (int fps) const
 {
-	Time t = 0;
+	DCPTime t = 0;
 	string const h = wx_to_std (_hours->GetValue ());
 	t += lexical_cast<int> (h.empty() ? "0" : h) * 3600 * TIME_HZ;
 	string const m = wx_to_std (_minutes->GetValue());
@@ -118,20 +118,20 @@ Timecode::get (int fps) const
 }
 
 void
-Timecode::changed ()
+DCPTimecode::changed ()
 {
 	_set_button->Enable (true);
 }
 
 void
-Timecode::set_clicked ()
+DCPTimecode::set_clicked ()
 {
 	Changed ();
 	_set_button->Enable (false);
 }
 
 void
-Timecode::set_editable (bool e)
+DCPTimecode::set_editable (bool e)
 {
 	_editable->Show (e);
 	_fixed->Show (!e);
diff --git a/src/wx/timecode.h b/src/wx/timecode.h
index 5b094e39f..6a8bf03df 100644
--- a/src/wx/timecode.h
+++ b/src/wx/timecode.h
@@ -21,13 +21,13 @@
 #include <wx/wx.h>
 #include "lib/types.h"
 
-class Timecode : public wxPanel
+class DCPTimecode : public wxPanel
 {
 public:
-	Timecode (wxWindow *);
+	DCPTimecode (wxWindow *);
 
-	void set (Time, int);
-	Time get (int) const;
+	void set (DCPTime, int);
+	DCPTime get (int) const;
 
 	void set_editable (bool);
 
diff --git a/src/wx/timeline.cc b/src/wx/timeline.cc
index 0ac9a1d4b..9d2aee76c 100644
--- a/src/wx/timeline.cc
+++ b/src/wx/timeline.cc
@@ -39,7 +39,7 @@ using boost::optional;
 class View : public boost::noncopyable
 {
 public:
-	View (Timeline& t)
+	View (DCPTimeline& t)
 		: _timeline (t)
 	{
 
@@ -64,12 +64,12 @@ public:
 protected:
 	virtual void do_paint (wxGraphicsContext *) = 0;
 	
-	int time_x (Time t) const
+	int time_x (DCPTime t) const
 	{
 		return _timeline.tracks_position().x + t * _timeline.pixels_per_time_unit();
 	}
 	
-	Timeline& _timeline;
+	DCPTimeline& _timeline;
 
 private:
 	dcpomatic::Rect<int> _last_paint_bbox;
@@ -80,7 +80,7 @@ private:
 class ContentView : public View
 {
 public:
-	ContentView (Timeline& tl, shared_ptr<Content> c)
+	ContentView (DCPTimeline& tl, shared_ptr<Content> c)
 		: View (tl)
 		, _content (c)
 		, _track (0)
@@ -139,8 +139,8 @@ private:
 			return;
 		}
 
-		Time const position = cont->position ();
-		Time const len = cont->length_after_trim ();
+		DCPTime const position = cont->position ();
+		DCPTime const len = cont->length_after_trim ();
 
 		wxColour selected (colour().Red() / 2, colour().Green() / 2, colour().Blue() / 2);
 
@@ -203,7 +203,7 @@ private:
 class AudioContentView : public ContentView
 {
 public:
-	AudioContentView (Timeline& tl, shared_ptr<Content> c)
+	AudioContentView (DCPTimeline& tl, shared_ptr<Content> c)
 		: ContentView (tl, c)
 	{}
 	
@@ -222,7 +222,7 @@ private:
 class VideoContentView : public ContentView
 {
 public:
-	VideoContentView (Timeline& tl, shared_ptr<Content> c)
+	VideoContentView (DCPTimeline& tl, shared_ptr<Content> c)
 		: ContentView (tl, c)
 	{}
 
@@ -243,10 +243,10 @@ private:
 	}
 };
 
-class TimeAxisView : public View
+class DCPTimeAxisView : public View
 {
 public:
-	TimeAxisView (Timeline& tl, int y)
+	DCPTimeAxisView (DCPTimeline& tl, int y)
 		: View (tl)
 		, _y (y)
 	{}
@@ -291,7 +291,7 @@ private:
 		path.AddLineToPoint (_timeline.width(), _y);
 		gc->StrokePath (path);
 
-		Time t = 0;
+		DCPTime t = 0;
 		while ((t * _timeline.pixels_per_time_unit()) < _timeline.width()) {
 			wxGraphicsPath path = gc->CreatePath ();
 			path.MoveToPoint (time_x (t), _y - 4);
@@ -326,11 +326,11 @@ private:
 };
 
 
-Timeline::Timeline (wxWindow* parent, FilmEditor* ed, shared_ptr<Film> film)
+DCPTimeline::DCPTimeline (wxWindow* parent, FilmEditor* ed, shared_ptr<Film> film)
 	: wxPanel (parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxFULL_REPAINT_ON_RESIZE)
 	, _film_editor (ed)
 	, _film (film)
-	, _time_axis_view (new TimeAxisView (*this, 32))
+	, _time_axis_view (new DCPTimeAxisView (*this, 32))
 	, _tracks (0)
 	, _pixels_per_time_unit (0)
 	, _left_down (false)
@@ -343,22 +343,22 @@ Timeline::Timeline (wxWindow* parent, FilmEditor* ed, shared_ptr<Film> film)
 	SetDoubleBuffered (true);
 #endif	
 
-	Bind (wxEVT_PAINT,      boost::bind (&Timeline::paint,       this));
-	Bind (wxEVT_LEFT_DOWN,  boost::bind (&Timeline::left_down,   this, _1));
-	Bind (wxEVT_LEFT_UP,    boost::bind (&Timeline::left_up,     this, _1));
-	Bind (wxEVT_RIGHT_DOWN, boost::bind (&Timeline::right_down,  this, _1));
-	Bind (wxEVT_MOTION,     boost::bind (&Timeline::mouse_moved, this, _1));
-	Bind (wxEVT_SIZE,       boost::bind (&Timeline::resized,     this));
+	Bind (wxEVT_PAINT,      boost::bind (&DCPTimeline::paint,       this));
+	Bind (wxEVT_LEFT_DOWN,  boost::bind (&DCPTimeline::left_down,   this, _1));
+	Bind (wxEVT_LEFT_UP,    boost::bind (&DCPTimeline::left_up,     this, _1));
+	Bind (wxEVT_RIGHT_DOWN, boost::bind (&DCPTimeline::right_down,  this, _1));
+	Bind (wxEVT_MOTION,     boost::bind (&DCPTimeline::mouse_moved, this, _1));
+	Bind (wxEVT_SIZE,       boost::bind (&DCPTimeline::resized,     this));
 
 	playlist_changed ();
 
 	SetMinSize (wxSize (640, tracks() * track_height() + 96));
 
-	_playlist_connection = film->playlist()->Changed.connect (bind (&Timeline::playlist_changed, this));
+	_playlist_connection = film->playlist()->Changed.connect (bind (&DCPTimeline::playlist_changed, this));
 }
 
 void
-Timeline::paint ()
+DCPTimeline::paint ()
 {
 	wxPaintDC dc (this);
 
@@ -377,7 +377,7 @@ Timeline::paint ()
 }
 
 void
-Timeline::playlist_changed ()
+DCPTimeline::playlist_changed ()
 {
 	ensure_ui_thread ();
 	
@@ -406,7 +406,7 @@ Timeline::playlist_changed ()
 }
 
 void
-Timeline::assign_tracks ()
+DCPTimeline::assign_tracks ()
 {
 	for (ViewList::iterator i = _views.begin(); i != _views.end(); ++i) {
 		shared_ptr<ContentView> cv = dynamic_pointer_cast<ContentView> (*i);
@@ -465,13 +465,13 @@ Timeline::assign_tracks ()
 }
 
 int
-Timeline::tracks () const
+DCPTimeline::tracks () const
 {
 	return _tracks;
 }
 
 void
-Timeline::setup_pixels_per_time_unit ()
+DCPTimeline::setup_pixels_per_time_unit ()
 {
 	shared_ptr<const Film> film = _film.lock ();
 	if (!film) {
@@ -482,7 +482,7 @@ Timeline::setup_pixels_per_time_unit ()
 }
 
 shared_ptr<View>
-Timeline::event_to_view (wxMouseEvent& ev)
+DCPTimeline::event_to_view (wxMouseEvent& ev)
 {
 	ViewList::iterator i = _views.begin();
 	Position<int> const p (ev.GetX(), ev.GetY());
@@ -498,7 +498,7 @@ Timeline::event_to_view (wxMouseEvent& ev)
 }
 
 void
-Timeline::left_down (wxMouseEvent& ev)
+DCPTimeline::left_down (wxMouseEvent& ev)
 {
 	shared_ptr<View> view = event_to_view (ev);
 	shared_ptr<ContentView> content_view = dynamic_pointer_cast<ContentView> (view);
@@ -539,7 +539,7 @@ Timeline::left_down (wxMouseEvent& ev)
 }
 
 void
-Timeline::left_up (wxMouseEvent& ev)
+DCPTimeline::left_up (wxMouseEvent& ev)
 {
 	_left_down = false;
 
@@ -551,7 +551,7 @@ Timeline::left_up (wxMouseEvent& ev)
 }
 
 void
-Timeline::mouse_moved (wxMouseEvent& ev)
+DCPTimeline::mouse_moved (wxMouseEvent& ev)
 {
 	if (!_left_down) {
 		return;
@@ -561,7 +561,7 @@ Timeline::mouse_moved (wxMouseEvent& ev)
 }
 
 void
-Timeline::right_down (wxMouseEvent& ev)
+DCPTimeline::right_down (wxMouseEvent& ev)
 {
 	shared_ptr<View> view = event_to_view (ev);
 	shared_ptr<ContentView> cv = dynamic_pointer_cast<ContentView> (view);
@@ -578,7 +578,7 @@ Timeline::right_down (wxMouseEvent& ev)
 }
 
 void
-Timeline::set_position_from_event (wxMouseEvent& ev)
+DCPTimeline::set_position_from_event (wxMouseEvent& ev)
 {
 	wxPoint const p = ev.GetPosition();
 
@@ -597,13 +597,13 @@ Timeline::set_position_from_event (wxMouseEvent& ev)
 		return;
 	}
 	
-	Time new_position = _down_view_position + (p.x - _down_point.x) / _pixels_per_time_unit;
+	DCPTime new_position = _down_view_position + (p.x - _down_point.x) / _pixels_per_time_unit;
 	
 	if (_snap) {
 		
 		bool first = true;
-		Time nearest_distance = TIME_MAX;
-		Time nearest_new_position = TIME_MAX;
+		DCPTime nearest_distance = TIME_MAX;
+		DCPTime nearest_new_position = TIME_MAX;
 		
 		/* Find the nearest content edge; this is inefficient */
 		for (ViewList::iterator i = _views.begin(); i != _views.end(); ++i) {
@@ -614,7 +614,7 @@ Timeline::set_position_from_event (wxMouseEvent& ev)
 			
 			{
 				/* Snap starts to ends */
-				Time const d = abs (cv->content()->end() - new_position);
+				DCPTime const d = abs (cv->content()->end() - new_position);
 				if (first || d < nearest_distance) {
 					nearest_distance = d;
 					nearest_new_position = cv->content()->end();
@@ -623,7 +623,7 @@ Timeline::set_position_from_event (wxMouseEvent& ev)
 			
 			{
 				/* Snap ends to starts */
-				Time const d = abs (cv->content()->position() - (new_position + _down_view->content()->length_after_trim()));
+				DCPTime const d = abs (cv->content()->position() - (new_position + _down_view->content()->length_after_trim()));
 				if (d < nearest_distance) {
 					nearest_distance = d;
 					nearest_new_position = cv->content()->position() - _down_view->content()->length_after_trim ();
@@ -653,25 +653,25 @@ Timeline::set_position_from_event (wxMouseEvent& ev)
 }
 
 void
-Timeline::force_redraw (dcpomatic::Rect<int> const & r)
+DCPTimeline::force_redraw (dcpomatic::Rect<int> const & r)
 {
 	RefreshRect (wxRect (r.x, r.y, r.width, r.height), false);
 }
 
 shared_ptr<const Film>
-Timeline::film () const
+DCPTimeline::film () const
 {
 	return _film.lock ();
 }
 
 void
-Timeline::resized ()
+DCPTimeline::resized ()
 {
 	setup_pixels_per_time_unit ();
 }
 
 void
-Timeline::clear_selection ()
+DCPTimeline::clear_selection ()
 {
 	for (ViewList::iterator i = _views.begin(); i != _views.end(); ++i) {
 		shared_ptr<ContentView> cv = dynamic_pointer_cast<ContentView> (*i);
@@ -681,8 +681,8 @@ Timeline::clear_selection ()
 	}
 }
 
-Timeline::ContentViewList
-Timeline::selected_views () const
+DCPTimeline::ContentViewList
+DCPTimeline::selected_views () const
 {
 	ContentViewList sel;
 	
@@ -697,7 +697,7 @@ Timeline::selected_views () const
 }
 
 ContentList
-Timeline::selected_content () const
+DCPTimeline::selected_content () const
 {
 	ContentList sel;
 	ContentViewList views = selected_views ();
diff --git a/src/wx/timeline.h b/src/wx/timeline.h
index ef1d10797..b3ee77fff 100644
--- a/src/wx/timeline.h
+++ b/src/wx/timeline.h
@@ -29,12 +29,12 @@ class Film;
 class View;
 class ContentView;
 class FilmEditor;
-class TimeAxisView;
+class DCPTimeAxisView;
 
-class Timeline : public wxPanel
+class DCPTimeline : public wxPanel
 {
 public:
-	Timeline (wxWindow *, FilmEditor *, boost::shared_ptr<Film>);
+	DCPTimeline (wxWindow *, FilmEditor *, boost::shared_ptr<Film>);
 
 	boost::shared_ptr<const Film> film () const;
 
@@ -94,13 +94,13 @@ private:
 	FilmEditor* _film_editor;
 	boost::weak_ptr<Film> _film;
 	ViewList _views;
-	boost::shared_ptr<TimeAxisView> _time_axis_view;
+	boost::shared_ptr<DCPTimeAxisView> _time_axis_view;
 	int _tracks;
 	double _pixels_per_time_unit;
 	bool _left_down;
 	wxPoint _down_point;
 	boost::shared_ptr<ContentView> _down_view;
-	Time _down_view_position;
+	DCPTime _down_view_position;
 	bool _first_move;
 	ContentMenu _menu;
 	bool _snap;
diff --git a/src/wx/timeline_dialog.cc b/src/wx/timeline_dialog.cc
index dbf7ae232..a63c219db 100644
--- a/src/wx/timeline_dialog.cc
+++ b/src/wx/timeline_dialog.cc
@@ -28,8 +28,8 @@ using std::list;
 using std::cout;
 using boost::shared_ptr;
 
-TimelineDialog::TimelineDialog (FilmEditor* ed, shared_ptr<Film> film)
-	: wxDialog (ed, wxID_ANY, _("Timeline"), wxDefaultPosition, wxSize (640, 512), wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxFULL_REPAINT_ON_RESIZE)
+DCPTimelineDialog::DCPTimelineDialog (FilmEditor* ed, shared_ptr<Film> film)
+	: wxDialog (ed, wxID_ANY, _("DCPTimeline"), wxDefaultPosition, wxSize (640, 512), wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxFULL_REPAINT_ON_RESIZE)
 	, _timeline (this, ed, film)
 {
 	wxBoxSizer* sizer = new wxBoxSizer (wxVERTICAL);
@@ -46,11 +46,11 @@ TimelineDialog::TimelineDialog (FilmEditor* ed, shared_ptr<Film> film)
 	sizer->SetSizeHints (this);
 
 	_snap->SetValue (_timeline.snap ());
-	_snap->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&TimelineDialog::snap_toggled, this));
+	_snap->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&DCPTimelineDialog::snap_toggled, this));
 }
 
 void
-TimelineDialog::snap_toggled ()
+DCPTimelineDialog::snap_toggled ()
 {
 	_timeline.set_snap (_snap->GetValue ());
 }
diff --git a/src/wx/timeline_dialog.h b/src/wx/timeline_dialog.h
index 1e5955003..b64445d9c 100644
--- a/src/wx/timeline_dialog.h
+++ b/src/wx/timeline_dialog.h
@@ -24,14 +24,14 @@
 
 class Playlist;
 
-class TimelineDialog : public wxDialog
+class DCPTimelineDialog : public wxDialog
 {
 public:
-	TimelineDialog (FilmEditor *, boost::shared_ptr<Film>);
+	DCPTimelineDialog (FilmEditor *, boost::shared_ptr<Film>);
 
 private:
 	void snap_toggled ();
 	
-	Timeline _timeline;
+	DCPTimeline _timeline;
 	wxCheckBox* _snap;
 };
diff --git a/src/wx/timing_panel.cc b/src/wx/timing_panel.cc
index 79099b168..08334da4b 100644
--- a/src/wx/timing_panel.cc
+++ b/src/wx/timing_panel.cc
@@ -35,19 +35,19 @@ TimingPanel::TimingPanel (FilmEditor* e)
 	_sizer->Add (grid, 0, wxALL, 8);
 
 	add_label_to_sizer (grid, this, _("Position"), true);
-	_position = new Timecode (this);
+	_position = new DCPTimecode (this);
 	grid->Add (_position);
 	add_label_to_sizer (grid, this, _("Full length"), true);
-	_full_length = new Timecode (this);
+	_full_length = new DCPTimecode (this);
 	grid->Add (_full_length);
 	add_label_to_sizer (grid, this, _("Trim from start"), true);
-	_trim_start = new Timecode (this);
+	_trim_start = new DCPTimecode (this);
 	grid->Add (_trim_start);
 	add_label_to_sizer (grid, this, _("Trim from end"), true);
-	_trim_end = new Timecode (this);
+	_trim_end = new DCPTimecode (this);
 	grid->Add (_trim_end);
 	add_label_to_sizer (grid, this, _("Play length"), true);
-	_play_length = new Timecode (this);
+	_play_length = new DCPTimecode (this);
 	grid->Add (_play_length);
 
 	_position->Changed.connect    (boost::bind (&TimingPanel::position_changed, this));
diff --git a/src/wx/timing_panel.h b/src/wx/timing_panel.h
index ab859a1be..7fea45eb5 100644
--- a/src/wx/timing_panel.h
+++ b/src/wx/timing_panel.h
@@ -19,7 +19,7 @@
 
 #include "film_editor_panel.h"
 
-class Timecode;
+class DCPTimecode;
 
 class TimingPanel : public FilmEditorPanel
 {
@@ -36,9 +36,9 @@ private:
 	void trim_end_changed ();
 	void play_length_changed ();
 	
-	Timecode* _position;
-	Timecode* _full_length;
-	Timecode* _trim_start;
-	Timecode* _trim_end;
-	Timecode* _play_length;
+	DCPTimecode* _position;
+	DCPTimecode* _full_length;
+	DCPTimecode* _trim_start;
+	DCPTimecode* _trim_end;
+	DCPTimecode* _play_length;
 };
diff --git a/test/ffmpeg_seek_test.cc b/test/ffmpeg_seek_test.cc
index 7014bf1b0..f587d6cc6 100644
--- a/test/ffmpeg_seek_test.cc
+++ b/test/ffmpeg_seek_test.cc
@@ -31,11 +31,11 @@ using boost::shared_ptr;
 
 #define FFMPEG_SEEK_TEST_DEBUG 1
 
-boost::optional<Time> first_video;
-boost::optional<Time> first_audio;
+boost::optional<DCPTime> first_video;
+boost::optional<DCPTime> first_audio;
 
 static void
-process_video (shared_ptr<PlayerImage>, Eyes, ColourConversion, bool, Time t)
+process_video (shared_ptr<PlayerImage>, Eyes, ColourConversion, bool, DCPTime t)
 {
 	if (!first_video) {
 		first_video = t;
@@ -43,7 +43,7 @@ process_video (shared_ptr<PlayerImage>, Eyes, ColourConversion, bool, Time t)
 }
 
 static void
-process_audio (shared_ptr<const AudioBuffers>, Time t)
+process_audio (shared_ptr<const AudioBuffers>, DCPTime t)
 {
 	if (!first_audio) {
 		first_audio = t;
@@ -51,7 +51,7 @@ process_audio (shared_ptr<const AudioBuffers>, Time t)
 }
 
 static string
-print_time (Time t, float fps)
+print_time (DCPTime t, float fps)
 {
 	stringstream s;
 	s << t << " " << (float(t) / TIME_HZ) << "s " << (float(t) * fps / TIME_HZ) << "f";
@@ -59,7 +59,7 @@ print_time (Time t, float fps)
 }
 
 static void
-check (shared_ptr<Player> p, Time t)
+check (shared_ptr<Player> p, DCPTime t)
 {
 	first_video.reset ();
 	first_audio.reset ();
diff --git a/test/long_ffmpeg_seek_test.cc b/test/long_ffmpeg_seek_test.cc
index 5f7f6c2f2..5285d4481 100644
--- a/test/long_ffmpeg_seek_test.cc
+++ b/test/long_ffmpeg_seek_test.cc
@@ -31,11 +31,11 @@ using boost::shared_ptr;
 
 #define LONG_FFMPEG_SEEK_TEST_DEBUG 1
 
-boost::optional<Time> first_video;
-boost::optional<Time> first_audio;
+boost::optional<DCPTime> first_video;
+boost::optional<DCPTime> first_audio;
 
 static void
-process_video (shared_ptr<PlayerImage>, Eyes, ColourConversion, bool, Time t)
+process_video (shared_ptr<PlayerImage>, Eyes, ColourConversion, bool, DCPTime t)
 {
 	if (!first_video) {
 		first_video = t;
@@ -43,7 +43,7 @@ process_video (shared_ptr<PlayerImage>, Eyes, ColourConversion, bool, Time t)
 }
 
 static void
-process_audio (shared_ptr<const AudioBuffers>, Time t)
+process_audio (shared_ptr<const AudioBuffers>, DCPTime t)
 {
 	if (!first_audio) {
 		first_audio = t;
@@ -51,7 +51,7 @@ process_audio (shared_ptr<const AudioBuffers>, Time t)
 }
 
 static string
-print_time (Time t, float fps)
+print_time (DCPTime t, float fps)
 {
 	stringstream s;
 	s << t << " " << (float(t) / TIME_HZ) << "s " << (float(t) * fps / TIME_HZ) << "f";
@@ -59,7 +59,7 @@ print_time (Time t, float fps)
 }
 
 static void
-check (shared_ptr<Player> p, Time t)
+check (shared_ptr<Player> p, DCPTime t)
 {
 	first_video.reset ();
 	first_audio.reset ();
diff --git a/test/play_test.cc b/test/play_test.cc
index dfa597431..c9486d161 100644
--- a/test/play_test.cc
+++ b/test/play_test.cc
@@ -34,7 +34,7 @@ struct Video
 {
 	boost::shared_ptr<Content> content;
 	boost::shared_ptr<const Image> image;
-	Time time;
+	DCPTime time;
 };
 
 class PlayerWrapper
@@ -46,7 +46,7 @@ public:
 		_player->Video.connect (bind (&PlayerWrapper::process_video, this, _1, _2, _5));
 	}
 
-	void process_video (shared_ptr<PlayerImage> i, bool, Time t)
+	void process_video (shared_ptr<PlayerImage> i, bool, DCPTime t)
 	{
 		Video v;
 		v.content = _player->_last_video;
@@ -67,7 +67,7 @@ public:
 		return v;
 	}
 
-	void seek (Time t, bool ac)
+	void seek (DCPTime t, bool ac)
 	{
 		_player->seek (t, ac);
 		_queue.clear ();
-- 
cgit v1.2.3


From da19eaac0dd80afed3dd282d61ea3298196a5090 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Fri, 13 Dec 2013 10:23:20 +0000
Subject: Start of changing frame numbers to time.

---
 src/lib/audio_decoder.cc  |  6 ++---
 src/lib/audio_decoder.h   |  5 ++--
 src/lib/ffmpeg_decoder.cc | 67 ++++-------------------------------------------
 src/lib/ffmpeg_decoder.h  |  1 -
 src/lib/player.cc         | 20 ++++++++++----
 src/lib/player.h          |  8 +++---
 src/lib/video_decoder.cc  | 11 +++-----
 src/lib/video_decoder.h   |  7 +++--
 8 files changed, 35 insertions(+), 90 deletions(-)

(limited to 'src/lib/ffmpeg_decoder.h')

diff --git a/src/lib/audio_decoder.cc b/src/lib/audio_decoder.cc
index c0ef02f65..a73ad4d7c 100644
--- a/src/lib/audio_decoder.cc
+++ b/src/lib/audio_decoder.cc
@@ -35,16 +35,14 @@ using boost::shared_ptr;
 AudioDecoder::AudioDecoder (shared_ptr<const Film> film, shared_ptr<const AudioContent> content)
 	: Decoder (film)
 	, _audio_content (content)
-	, _audio_position (0)
 {
 
 }
 
 void
-AudioDecoder::audio (shared_ptr<const AudioBuffers> data, AudioContent::Frame frame)
+AudioDecoder::audio (shared_ptr<const AudioBuffers> data, ContentTime time)
 {
-	Audio (data, frame);
-	_audio_position = frame + data->frames ();
+	Audio (data, time);
 }
 
 /** This is a bit odd, but necessary when we have (e.g.) FFmpegDecoders with no audio.
diff --git a/src/lib/audio_decoder.h b/src/lib/audio_decoder.h
index ab6c4b8a9..10e4298f7 100644
--- a/src/lib/audio_decoder.h
+++ b/src/lib/audio_decoder.h
@@ -41,13 +41,12 @@ public:
 	bool has_audio () const;
 
 	/** Emitted when some audio data is ready */
-	boost::signals2::signal<void (boost::shared_ptr<const AudioBuffers>, AudioContent::Frame)> Audio;
+	boost::signals2::signal<void (boost::shared_ptr<const AudioBuffers>, ContentTime)> Audio;
 
 protected:
 
-	void audio (boost::shared_ptr<const AudioBuffers>, AudioContent::Frame);
+	void audio (boost::shared_ptr<const AudioBuffers>, ContentTime);
 	boost::shared_ptr<const AudioContent> _audio_content;
-	AudioContent::Frame _audio_position;
 };
 
 #endif
diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc
index 2cb18c557..d72fed0bc 100644
--- a/src/lib/ffmpeg_decoder.cc
+++ b/src/lib/ffmpeg_decoder.cc
@@ -70,7 +70,6 @@ FFmpegDecoder::FFmpegDecoder (shared_ptr<const Film> f, shared_ptr<const FFmpegC
 	, _decode_audio (audio)
 	, _video_pts_offset (0)
 	, _audio_pts_offset (0)
-	, _just_sought (false)
 {
 	setup_subtitle ();
 
@@ -411,8 +410,6 @@ FFmpegDecoder::seek (DCPTime time, bool accurate)
 
 	seek_and_flush (initial_seek);
 
-	_just_sought = true;
-	
 	if (time == 0 || !accurate) {
 		/* We're already there, or we're as close as we need to be */
 		return;
@@ -448,31 +445,14 @@ FFmpegDecoder::decode_audio_packet ()
 		}
 
 		if (frame_finished) {
-			
-			if (_audio_position == 0) {
-				/* Where we are in the source, in seconds */
-				double const pts = av_q2d (_format_context->streams[copy_packet.stream_index]->time_base)
-					* av_frame_get_best_effort_timestamp(_frame) + _audio_pts_offset;
-
-				if (pts > 0) {
-					/* Emit some silence */
-					shared_ptr<AudioBuffers> silence (
-						new AudioBuffers (
-							_ffmpeg_content->audio_channels(),
-							pts * _ffmpeg_content->content_audio_frame_rate()
-							)
-						);
-					
-					silence->make_silent ();
-					audio (silence, _audio_position);
-				}
-			}
+			Time const t = (av_q2d (_format_context->streams[copy_packet.stream_index]->time_base)
+					* av_frame_get_best_effort_timestamp(_frame) + _audio_pts_offset) * TIME_HZ;
 			
 			int const data_size = av_samples_get_buffer_size (
 				0, audio_codec_context()->channels, _frame->nb_samples, audio_sample_format (), 1
 				);
 			
-			audio (deinterleave_audio (_frame->data, data_size), _audio_position);
+			audio (deinterleave_audio (_frame->data, data_size), t);
 		}
 			
 		copy_packet.data += decode_result;
@@ -521,45 +501,8 @@ FFmpegDecoder::decode_video_packet ()
 		}
 		
 		if (i->second != AV_NOPTS_VALUE) {
-
-			double const pts = i->second * av_q2d (_format_context->streams[_video_stream]->time_base) + _video_pts_offset;
-
-			if (_just_sought) {
-				/* We just did a seek, so disable any attempts to correct for where we
-				   are / should be.
-				*/
-				_video_position = rint (pts * _ffmpeg_content->video_frame_rate ());
-				_just_sought = false;
-			}
-
-			double const next = _video_position / _ffmpeg_content->video_frame_rate();
-			double const one_frame = 1 / _ffmpeg_content->video_frame_rate ();
-			double delta = pts - next;
-
-			while (delta > one_frame) {
-				/* This PTS is more than one frame forward in time of where we think we should be; emit
-				   a black frame.
-				*/
-
-				/* XXX: I think this should be a copy of the last frame... */
-				boost::shared_ptr<Image> black (
-					new Image (
-						static_cast<AVPixelFormat> (_frame->format),
-						libdcp::Size (video_codec_context()->width, video_codec_context()->height),
-						true
-						)
-					);
-				
-				black->make_black ();
-				video (image, false, _video_position);
-				delta -= one_frame;
-			}
-
-			if (delta > -one_frame) {
-				/* This PTS is within a frame of being right; emit this (otherwise it will be dropped) */
-				video (image, false, _video_position);
-			}
-				
+			Time const t = (i->second * av_q2d (_format_context->streams[_video_stream]->time_base) + _video_pts_offset) * TIME_HZ;
+			video (image, false, t);
 		} else {
 			shared_ptr<const Film> film = _film.lock ();
 			assert (film);
diff --git a/src/lib/ffmpeg_decoder.h b/src/lib/ffmpeg_decoder.h
index 06e0ef8a5..ed4557702 100644
--- a/src/lib/ffmpeg_decoder.h
+++ b/src/lib/ffmpeg_decoder.h
@@ -90,5 +90,4 @@ private:
 
 	double _video_pts_offset;
 	double _audio_pts_offset;
-	bool _just_sought;
 };
diff --git a/src/lib/player.cc b/src/lib/player.cc
index be22ae242..7f5e78681 100644
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -86,13 +86,23 @@ public:
 
 	void repeat (Player* player)
 	{
+		shared_ptr<Piece> p = repeat_video.weak_piece.lock ();
+		if (!p) {
+			return;
+		}
+
+		shared_ptr<VideoContent> vc = dynamic_pointer_cast<VideoContent> (p->content);
+		if (!vc) {
+			return;
+		}
+			
 		player->process_video (
 			repeat_video.weak_piece,
 			repeat_video.image,
 			repeat_video.eyes,
 			repeat_done > 0,
-			repeat_video.frame,
-			(repeat_done + 1) * (TIME_HZ / player->_film->video_frame_rate ())
+			repeat_video.time,
+			(repeat_done + 1) * (TIME_HZ / vc->video_frame_rate ())
 			);
 
 		++repeat_done;
@@ -241,14 +251,14 @@ Player::pass ()
 
 /** @param extra Amount of extra time to add to the content frame's time (for repeat) */
 void
-Player::process_video (weak_ptr<Piece> weak_piece, shared_ptr<const Image> image, Eyes eyes, bool same, VideoContent::Frame frame, DCPTime extra)
+Player::process_video (weak_ptr<Piece> weak_piece, shared_ptr<const Image> image, Eyes eyes, bool same, ContentTime time, ContentTime extra)
 {
 	/* 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.same = same;
-	_last_incoming_video.frame = frame;
+	_last_incoming_video.time = time;
 	_last_incoming_video.extra = extra;
 	
 	shared_ptr<Piece> piece = weak_piece.lock ();
@@ -689,7 +699,7 @@ Player::repeat_last_video ()
 		_last_incoming_video.image,
 		_last_incoming_video.eyes,
 		_last_incoming_video.same,
-		_last_incoming_video.frame,
+		_last_incoming_video.time,
 		_last_incoming_video.extra
 		);
 
diff --git a/src/lib/player.h b/src/lib/player.h
index 364d66249..0d6c8d8ba 100644
--- a/src/lib/player.h
+++ b/src/lib/player.h
@@ -49,8 +49,8 @@ public:
 	boost::shared_ptr<const Image> image;
 	Eyes eyes;
 	bool same;
-	VideoContent::Frame frame;
-	DCPTime extra;
+	ContentTime time;
+	ContentTime extra;
 };
 
 /** A wrapper for an Image which contains some pending operations; these may
@@ -118,8 +118,8 @@ private:
 	friend class PlayerWrapper;
 	friend class Piece;
 
-	void process_video (boost::weak_ptr<Piece>, boost::shared_ptr<const Image>, Eyes, bool, VideoContent::Frame, DCPTime);
-	void process_audio (boost::weak_ptr<Piece>, boost::shared_ptr<const AudioBuffers>, AudioContent::Frame);
+	void process_video (boost::weak_ptr<Piece>, boost::shared_ptr<const Image>, Eyes, bool, ContentTime, ContentTime);
+	void process_audio (boost::weak_ptr<Piece>, boost::shared_ptr<const AudioBuffers>, ContentTime);
 	void process_subtitle (boost::weak_ptr<Piece>, boost::shared_ptr<Image>, dcpomatic::Rect<double>, DCPTime, DCPTime);
 	void setup_pieces ();
 	void playlist_changed ();
diff --git a/src/lib/video_decoder.cc b/src/lib/video_decoder.cc
index eaa4534e4..72caf72e9 100644
--- a/src/lib/video_decoder.cc
+++ b/src/lib/video_decoder.cc
@@ -28,27 +28,24 @@ using boost::shared_ptr;
 VideoDecoder::VideoDecoder (shared_ptr<const Film> f, shared_ptr<const VideoContent> c)
 	: Decoder (f)
 	, _video_content (c)
-	, _video_position (0)
 {
 
 }
 
 void
-VideoDecoder::video (shared_ptr<const Image> image, bool same, VideoContent::Frame frame)
+VideoDecoder::video (shared_ptr<const Image> image, bool same, ContentTime time)
 {
 	switch (_video_content->video_frame_type ()) {
 	case VIDEO_FRAME_TYPE_2D:
-		Video (image, EYES_BOTH, same, frame);
+		Video (image, EYES_BOTH, same, time);
 		break;
 	case VIDEO_FRAME_TYPE_3D_LEFT_RIGHT:
 	{
 		int const half = image->size().width / 2;
-		Video (image->crop (Crop (0, half, 0, 0), true), EYES_LEFT, same, frame);
-		Video (image->crop (Crop (half, 0, 0, 0), true), EYES_RIGHT, same, frame);
+		Video (image->crop (Crop (0, half, 0, 0), true), EYES_LEFT, same, time);
+		Video (image->crop (Crop (half, 0, 0, 0), true), EYES_RIGHT, same, time);
 		break;
 	}
 	}
-	
-	_video_position = frame + 1;
 }
 
diff --git a/src/lib/video_decoder.h b/src/lib/video_decoder.h
index 01319e481..6e9060dbd 100644
--- a/src/lib/video_decoder.h
+++ b/src/lib/video_decoder.h
@@ -38,15 +38,14 @@ public:
 	 *  First parameter is the video image.
 	 *  Second parameter is the eye(s) which should see this image.
 	 *  Third parameter is true if the image is the same as the last one that was emitted for this Eyes value.
-	 *  Fourth parameter is the frame within our source.
+	 *  Fourth parameter is the time within our source.
 	 */
-	boost::signals2::signal<void (boost::shared_ptr<const Image>, Eyes, bool, VideoContent::Frame)> Video;
+	boost::signals2::signal<void (boost::shared_ptr<const Image>, Eyes, bool, ContentTime)> Video;
 	
 protected:
 
-	void video (boost::shared_ptr<const Image>, bool, VideoContent::Frame);
+	void video (boost::shared_ptr<const Image>, bool, ContentTime);
 	boost::shared_ptr<const VideoContent> _video_content;
-	VideoContent::Frame _video_position;
 };
 
 #endif
-- 
cgit v1.2.3


From 9c399a21b37d83ceb2c81706975e2c46d1a3f673 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Wed, 18 Dec 2013 09:39:36 +0000
Subject: Considerable rework of decoder timing; tests pass, at least.

---
 src/lib/audio_decoder.cc    |  12 +-
 src/lib/audio_decoder.h     |  11 +-
 src/lib/decoder.cc          |  29 ++++
 src/lib/decoder.h           |  24 ++-
 src/lib/ffmpeg_decoder.cc   |  93 +++++-----
 src/lib/ffmpeg_decoder.h    |  11 +-
 src/lib/image_decoder.cc    |  27 +--
 src/lib/image_decoder.h     |   9 +-
 src/lib/player.cc           | 414 ++++++++++++++++++--------------------------
 src/lib/player.h            |  44 ++---
 src/lib/resampler.cc        |   8 +-
 src/lib/resampler.h         |   2 +-
 src/lib/sndfile_decoder.cc  |  18 +-
 src/lib/sndfile_decoder.h   |   9 +-
 src/lib/subtitle_decoder.cc |   3 +-
 src/lib/subtitle_decoder.h  |   3 +-
 src/lib/video_decoder.cc    |   9 +-
 src/lib/video_decoder.h     |  13 +-
 src/wx/film_editor.cc       |   2 +-
 test/frame_rate_test.cc     |   2 +-
 test/play_test.cc           |   6 +-
 test/resampler_test.cc      |   7 +-
 22 files changed, 347 insertions(+), 409 deletions(-)

(limited to 'src/lib/ffmpeg_decoder.h')

diff --git a/src/lib/audio_decoder.cc b/src/lib/audio_decoder.cc
index a73ad4d7c..7ff8529c6 100644
--- a/src/lib/audio_decoder.cc
+++ b/src/lib/audio_decoder.cc
@@ -42,15 +42,5 @@ AudioDecoder::AudioDecoder (shared_ptr<const Film> film, shared_ptr<const AudioC
 void
 AudioDecoder::audio (shared_ptr<const AudioBuffers> data, ContentTime time)
 {
-	Audio (data, time);
-}
-
-/** This is a bit odd, but necessary when we have (e.g.) FFmpegDecoders with no audio.
- *  The player needs to know that there is no audio otherwise it will keep trying to
- *  pass() the decoder to get it to emit audio.
- */
-bool
-AudioDecoder::has_audio () const
-{
-	return _audio_content->audio_channels () > 0;
+	_pending.push_back (shared_ptr<DecodedAudio> (new DecodedAudio (data, time)));
 }
diff --git a/src/lib/audio_decoder.h b/src/lib/audio_decoder.h
index 10e4298f7..0cd0e9754 100644
--- a/src/lib/audio_decoder.h
+++ b/src/lib/audio_decoder.h
@@ -27,6 +27,7 @@
 #include "decoder.h"
 #include "content.h"
 #include "audio_content.h"
+#include "decoded.h"
 
 class AudioBuffers;
 
@@ -38,15 +39,15 @@ class AudioDecoder : public virtual Decoder
 public:
 	AudioDecoder (boost::shared_ptr<const Film>, boost::shared_ptr<const AudioContent>);
 
-	bool has_audio () const;
-
-	/** Emitted when some audio data is ready */
-	boost::signals2::signal<void (boost::shared_ptr<const AudioBuffers>, ContentTime)> Audio;
+	boost::shared_ptr<const AudioContent> audio_content () const {
+		return _audio_content;
+	}
 
 protected:
 
 	void audio (boost::shared_ptr<const AudioBuffers>, ContentTime);
-	boost::shared_ptr<const AudioContent> _audio_content;
+	
+	boost::shared_ptr<const AudioContent> _audio_content;	
 };
 
 #endif
diff --git a/src/lib/decoder.cc b/src/lib/decoder.cc
index 3f4cda6eb..18c5acd35 100644
--- a/src/lib/decoder.cc
+++ b/src/lib/decoder.cc
@@ -36,3 +36,32 @@ Decoder::Decoder (shared_ptr<const Film> f)
 {
 
 }
+
+shared_ptr<Decoded>
+Decoder::peek ()
+{
+	while (_pending.empty () && !pass ()) {}
+
+	if (_pending.empty ()) {
+		return shared_ptr<Decoded> ();
+	}
+
+	return _pending.front ();
+}
+
+shared_ptr<Decoded>
+Decoder::get ()
+{
+	shared_ptr<Decoded> d = peek ();
+	if (d) {
+		_pending.pop_front ();
+	}
+
+	return d;
+}
+
+void
+Decoder::seek (ContentTime, bool)
+{
+	_pending.clear ();
+}
diff --git a/src/lib/decoder.h b/src/lib/decoder.h
index aa36d41b4..654cacad4 100644
--- a/src/lib/decoder.h
+++ b/src/lib/decoder.h
@@ -30,6 +30,7 @@
 #include "types.h"
 
 class Film;
+class Decoded;
 
 /** @class Decoder.
  *  @brief Parent class for decoders of content.
@@ -40,26 +41,31 @@ public:
 	Decoder (boost::shared_ptr<const Film>);
 	virtual ~Decoder () {}
 
-	/** Perform one decode pass of the content, which may or may not
-	 *  cause the object to emit some data.
-	 */
-	virtual void pass () = 0;
-
-	/** Seek so that the next pass() will yield the next thing
+	/** Seek so that the next get_*() will yield the next thing
 	 *  (video/sound frame, subtitle etc.) at or after the requested
 	 *  time.  Pass accurate = true to try harder to get close to
 	 *  the request.
 	 */
-	virtual void seek (DCPTime time, bool accurate) = 0;
-
-	virtual bool done () const = 0;
+	virtual void seek (ContentTime time, bool accurate);
+	
+	boost::shared_ptr<Decoded> peek ();
+	boost::shared_ptr<Decoded> get ();
 
 protected:
 
+	/** Perform one decode pass of the content, which may or may not
+	 *  result in a complete quantum (Decoded object) of decoded stuff
+	 *  being made ready.
+	 *  @return true if the decoder is done (i.e. no more data will be
+	 *  produced by any future calls to pass() without a seek() first).
+	 */
+	virtual bool pass () = 0;
 	virtual void flush () {};
 	
 	/** The Film that we are decoding in */
 	boost::weak_ptr<const Film> _film;
+
+	std::list<boost::shared_ptr<Decoded> > _pending;
 };
 
 #endif
diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc
index d72fed0bc..b2e8cc44a 100644
--- a/src/lib/ffmpeg_decoder.cc
+++ b/src/lib/ffmpeg_decoder.cc
@@ -88,7 +88,7 @@ FFmpegDecoder::FFmpegDecoder (shared_ptr<const Film> f, shared_ptr<const FFmpegC
 	*/
 
 	bool const have_video = video && c->first_video();
-	bool const have_audio = audio && c->audio_stream() && c->audio_stream()->first_audio;
+	bool const have_audio = _decode_audio && c->audio_stream () && c->audio_stream()->first_audio;
 
 	/* First, make one of them start at 0 */
 
@@ -142,12 +142,15 @@ FFmpegDecoder::flush ()
 		decode_audio_packet ();
 	}
 
+#if 0	
+	/* XXX */
 	/* Stop us being asked for any more data */
 	_video_position = _ffmpeg_content->video_length ();
 	_audio_position = _ffmpeg_content->audio_length ();
+#endif	
 }
 
-void
+bool
 FFmpegDecoder::pass ()
 {
 	int r = av_read_frame (_format_context, &_packet);
@@ -163,7 +166,7 @@ FFmpegDecoder::pass ()
 		}
 
 		flush ();
-		return;
+		return true;
 	}
 
 	avcodec_get_frame_defaults (_frame);
@@ -182,6 +185,7 @@ FFmpegDecoder::pass ()
 	}
 
 	av_free_packet (&_packet);
+	return false;
 }
 
 /** @param data pointer to array of pointers to buffers.
@@ -297,14 +301,22 @@ FFmpegDecoder::bytes_per_audio_sample () const
 }
 
 int
-FFmpegDecoder::minimal_run (boost::function<bool (int)> finished)
+FFmpegDecoder::minimal_run (boost::function<bool (ContentTime, ContentTime, int)> finished)
 {
 	int frames_read = 0;
-	
-	while (!finished (frames_read)) {
+	ContentTime last_video = 0;
+	ContentTime last_audio = 0;
+	bool flushing = false;
+
+	while (!finished (last_video, last_audio, frames_read)) {
 		int r = av_read_frame (_format_context, &_packet);
 		if (r < 0) {
-			return -1;
+			/* We should flush our decoders here, possibly yielding a few more frames,
+			   but the consequence of having to do that is too hideous to contemplate.
+			   Instead we give up and say that you can't seek too close to the end
+			   of a file.
+			*/
+			return frames_read;
 		}
 
 		++frames_read;
@@ -318,31 +330,28 @@ FFmpegDecoder::minimal_run (boost::function<bool (int)> finished)
 			int finished = 0;
 			r = avcodec_decode_video2 (video_codec_context(), _frame, &finished, &_packet);
 			if (r >= 0 && finished) {
-				_video_position = rint (
-					(av_frame_get_best_effort_timestamp (_frame) * time_base + _video_pts_offset) * _ffmpeg_content->video_frame_rate()
+				last_video = rint (
+					(av_frame_get_best_effort_timestamp (_frame) * time_base + _video_pts_offset) * TIME_HZ
 					);
 			}
-
+				
 		} else if (_ffmpeg_content->audio_stream() && _packet.stream_index == _ffmpeg_content->audio_stream()->index (_format_context)) {
-
 			AVPacket copy_packet = _packet;
-
 			while (copy_packet.size > 0) {
 
 				int finished;
-				r = avcodec_decode_audio4 (audio_codec_context(), _frame, &finished, &copy_packet);
+				r = avcodec_decode_audio4 (audio_codec_context(), _frame, &finished, &_packet);
 				if (r >= 0 && finished) {
-					_audio_position = rint (
-						(av_frame_get_best_effort_timestamp (_frame) * time_base + _audio_pts_offset) *
-						_ffmpeg_content->audio_stream()->frame_rate
+					last_audio = rint (
+						(av_frame_get_best_effort_timestamp (_frame) * time_base + _audio_pts_offset) *	TIME_HZ
 						);
 				}
-
+					
 				copy_packet.data += r;
 				copy_packet.size -= r;
 			}
 		}
-
+		
 		av_free_packet (&_packet);
 	}
 
@@ -350,12 +359,9 @@ FFmpegDecoder::minimal_run (boost::function<bool (int)> finished)
 }
 
 bool
-FFmpegDecoder::seek_overrun_finished (DCPTime seek) const
+FFmpegDecoder::seek_overrun_finished (ContentTime seek, ContentTime last_video, ContentTime last_audio) const
 {
-	return (
-		_video_position >= _ffmpeg_content->time_to_content_video_frames (seek) ||
-		_audio_position >= _ffmpeg_content->time_to_content_audio_frames (seek, _ffmpeg_content->position())
-		);
+	return last_video >= seek || last_audio >= seek;
 }
 
 bool
@@ -365,16 +371,16 @@ FFmpegDecoder::seek_final_finished (int n, int done) const
 }
 
 void
-FFmpegDecoder::seek_and_flush (DCPTime t)
+FFmpegDecoder::seek_and_flush (ContentTime t)
 {
-	int64_t const initial_v = ((_ffmpeg_content->time_to_content_video_frames (t) / _ffmpeg_content->video_frame_rate()) - _video_pts_offset) /
+	int64_t const initial_v = ((double (t) / TIME_HZ) - _video_pts_offset) /
 		av_q2d (_format_context->streams[_video_stream]->time_base);
 
 	av_seek_frame (_format_context, _video_stream, initial_v, AVSEEK_FLAG_BACKWARD);
 
 	shared_ptr<FFmpegAudioStream> as = _ffmpeg_content->audio_stream ();
 	if (as) {
-		int64_t initial_a = ((_ffmpeg_content->time_to_content_audio_frames (t, t) / as->frame_rate) - _audio_pts_offset) /
+		int64_t initial_a = ((double (t) / TIME_HZ) - _audio_pts_offset) /
 			av_q2d (as->stream(_format_context)->time_base);
 
 		av_seek_frame (_format_context, as->index (_format_context), initial_a, AVSEEK_FLAG_BACKWARD);
@@ -387,21 +393,20 @@ FFmpegDecoder::seek_and_flush (DCPTime t)
 	if (_subtitle_codec_context) {
 		avcodec_flush_buffers (_subtitle_codec_context);
 	}
-
-	_video_position = _ffmpeg_content->time_to_content_video_frames (t);
-	_audio_position = _ffmpeg_content->time_to_content_audio_frames (t, t);
 }
 
 void
-FFmpegDecoder::seek (DCPTime time, bool accurate)
+FFmpegDecoder::seek (ContentTime time, bool accurate)
 {
+	Decoder::seek (time, accurate);
+	
 	/* If we are doing an accurate seek, our initial shot will be 200ms (200 being
 	   a number plucked from the air) earlier than we want to end up.  The loop below
 	   will hopefully then step through to where we want to be.
 	*/
 
-	DCPTime pre_roll = accurate ? (0.2 * TIME_HZ) : 0;
-	DCPTime initial_seek = time - pre_roll;
+	ContentTime pre_roll = accurate ? (0.2 * TIME_HZ) : 0;
+	ContentTime initial_seek = time - pre_roll;
 	if (initial_seek < 0) {
 		initial_seek = 0;
 	}
@@ -415,11 +420,11 @@ FFmpegDecoder::seek (DCPTime time, bool accurate)
 		return;
 	}
 
-	int const N = minimal_run (boost::bind (&FFmpegDecoder::seek_overrun_finished, this, time));
-
+	int const N = minimal_run (boost::bind (&FFmpegDecoder::seek_overrun_finished, this, time, _1, _2));
+	
 	seek_and_flush (initial_seek);
 	if (N > 0) {
-		minimal_run (boost::bind (&FFmpegDecoder::seek_final_finished, this, N - 1, _1));
+		minimal_run (boost::bind (&FFmpegDecoder::seek_final_finished, this, N - 1, _3));
 	}
 }
 
@@ -445,9 +450,11 @@ FFmpegDecoder::decode_audio_packet ()
 		}
 
 		if (frame_finished) {
-			Time const t = (av_q2d (_format_context->streams[copy_packet.stream_index]->time_base)
-					* av_frame_get_best_effort_timestamp(_frame) + _audio_pts_offset) * TIME_HZ;
-			
+			ContentTime const t = rint (
+				(av_q2d (_format_context->streams[copy_packet.stream_index]->time_base)
+				 * av_frame_get_best_effort_timestamp(_frame) + _audio_pts_offset) * TIME_HZ
+				);
+
 			int const data_size = av_samples_get_buffer_size (
 				0, audio_codec_context()->channels, _frame->nb_samples, audio_sample_format (), 1
 				);
@@ -501,7 +508,7 @@ FFmpegDecoder::decode_video_packet ()
 		}
 		
 		if (i->second != AV_NOPTS_VALUE) {
-			Time const t = (i->second * av_q2d (_format_context->streams[_video_stream]->time_base) + _video_pts_offset) * TIME_HZ;
+			ContentTime const t = rint ((i->second * av_q2d (_format_context->streams[_video_stream]->time_base) + _video_pts_offset) * TIME_HZ);
 			video (image, false, t);
 		} else {
 			shared_ptr<const Film> film = _film.lock ();
@@ -535,14 +542,6 @@ FFmpegDecoder::setup_subtitle ()
 	}
 }
 
-bool
-FFmpegDecoder::done () const
-{
-	bool const vd = !_decode_video || (_video_position >= _ffmpeg_content->video_length());
-	bool const ad = !_decode_audio || !_ffmpeg_content->audio_stream() || (_audio_position >= _ffmpeg_content->audio_length());
-	return vd && ad;
-}
-	
 void
 FFmpegDecoder::decode_subtitle_packet ()
 {
diff --git a/src/lib/ffmpeg_decoder.h b/src/lib/ffmpeg_decoder.h
index ed4557702..e50b248cf 100644
--- a/src/lib/ffmpeg_decoder.h
+++ b/src/lib/ffmpeg_decoder.h
@@ -51,15 +51,12 @@ public:
 	FFmpegDecoder (boost::shared_ptr<const Film>, boost::shared_ptr<const FFmpegContent>, bool video, bool audio);
 	~FFmpegDecoder ();
 
-	void pass ();
-	void seek (DCPTime time, bool);
-	bool done () const;
+	void seek (ContentTime time, bool);
 
 private:
 	friend class ::ffmpeg_pts_offset_test;
 
-	static double compute_pts_offset (double, double, float);
-
+	bool pass ();
 	void flush ();
 
 	void setup_subtitle ();
@@ -74,9 +71,9 @@ private:
 	void maybe_add_subtitle ();
 	boost::shared_ptr<AudioBuffers> deinterleave_audio (uint8_t** data, int size);
 
-	bool seek_overrun_finished (DCPTime) const;
+	bool seek_overrun_finished (ContentTime, ContentTime, ContentTime) const;
 	bool seek_final_finished (int, int) const;
-	int minimal_run (boost::function<bool (int)>);
+	int minimal_run (boost::function<bool (ContentTime, ContentTime, int)>);
 	void seek_and_flush (int64_t);
 
 	AVCodecContext* _subtitle_codec_context; ///< may be 0 if there is no subtitle
diff --git a/src/lib/image_decoder.cc b/src/lib/image_decoder.cc
index 723690247..9e90b5bc8 100644
--- a/src/lib/image_decoder.cc
+++ b/src/lib/image_decoder.cc
@@ -36,20 +36,22 @@ ImageDecoder::ImageDecoder (shared_ptr<const Film> f, shared_ptr<const ImageCont
 	: Decoder (f)
 	, VideoDecoder (f, c)
 	, _image_content (c)
+	, _video_position (0)
 {
 
 }
 
-void
+bool
 ImageDecoder::pass ()
 {
 	if (_video_position >= _image_content->video_length ()) {
-		return;
+		return true;
 	}
 
 	if (_image && _image_content->still ()) {
-		video (_image, true, _video_position);
-		return;
+		video (_image, true, _video_position * TIME_HZ / _video_content->video_frame_rate ());
+		++_video_position;
+		return false;
 	}
 
 	Magick::Image* magick_image = new Magick::Image (_image_content->path (_image_content->still() ? 0 : _video_position).string ());
@@ -73,17 +75,16 @@ ImageDecoder::pass ()
 
 	delete magick_image;
 
-	video (_image, false, _video_position);
-}
+	video (_image, false, _video_position * TIME_HZ / _video_content->video_frame_rate ());
+	++_video_position;
 
-void
-ImageDecoder::seek (DCPTime time, bool)
-{
-	_video_position = _video_content->time_to_content_video_frames (time);
+	return false;
 }
 
-bool
-ImageDecoder::done () const
+void
+ImageDecoder::seek (ContentTime time, bool accurate)
 {
-	return _video_position >= _image_content->video_length ();
+	Decoder::seek (time, accurate);
+	
+	_video_position = rint (time * _video_content->video_frame_rate() / TIME_HZ);
 }
diff --git a/src/lib/image_decoder.h b/src/lib/image_decoder.h
index 346fffdf7..f4d81dfb5 100644
--- a/src/lib/image_decoder.h
+++ b/src/lib/image_decoder.h
@@ -34,14 +34,13 @@ public:
 		return _image_content;
 	}
 
-	/* Decoder */
-
-	void pass ();
-	void seek (DCPTime, bool);
-	bool done () const;
+	void seek (ContentTime, bool);
 
 private:
+	bool pass ();
+	
 	boost::shared_ptr<const ImageContent> _image_content;
 	boost::shared_ptr<Image> _image;
+	ContentTime _video_position;
 };
 
diff --git a/src/lib/player.cc b/src/lib/player.cc
index 7f5e78681..56bf0767d 100644
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -45,79 +45,20 @@ using std::map;
 using boost::shared_ptr;
 using boost::weak_ptr;
 using boost::dynamic_pointer_cast;
+using boost::optional;
 
 class Piece
 {
 public:
-	Piece (shared_ptr<Content> c)
-		: content (c)
-		, video_position (c->position ())
-		, audio_position (c->position ())
-		, repeat_to_do (0)
-		, repeat_done (0)
-	{}
-	
-	Piece (shared_ptr<Content> c, shared_ptr<Decoder> d)
+	Piece (shared_ptr<Content> c, shared_ptr<Decoder> d, FrameRateChange f)
 		: content (c)
 		, decoder (d)
-		, video_position (c->position ())
-		, audio_position (c->position ())
+		, frc (f)
 	{}
 
-	/** Set this piece to repeat a video frame a given number of times */
-	void set_repeat (IncomingVideo video, int num)
-	{
-		repeat_video = video;
-		repeat_to_do = num;
-		repeat_done = 0;
-	}
-
-	void reset_repeat ()
-	{
-		repeat_video.image.reset ();
-		repeat_to_do = 0;
-		repeat_done = 0;
-	}
-
-	bool repeating () const
-	{
-		return repeat_done != repeat_to_do;
-	}
-
-	void repeat (Player* player)
-	{
-		shared_ptr<Piece> p = repeat_video.weak_piece.lock ();
-		if (!p) {
-			return;
-		}
-
-		shared_ptr<VideoContent> vc = dynamic_pointer_cast<VideoContent> (p->content);
-		if (!vc) {
-			return;
-		}
-			
-		player->process_video (
-			repeat_video.weak_piece,
-			repeat_video.image,
-			repeat_video.eyes,
-			repeat_done > 0,
-			repeat_video.time,
-			(repeat_done + 1) * (TIME_HZ / vc->video_frame_rate ())
-			);
-
-		++repeat_done;
-	}
-	
 	shared_ptr<Content> content;
 	shared_ptr<Decoder> decoder;
-	/** DCPTime of the last video we emitted relative to the start of the DCP */
-	DCPTime video_position;
-	/** DCPTime of the last audio we emitted relative to the start of the DCP */
-	DCPTime audio_position;
-
-	IncomingVideo repeat_video;
-	int repeat_to_do;
-	int repeat_done;
+	FrameRateChange frc;
 };
 
 Player::Player (shared_ptr<const Film> f, shared_ptr<const Playlist> p)
@@ -130,6 +71,7 @@ Player::Player (shared_ptr<const Film> f, shared_ptr<const Playlist> p)
 	, _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)
 {
 	_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));
@@ -156,110 +98,97 @@ Player::pass ()
 		setup_pieces ();
 	}
 
-	DCPTime earliest_t = TIME_MAX;
-	shared_ptr<Piece> earliest;
-	enum {
-		VIDEO,
-		AUDIO
-	} type = VIDEO;
+	/* Interrogate all our pieces to find the one with the earliest decoded data */
+
+	shared_ptr<Piece> earliest_piece;
+	shared_ptr<Decoded> earliest_decoded;
+	DCPTime earliest_time = TIME_MAX;
+	DCPTime earliest_audio = TIME_MAX;
 
 	for (list<shared_ptr<Piece> >::iterator i = _pieces.begin(); i != _pieces.end(); ++i) {
-		if ((*i)->decoder->done ()) {
-			continue;
-		}
 
-		shared_ptr<VideoDecoder> vd = dynamic_pointer_cast<VideoDecoder> ((*i)->decoder);
-		shared_ptr<AudioDecoder> ad = dynamic_pointer_cast<AudioDecoder> ((*i)->decoder);
+		shared_ptr<Decoded> dec = (*i)->decoder->peek ();
 
-		if (_video && vd) {
-			if ((*i)->video_position < earliest_t) {
-				earliest_t = (*i)->video_position;
-				earliest = *i;
-				type = VIDEO;
-			}
+		if (dec) {
+			dec->set_dcp_times ((*i)->frc.speed_up, (*i)->content->position());
 		}
 
-		if (_audio && ad && ad->has_audio ()) {
-			if ((*i)->audio_position < earliest_t) {
-				earliest_t = (*i)->audio_position;
-				earliest = *i;
-				type = AUDIO;
+		/* XXX: don't know what to do with this */
+#if 0		
+		if (ad->done()) {
+			shared_ptr<AudioContent> ac = dynamic_pointer_cast<AudioContent> ((*i)->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 ());
+				}
 			}
 		}
-	}
+#endif		
 
-	if (!earliest) {
+		if (dec && dec->dcp_time < earliest_time) {
+			earliest_piece = *i;
+			earliest_decoded = dec;
+			earliest_time = dec->dcp_time;
+		}
+
+		if (dynamic_pointer_cast<DecodedAudio> (dec) && dec->dcp_time < earliest_audio) {
+			earliest_audio = dec->dcp_time;
+		}
+	}
+		
+	if (!earliest_piece) {
 		flush ();
 		return true;
 	}
 
-	switch (type) {
-	case VIDEO:
-		if (earliest_t > _video_position) {
+	if (earliest_audio != TIME_MAX) {
+		TimedAudioBuffers<DCPTime> tb = _audio_merger.pull (earliest_audio);
+		Audio (tb.audio, tb.time);
+		_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);
+
+	if (dv) {
+		if (!_just_did_inaccurate_seek && earliest_time > _video_position) {
+			/* XXX: if we're inside some content, repeat the last frame... otherwise emit black */
 			emit_black ();
 		} else {
-			if (earliest->repeating ()) {
-				earliest->repeat (this);
-			} else {
-				earliest->decoder->pass ();
-			}
+			emit_video (earliest_piece, dv);
+			earliest_piece->decoder->get ();
 		}
-		break;
-
-	case AUDIO:
-		if (earliest_t > _audio_position) {
-			emit_silence (_film->time_to_audio_frames (earliest_t - _audio_position));
+	} else if (da) {
+		if (!_just_did_inaccurate_seek && earliest_time > _audio_position) {
+			emit_silence (earliest_time - _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 ());
-					}
-				}
-			}
+			emit_audio (earliest_piece, da);
+			earliest_piece->decoder->get ();
 		}
-		break;
+	} else if (ds) {
+		_in_subtitle.piece = earliest_piece;
+		_in_subtitle.subtitle = ds;
+		update_subtitle ();
+		earliest_piece->decoder->get ();
 	}
 
-	if (_audio) {
-		boost::optional<DCPTime> audio_done_up_to;
-		for (list<shared_ptr<Piece> >::iterator i = _pieces.begin(); i != _pieces.end(); ++i) {
-			if ((*i)->decoder->done ()) {
-				continue;
-			}
-
-			if (dynamic_pointer_cast<AudioDecoder> ((*i)->decoder)) {
-				audio_done_up_to = min (audio_done_up_to.get_value_or (TIME_MAX), (*i)->audio_position);
-			}
-		}
-
-		if (audio_done_up_to) {
-			TimedAudioBuffers<DCPTime> tb = _audio_merger.pull (audio_done_up_to.get ());
-			Audio (tb.audio, tb.time);
-			_audio_position += _film->audio_frames_to_time (tb.audio->frames ());
-		}
-	}
+	_just_did_inaccurate_seek = false;
 
 	return false;
 }
 
-/** @param extra Amount of extra time to add to the content frame's time (for repeat) */
 void
-Player::process_video (weak_ptr<Piece> weak_piece, shared_ptr<const Image> image, Eyes eyes, bool same, ContentTime time, ContentTime extra)
+Player::emit_video (weak_ptr<Piece> weak_piece, shared_ptr<DecodedVideo> video)
 {
 	/* 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.same = same;
-	_last_incoming_video.time = time;
-	_last_incoming_video.extra = extra;
+	_last_incoming_video.video = video;
 	
 	shared_ptr<Piece> piece = weak_piece.lock ();
 	if (!piece) {
@@ -270,22 +199,23 @@ Player::process_video (weak_ptr<Piece> weak_piece, shared_ptr<const Image> image
 	assert (content);
 
 	FrameRateChange frc (content->video_frame_rate(), _film->video_frame_rate());
+#if 0
+	XXX
 	if (frc.skip && (frame % 2) == 1) {
 		return;
 	}
+#endif	
 
-	DCPTime const relative_time = (frame * frc.factor() * TIME_HZ / _film->video_frame_rate());
-	if (content->trimmed (relative_time)) {
+	if (content->trimmed (video->dcp_time - content->position ())) {
 		return;
 	}
 
-	DCPTime const time = content->position() + relative_time + extra - content->trim_start ();
 	float const ratio = content->ratio() ? content->ratio()->ratio() : content->video_size_after_crop().ratio();
 	libdcp::Size const image_size = fit_ratio_within (ratio, _video_container_size);
 
 	shared_ptr<PlayerImage> pi (
 		new PlayerImage (
-			image,
+			video->image,
 			content->crop(),
 			image_size,
 			_video_container_size,
@@ -293,32 +223,32 @@ Player::process_video (weak_ptr<Piece> weak_piece, shared_ptr<const Image> image
 			)
 		);
 	
-	if (_film->with_subtitles () && _out_subtitle.image && time >= _out_subtitle.from && time <= _out_subtitle.to) {
+	if (
+		_film->with_subtitles () &&
+		_out_subtitle.subtitle->image &&
+		video->dcp_time >= _out_subtitle.subtitle->dcp_time && video->dcp_time <= _out_subtitle.subtitle->dcp_time_to
+		) {
 
 		Position<int> const container_offset (
 			(_video_container_size.width - image_size.width) / 2,
 			(_video_container_size.height - image_size.width) / 2
 			);
 
-		pi->set_subtitle (_out_subtitle.image, _out_subtitle.position + container_offset);
+		pi->set_subtitle (_out_subtitle.subtitle->image, _out_subtitle.position + container_offset);
 	}
 					    
 #ifdef DCPOMATIC_DEBUG
 	_last_video = piece->content;
 #endif
 
-	Video (pi, eyes, content->colour_conversion(), same, time);
+	Video (pi, video->eyes, content->colour_conversion(), video->same, video->dcp_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);
-	}
+	_video_position = rint (video->dcp_time + TIME_HZ / _film->video_frame_rate());
 }
 
 void
-Player::process_audio (weak_ptr<Piece> weak_piece, shared_ptr<const AudioBuffers> audio, AudioContent::Frame frame)
+Player::emit_audio (weak_ptr<Piece> weak_piece, shared_ptr<DecodedAudio> audio)
 {
 	shared_ptr<Piece> piece = weak_piece.lock ();
 	if (!piece) {
@@ -330,55 +260,48 @@ Player::process_audio (weak_ptr<Piece> weak_piece, shared_ptr<const AudioBuffers
 
 	/* Gain */
 	if (content->audio_gain() != 0) {
-		shared_ptr<AudioBuffers> gain (new AudioBuffers (audio));
+		shared_ptr<AudioBuffers> gain (new AudioBuffers (audio->data));
 		gain->apply_gain (content->audio_gain ());
-		audio = gain;
+		audio->data = 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;
+		audio->data = resampler(content, true)->run (audio->data);
 	}
 	
-	DCPTime const relative_time = _film->audio_frames_to_time (frame);
-
-	if (content->trimmed (relative_time)) {
+	if (content->trimmed (audio->dcp_time - content->position ())) {
 		return;
 	}
 
-	DCPTime time = content->position() + (content->audio_delay() * TIME_HZ / 1000) + relative_time - content->trim_start ();
-	
 	/* Remap channels */
-	shared_ptr<AudioBuffers> dcp_mapped (new AudioBuffers (_film->audio_channels(), audio->frames()));
+	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->channels() && i->second < dcp_mapped->channels()) {
-			dcp_mapped->accumulate_channel (audio.get(), i->first, i->second);
+		if (i->first < audio->data->channels() && i->second < dcp_mapped->channels()) {
+			dcp_mapped->accumulate_channel (audio->data.get(), i->first, i->second);
 		}
 	}
 
-	audio = dcp_mapped;
+	audio->data = dcp_mapped;
 
-	/* 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 ()) {
+	/* 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;
 		}
 
-		shared_ptr<AudioBuffers> trimmed (new AudioBuffers (audio->channels(), audio->frames() - frames));
-		trimmed->copy_from (audio.get(), audio->frames() - frames, frames, 0);
+		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 = trimmed;
-		time = 0;
+		audio->data = trimmed;
+		audio->dcp_time = 0;
 	}
 
-	_audio_merger.push (audio, time);
-	piece->audio_position += _film->audio_frames_to_time (audio->frames ());
+	_audio_merger.push (audio->data, audio->dcp_time);
 }
 
 void
@@ -395,7 +318,7 @@ Player::flush ()
 	}
 
 	while (_audio_position < _video_position) {
-		emit_silence (_film->time_to_audio_frames (_video_position - _audio_position));
+		emit_silence (_video_position - _audio_position);
 	}
 	
 }
@@ -416,85 +339,103 @@ Player::seek (DCPTime t, bool accurate)
 	}
 
 	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 */
-		DCPTime s = t - vc->position ();
+		DCPTime s = t - (*i)->content->position ();
 		s = max (static_cast<DCPTime> (0), s);
-		s = min (vc->length_after_trim(), s);
+		s = min ((*i)->content->length_after_trim(), s);
 
-		/* Hence set the piece positions to the `global' time */
-		(*i)->video_position = (*i)->audio_position = vc->position() + s;
+		/* Convert this to the content time */
+		ContentTime ct = (s * (*i)->frc.speed_up) + (*i)->content->trim_start ();
 
 		/* And seek the decoder */
-		dynamic_pointer_cast<VideoDecoder>((*i)->decoder)->seek (s + vc->trim_start (), accurate);
-		(*i)->reset_repeat ();
+		(*i)->decoder->seek (ct, accurate);
 	}
 
 	_video_position = _audio_position = t;
 	_audio_merger.clear (t);
+
+	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;
+	}
 }
 
 void
 Player::setup_pieces ()
 {
 	list<shared_ptr<Piece> > old_pieces = _pieces;
-
 	_pieces.clear ();
 
 	ContentList content = _playlist->content ();
-	sort (content.begin(), content.end(), ContentSorter ());
 
 	for (ContentList::iterator i = content.begin(); i != content.end(); ++i) {
 
-		shared_ptr<Piece> piece (new Piece (*i));
-
-		/* XXX: into content? */
+		shared_ptr<Decoder> decoder;
+		optional<FrameRateChange> frc;
 
 		shared_ptr<const FFmpegContent> fc = dynamic_pointer_cast<const FFmpegContent> (*i);
 		if (fc) {
-			shared_ptr<FFmpegDecoder> fd (new FFmpegDecoder (_film, fc, _video, _audio));
-			
-			fd->Video.connect (bind (&Player::process_video, this, weak_ptr<Piece> (piece), _1, _2, _3, _4, 0));
-			fd->Audio.connect (bind (&Player::process_audio, this, weak_ptr<Piece> (piece), _1, _2));
-			fd->Subtitle.connect (bind (&Player::process_subtitle, this, weak_ptr<Piece> (piece), _1, _2, _3, _4));
-
-			fd->seek (fc->trim_start (), true);
-			piece->decoder = fd;
+			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) {
-			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;
+					decoder = imd;
 				}
 			}
 
-			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, 0));
-				piece->decoder = id;
+			if (!decoder) {
+				decoder.reset (new ImageDecoder (_film, ic));
 			}
+
+			frc = FrameRateChange (ic->video_frame_rate(), _film->video_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));
+			decoder.reset (new SndfileDecoder (_film, sc));
+
+			/* 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.
+			*/
+
+			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;
+				}
+
+				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;
+				}
+			}
 
-			piece->decoder = sd;
+			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 ());
+			}
 		}
 
-		_pieces.push_back (piece);
+		decoder->seek ((*i)->trim_start (), true);
+		
+		_pieces.push_back (shared_ptr<Piece> (new Piece (*i, decoder, frc.get ())));
 	}
 
 	_have_valid_pieces = true;
@@ -596,17 +537,17 @@ Player::emit_black ()
 }
 
 void
-Player::emit_silence (OutputAudioFrame most)
+Player::emit_silence (DCPTime most)
 {
 	if (most == 0) {
 		return;
 	}
 	
-	OutputAudioFrame N = min (most, _film->audio_frame_rate() / 2);
-	shared_ptr<AudioBuffers> silence (new AudioBuffers (_film->audio_channels(), N));
+	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 += _film->audio_frames_to_time (N);
+	_audio_position += t;
 }
 
 void
@@ -622,18 +563,6 @@ Player::film_changed (Film::Property p)
 	}
 }
 
-void
-Player::process_subtitle (weak_ptr<Piece> weak_piece, shared_ptr<Image> image, dcpomatic::Rect<double> rect, DCPTime from, DCPTime to)
-{
-	_in_subtitle.piece = weak_piece;
-	_in_subtitle.image = image;
-	_in_subtitle.rect = rect;
-	_in_subtitle.from = from;
-	_in_subtitle.to = to;
-
-	update_subtitle ();
-}
-
 void
 Player::update_subtitle ()
 {
@@ -642,15 +571,15 @@ Player::update_subtitle ()
 		return;
 	}
 
-	if (!_in_subtitle.image) {
-		_out_subtitle.image.reset ();
+	if (!_in_subtitle.subtitle->image) {
+		_out_subtitle.subtitle->image.reset ();
 		return;
 	}
 
 	shared_ptr<SubtitleContent> sc = dynamic_pointer_cast<SubtitleContent> (piece->content);
 	assert (sc);
 
-	dcpomatic::Rect<double> in_rect = _in_subtitle.rect;
+	dcpomatic::Rect<double> in_rect = _in_subtitle.subtitle->rect;
 	libdcp::Size scaled_size;
 
 	in_rect.y += sc->subtitle_offset ();
@@ -674,14 +603,15 @@ Player::update_subtitle ()
 	_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.image->scale (
+	_out_subtitle.subtitle->image = _in_subtitle.subtitle->image->scale (
 		scaled_size,
 		Scaler::from_id ("bicubic"),
-		_in_subtitle.image->pixel_format (),
+		_in_subtitle.subtitle->image->pixel_format (),
 		true
 		);
-	_out_subtitle.from = _in_subtitle.from + piece->content->position ();
-	_out_subtitle.to = _in_subtitle.to + piece->content->position ();
+	
+	_out_subtitle.subtitle->dcp_time = _in_subtitle.subtitle->dcp_time;
+	_out_subtitle.subtitle->dcp_time = _in_subtitle.subtitle->dcp_time;
 }
 
 /** Re-emit the last frame that was emitted, using current settings for crop, ratio, scaler and subtitles.
@@ -690,17 +620,13 @@ Player::update_subtitle ()
 bool
 Player::repeat_last_video ()
 {
-	if (!_last_incoming_video.image || !_have_valid_pieces) {
+	if (!_last_incoming_video.video || !_have_valid_pieces) {
 		return false;
 	}
 
-	process_video (
+	emit_video (
 		_last_incoming_video.weak_piece,
-		_last_incoming_video.image,
-		_last_incoming_video.eyes,
-		_last_incoming_video.same,
-		_last_incoming_video.time,
-		_last_incoming_video.extra
+		_last_incoming_video.video
 		);
 
 	return true;
diff --git a/src/lib/player.h b/src/lib/player.h
index 0d6c8d8ba..6e3f8187f 100644
--- a/src/lib/player.h
+++ b/src/lib/player.h
@@ -29,6 +29,7 @@
 #include "rect.h"
 #include "audio_merger.h"
 #include "audio_content.h"
+#include "decoded.h"
 
 class Job;
 class Film;
@@ -38,22 +39,8 @@ class Piece;
 class Image;
 class Resampler;
 
-/** @class Player
- *  @brief A class which can `play' a Playlist; emitting its audio and video.
- */
-
-struct IncomingVideo
-{
-public:
-	boost::weak_ptr<Piece> weak_piece;
-	boost::shared_ptr<const Image> image;
-	Eyes eyes;
-	bool same;
-	ContentTime time;
-	ContentTime extra;
-};
-
-/** A wrapper for an Image which contains some pending operations; these may
+/** @class PlayerImage
+ *  @brief A wrapper for an Image which contains some pending operations; these may
  *  not be necessary if the receiver of the PlayerImage throws it away.
  */
 class PlayerImage
@@ -75,6 +62,10 @@ private:
 	Position<int> _subtitle_position;
 };
  
+/** @class Player
+ *  @brief A class which can `play' a Playlist; emitting its audio and video.
+ */
+
 class Player : public boost::enable_shared_from_this<Player>, public boost::noncopyable
 {
 public:
@@ -118,9 +109,6 @@ private:
 	friend class PlayerWrapper;
 	friend class Piece;
 
-	void process_video (boost::weak_ptr<Piece>, boost::shared_ptr<const Image>, Eyes, bool, ContentTime, ContentTime);
-	void process_audio (boost::weak_ptr<Piece>, boost::shared_ptr<const AudioBuffers>, ContentTime);
-	void process_subtitle (boost::weak_ptr<Piece>, boost::shared_ptr<Image>, dcpomatic::Rect<double>, DCPTime, DCPTime);
 	void setup_pieces ();
 	void playlist_changed ();
 	void content_changed (boost::weak_ptr<Content>, int, bool);
@@ -131,6 +119,8 @@ private:
 	boost::shared_ptr<Resampler> resampler (boost::shared_ptr<AudioContent>, bool);
 	void film_changed (Film::Property);
 	void update_subtitle ();
+	void emit_video (boost::weak_ptr<Piece>, boost::shared_ptr<DecodedVideo>);
+	void emit_audio (boost::weak_ptr<Piece>, boost::shared_ptr<DecodedAudio>);
 
 	boost::shared_ptr<const Film> _film;
 	boost::shared_ptr<const Playlist> _playlist;
@@ -155,17 +145,12 @@ private:
 
 	struct {
 		boost::weak_ptr<Piece> piece;
-		boost::shared_ptr<Image> image;
-		dcpomatic::Rect<double> rect;
-		DCPTime from;
-		DCPTime to;
+		boost::shared_ptr<DecodedSubtitle> subtitle;
 	} _in_subtitle;
 
 	struct {
-		boost::shared_ptr<Image> image;
 		Position<int> position;
-		DCPTime from;
-		DCPTime to;
+		boost::shared_ptr<DecodedSubtitle> subtitle;
 	} _out_subtitle;
 
 #ifdef DCPOMATIC_DEBUG
@@ -174,7 +159,12 @@ private:
 
 	bool _last_emit_was_black;
 
-	IncomingVideo _last_incoming_video;
+	struct {
+		boost::weak_ptr<Piece> weak_piece;
+		boost::shared_ptr<DecodedVideo> video;
+	} _last_incoming_video;
+
+	bool _just_did_inaccurate_seek;
 
 	boost::signals2::scoped_connection _playlist_changed_connection;
 	boost::signals2::scoped_connection _playlist_content_changed_connection;
diff --git a/src/lib/resampler.cc b/src/lib/resampler.cc
index d897bf562..00121384d 100644
--- a/src/lib/resampler.cc
+++ b/src/lib/resampler.cc
@@ -64,11 +64,9 @@ Resampler::~Resampler ()
 	swr_free (&_swr_context);
 }
 
-pair<shared_ptr<const AudioBuffers>, AudioContent::Frame>
-Resampler::run (shared_ptr<const AudioBuffers> in, AudioContent::Frame frame)
+shared_ptr<const AudioBuffers>
+Resampler::run (shared_ptr<const AudioBuffers> in)
 {
-	AudioContent::Frame const resamp_time = swr_next_pts (_swr_context, frame * _out_rate) / _in_rate;
-		
 	/* Compute the resampled frames count and add 32 for luck */
 	int const max_resampled_frames = ceil ((double) in->frames() * _out_rate / _in_rate) + 32;
 	shared_ptr<AudioBuffers> resampled (new AudioBuffers (_channels, max_resampled_frames));
@@ -84,7 +82,7 @@ Resampler::run (shared_ptr<const AudioBuffers> in, AudioContent::Frame frame)
 	}
 	
 	resampled->set_frames (resampled_frames);
-	return make_pair (resampled, resamp_time);
+	return resampled;
 }	
 
 shared_ptr<const AudioBuffers>
diff --git a/src/lib/resampler.h b/src/lib/resampler.h
index 69ec83ba9..4ee11a7f0 100644
--- a/src/lib/resampler.h
+++ b/src/lib/resampler.h
@@ -33,7 +33,7 @@ public:
 	Resampler (int, int, int);
 	~Resampler ();
 
-	std::pair<boost::shared_ptr<const AudioBuffers>, AudioContent::Frame> run (boost::shared_ptr<const AudioBuffers>, AudioContent::Frame);
+	boost::shared_ptr<const AudioBuffers> run (boost::shared_ptr<const AudioBuffers>);
 	boost::shared_ptr<const AudioBuffers> flush ();
 
 private:	
diff --git a/src/lib/sndfile_decoder.cc b/src/lib/sndfile_decoder.cc
index b5a7f139b..3af683c57 100644
--- a/src/lib/sndfile_decoder.cc
+++ b/src/lib/sndfile_decoder.cc
@@ -55,9 +55,13 @@ SndfileDecoder::~SndfileDecoder ()
 	delete[] _deinterleave_buffer;
 }
 
-void
+bool
 SndfileDecoder::pass ()
 {
+	if (_remaining == 0) {
+		return true;
+	}
+	
 	/* Do things in half second blocks as I think there may be limits
 	   to what FFmpeg (and in particular the resampler) can cope with.
 	*/
@@ -93,6 +97,8 @@ SndfileDecoder::pass ()
 	audio (data, _done);
 	_done += this_time;
 	_remaining -= this_time;
+
+	return true;
 }
 
 int
@@ -113,14 +119,10 @@ SndfileDecoder::audio_frame_rate () const
 	return _info.samplerate;
 }
 
-bool
-SndfileDecoder::done () const
-{
-	return _audio_position >= _sndfile_content->audio_length ();
-}
-
 void
-SndfileDecoder::seek (DCPTime t, bool accurate)
+SndfileDecoder::seek (ContentTime t, bool accurate)
 {
+	Decoder::seek (t, accurate);
+	
 	/* XXX */
 }
diff --git a/src/lib/sndfile_decoder.h b/src/lib/sndfile_decoder.h
index 470cab956..63f2f7dc4 100644
--- a/src/lib/sndfile_decoder.h
+++ b/src/lib/sndfile_decoder.h
@@ -29,15 +29,18 @@ public:
 	SndfileDecoder (boost::shared_ptr<const Film>, boost::shared_ptr<const SndfileContent>);
 	~SndfileDecoder ();
 
-	void pass ();
-	void seek (DCPTime, bool);
-	bool done () const;
+	void seek (ContentTime, bool);
 
 	int audio_channels () const;
 	AudioContent::Frame audio_length () const;
 	int audio_frame_rate () const;
 
 private:
+	bool has_audio () const {
+		return true;
+	}
+	bool pass ();
+	
 	boost::shared_ptr<const SndfileContent> _sndfile_content;
 	SNDFILE* _sndfile;
 	SF_INFO _info;
diff --git a/src/lib/subtitle_decoder.cc b/src/lib/subtitle_decoder.cc
index 8dbc01dc2..389e4b13a 100644
--- a/src/lib/subtitle_decoder.cc
+++ b/src/lib/subtitle_decoder.cc
@@ -21,6 +21,7 @@
 #include "subtitle_decoder.h"
 
 using boost::shared_ptr;
+using boost::optional;
 
 SubtitleDecoder::SubtitleDecoder (shared_ptr<const Film> f)
 	: Decoder (f)
@@ -35,5 +36,5 @@ SubtitleDecoder::SubtitleDecoder (shared_ptr<const Film> f)
 void
 SubtitleDecoder::subtitle (shared_ptr<Image> image, dcpomatic::Rect<double> rect, DCPTime from, DCPTime to)
 {
-	Subtitle (image, rect, from, to);
+	_pending.push_back (shared_ptr<DecodedSubtitle> (new DecodedSubtitle (image, rect, from, to)));
 }
diff --git a/src/lib/subtitle_decoder.h b/src/lib/subtitle_decoder.h
index 8a2a0c1b2..4836e31fa 100644
--- a/src/lib/subtitle_decoder.h
+++ b/src/lib/subtitle_decoder.h
@@ -21,6 +21,7 @@
 #include "decoder.h"
 #include "rect.h"
 #include "types.h"
+#include "decoded.h"
 
 class Film;
 class DCPTimedSubtitle;
@@ -31,8 +32,6 @@ class SubtitleDecoder : public virtual Decoder
 public:
 	SubtitleDecoder (boost::shared_ptr<const Film>);
 
-	boost::signals2::signal<void (boost::shared_ptr<Image>, dcpomatic::Rect<double>, DCPTime, DCPTime)> Subtitle;
-
 protected:
 	void subtitle (boost::shared_ptr<Image>, dcpomatic::Rect<double>, DCPTime, DCPTime);
 };
diff --git a/src/lib/video_decoder.cc b/src/lib/video_decoder.cc
index 72caf72e9..3a8891111 100644
--- a/src/lib/video_decoder.cc
+++ b/src/lib/video_decoder.cc
@@ -24,6 +24,7 @@
 
 using std::cout;
 using boost::shared_ptr;
+using boost::optional;
 
 VideoDecoder::VideoDecoder (shared_ptr<const Film> f, shared_ptr<const VideoContent> c)
 	: Decoder (f)
@@ -32,20 +33,20 @@ VideoDecoder::VideoDecoder (shared_ptr<const Film> f, shared_ptr<const VideoCont
 
 }
 
+/** Called by subclasses when they have a video frame ready */
 void
 VideoDecoder::video (shared_ptr<const Image> image, bool same, ContentTime time)
 {
 	switch (_video_content->video_frame_type ()) {
 	case VIDEO_FRAME_TYPE_2D:
-		Video (image, EYES_BOTH, same, time);
+		_pending.push_back (shared_ptr<DecodedVideo> (new DecodedVideo (image, EYES_BOTH, same, time)));
 		break;
 	case VIDEO_FRAME_TYPE_3D_LEFT_RIGHT:
 	{
 		int const half = image->size().width / 2;
-		Video (image->crop (Crop (0, half, 0, 0), true), EYES_LEFT, same, time);
-		Video (image->crop (Crop (half, 0, 0, 0), true), EYES_RIGHT, same, time);
+		_pending.push_back (shared_ptr<DecodedVideo> (new DecodedVideo (image->crop (Crop (0, half, 0, 0), true), EYES_LEFT, same, time)));
+		_pending.push_back (shared_ptr<DecodedVideo> (new DecodedVideo (image->crop (Crop (half, 0, 0, 0), true), EYES_RIGHT, same, time)));
 		break;
 	}
 	}
 }
-
diff --git a/src/lib/video_decoder.h b/src/lib/video_decoder.h
index 6e9060dbd..d8c362354 100644
--- a/src/lib/video_decoder.h
+++ b/src/lib/video_decoder.h
@@ -25,6 +25,7 @@
 #include "decoder.h"
 #include "video_content.h"
 #include "util.h"
+#include "decoded.h"
 
 class VideoContent;
 class Image;
@@ -34,14 +35,10 @@ class VideoDecoder : public virtual Decoder
 public:
 	VideoDecoder (boost::shared_ptr<const Film>, boost::shared_ptr<const VideoContent>);
 
-	/** Emitted when a video frame is ready.
-	 *  First parameter is the video image.
-	 *  Second parameter is the eye(s) which should see this image.
-	 *  Third parameter is true if the image is the same as the last one that was emitted for this Eyes value.
-	 *  Fourth parameter is the time within our source.
-	 */
-	boost::signals2::signal<void (boost::shared_ptr<const Image>, Eyes, bool, ContentTime)> Video;
-	
+	boost::shared_ptr<const VideoContent> video_content () const {
+		return _video_content;
+	}
+
 protected:
 
 	void video (boost::shared_ptr<const Image>, bool, ContentTime);
diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index 14982e0d3..728098b93 100644
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@ -279,7 +279,7 @@ FilmEditor::make_content_panel ()
 		b->Add (_content_earlier, 1, wxEXPAND);
 		_content_later = new wxButton (_content_panel, wxID_DOWN);
 		b->Add (_content_later, 1, wxEXPAND);
-		_content_timeline = new wxButton (_content_panel, wxID_ANY, _("DCPTimeline..."));
+		_content_timeline = new wxButton (_content_panel, wxID_ANY, _("Timeline..."));
 		b->Add (_content_timeline, 1, wxEXPAND | wxLEFT | wxRIGHT);
 
 		s->Add (b, 0, wxALL, 4);
diff --git a/test/frame_rate_test.cc b/test/frame_rate_test.cc
index 7d3904e74..2135b3738 100644
--- a/test/frame_rate_test.cc
+++ b/test/frame_rate_test.cc
@@ -186,7 +186,7 @@ BOOST_AUTO_TEST_CASE (best_dcp_frame_rate_test_single)
 	BOOST_CHECK_EQUAL (frc.skip, false);
 	BOOST_CHECK_EQUAL (frc.repeat, 2);
 	BOOST_CHECK_EQUAL (frc.change_speed, true);
-	BOOST_CHECK_CLOSE (frc.speed_up, 2 * 14.99 / 24, 0.1);
+	BOOST_CHECK_CLOSE (frc.speed_up, 24 / (2 * 14.99), 0.1);
 
 	/* Check some conversions with limited DCP targets */
 
diff --git a/test/play_test.cc b/test/play_test.cc
index c9486d161..7beee6f43 100644
--- a/test/play_test.cc
+++ b/test/play_test.cc
@@ -106,8 +106,6 @@ BOOST_AUTO_TEST_CASE (play_test)
 
 	shared_ptr<Player> player = film->make_player ();
 	PlayerWrapper wrap (player);
-	/* Seek and audio don't get on at the moment */
-	player->disable_audio ();
 
 	for (int i = 0; i < 32; ++i) {
 		optional<Video> v = wrap.get_video ();
@@ -119,10 +117,10 @@ BOOST_AUTO_TEST_CASE (play_test)
 		}
 	}
 
-	player->seek (10 * TIME_HZ / 25, true);
+	player->seek (6 * TIME_HZ / 25, true);
 	optional<Video> v = wrap.get_video ();
 	BOOST_CHECK (v);
-	BOOST_CHECK_EQUAL (v.get().time, 10 * TIME_HZ / 25);
+	BOOST_CHECK_EQUAL (v.get().time, 6 * TIME_HZ / 25);
 }
 
 #endif
diff --git a/test/resampler_test.cc b/test/resampler_test.cc
index 1ef69b0c2..5bee3603b 100644
--- a/test/resampler_test.cc
+++ b/test/resampler_test.cc
@@ -34,13 +34,14 @@ resampler_test_one (int from, int to)
 
 	/* 3 hours */
 	int64_t const N = from * 60 * 60 * 3;
+
+	/* XXX: no longer checks anything */
 	
 	for (int64_t i = 0; i < N; i += 1000) {
 		shared_ptr<AudioBuffers> a (new AudioBuffers (1, 1000));
 		a->make_silent ();
-		pair<shared_ptr<const AudioBuffers>, AudioContent::Frame> r = resamp.run (a, i);
-		BOOST_CHECK_EQUAL (r.second, total_out);
-		total_out += r.first->frames ();
+		shared_ptr<const AudioBuffers> r = resamp.run (a);
+		total_out += r->frames ();
 	}
 }	
 		
-- 
cgit v1.2.3


From 7d67f4a38bf7de1b901facf5390a730d307de671 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Sat, 21 Dec 2013 18:44:52 +0000
Subject: Add some more tests; improve seeking.

---
 src/lib/ffmpeg_decoder.cc | 27 +++++++++-------------
 src/lib/ffmpeg_decoder.h  |  4 ++--
 src/lib/player.cc         | 24 ++++++++++----------
 test/ffmpeg_seek_test.cc  | 13 +++++++----
 test/repeat_frame_test.cc | 51 +++++++++++++++++++++++++++++++++++++++++
 test/seek_zero_test.cc    | 58 +++++++++++++++++++++++++++++++++++++++++++++++
 test/skip_frame_test.cc   | 52 ++++++++++++++++++++++++++++++++++++++++++
 test/wscript              |  2 ++
 8 files changed, 197 insertions(+), 34 deletions(-)
 create mode 100644 test/repeat_frame_test.cc
 create mode 100644 test/seek_zero_test.cc
 create mode 100644 test/skip_frame_test.cc

(limited to 'src/lib/ffmpeg_decoder.h')

diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc
index 1cf9bd92d..80c3d9906 100644
--- a/src/lib/ffmpeg_decoder.cc
+++ b/src/lib/ffmpeg_decoder.cc
@@ -296,11 +296,11 @@ FFmpegDecoder::bytes_per_audio_sample () const
 }
 
 int
-FFmpegDecoder::minimal_run (boost::function<bool (ContentTime, ContentTime, int)> finished)
+FFmpegDecoder::minimal_run (boost::function<bool (optional<ContentTime>, optional<ContentTime>, int)> finished)
 {
 	int frames_read = 0;
-	ContentTime last_video = 0;
-	ContentTime last_audio = 0;
+	optional<ContentTime> last_video;
+	optional<ContentTime> last_audio;
 
 	while (!finished (last_video, last_audio, frames_read)) {
 		int r = av_read_frame (_format_context, &_packet);
@@ -353,9 +353,9 @@ FFmpegDecoder::minimal_run (boost::function<bool (ContentTime, ContentTime, int)
 }
 
 bool
-FFmpegDecoder::seek_overrun_finished (ContentTime seek, ContentTime last_video, ContentTime last_audio) const
+FFmpegDecoder::seek_overrun_finished (ContentTime seek, optional<ContentTime> last_video, optional<ContentTime> last_audio) const
 {
-	return last_video >= seek || last_audio >= seek;
+	return (last_video && last_video.get() >= seek) || (last_audio && last_audio.get() >= seek);
 }
 
 bool
@@ -369,16 +369,11 @@ FFmpegDecoder::seek_and_flush (ContentTime t)
 {
 	int64_t const initial_v = ((double (t) / TIME_HZ) - _video_pts_offset) /
 		av_q2d (_format_context->streams[_video_stream]->time_base);
+	
+	int64_t const initial_a = ((double (t) / TIME_HZ) - _audio_pts_offset) /
+		av_q2d (_ffmpeg_content->audio_stream()->stream(_format_context)->time_base);
 
-	av_seek_frame (_format_context, _video_stream, initial_v, AVSEEK_FLAG_BACKWARD);
-
-	shared_ptr<FFmpegAudioStream> as = _ffmpeg_content->audio_stream ();
-	if (as) {
-		int64_t initial_a = ((double (t) / TIME_HZ) - _audio_pts_offset) /
-			av_q2d (as->stream(_format_context)->time_base);
-
-		av_seek_frame (_format_context, as->index (_format_context), initial_a, AVSEEK_FLAG_BACKWARD);
-	}
+	av_seek_frame (_format_context, _video_stream, min (initial_v, initial_a), AVSEEK_FLAG_BACKWARD);
 
 	avcodec_flush_buffers (video_codec_context());
 	if (audio_codec_context ()) {
@@ -409,8 +404,8 @@ FFmpegDecoder::seek (ContentTime time, bool accurate)
 
 	seek_and_flush (initial_seek);
 
-	if (time == 0 || !accurate) {
-		/* We're already there, or we're as close as we need to be */
+	if (!accurate) {
+		/* That'll do */
 		return;
 	}
 
diff --git a/src/lib/ffmpeg_decoder.h b/src/lib/ffmpeg_decoder.h
index e50b248cf..55b624bd6 100644
--- a/src/lib/ffmpeg_decoder.h
+++ b/src/lib/ffmpeg_decoder.h
@@ -71,9 +71,9 @@ private:
 	void maybe_add_subtitle ();
 	boost::shared_ptr<AudioBuffers> deinterleave_audio (uint8_t** data, int size);
 
-	bool seek_overrun_finished (ContentTime, ContentTime, ContentTime) const;
+	bool seek_overrun_finished (ContentTime, boost::optional<ContentTime>, boost::optional<ContentTime>) const;
 	bool seek_final_finished (int, int) const;
-	int minimal_run (boost::function<bool (ContentTime, ContentTime, int)>);
+	int minimal_run (boost::function<bool (boost::optional<ContentTime>, boost::optional<ContentTime>, int)>);
 	void seek_and_flush (int64_t);
 
 	AVCodecContext* _subtitle_codec_context; ///< may be 0 if there is no subtitle
diff --git a/src/lib/player.cc b/src/lib/player.cc
index daefd6db0..17b44cdb8 100644
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -142,7 +142,8 @@ Player::pass ()
 	shared_ptr<DecodedSubtitle> ds = dynamic_pointer_cast<DecodedSubtitle> (earliest_decoded);
 
 	if (dv && _video) {
-		if (!_just_did_inaccurate_seek && earliest_time > _video_position) {
+		DCPTime const frame = TIME_HZ / _film->video_frame_rate ();
+		if (!_just_did_inaccurate_seek && earliest_time > (_video_position + frame)) {
 
 			/* See if we're inside some video content */
 			list<shared_ptr<Piece> >::iterator i = _pieces.begin();
@@ -157,10 +158,19 @@ Player::pass ()
 				_last_incoming_video.video->dcp_time = _video_position;
 				emit_video (_last_incoming_video.weak_piece, _last_incoming_video.video);
 			}
+
 		} else {
-			emit_video (earliest_piece, dv);
+			if (
+				dv->dcp_time >= _video_position &&
+				!earliest_piece->content->trimmed (dv->dcp_time - earliest_piece->content->position ())
+				) {
+				
+				emit_video (earliest_piece, dv);
+			}
+		
 			earliest_piece->decoder->get ();
 		}
+
 	} else if (da && _audio) {
 		if (!_just_did_inaccurate_seek && earliest_time > _audio_position) {
 			emit_silence (earliest_time - _audio_position);
@@ -196,16 +206,6 @@ Player::emit_video (weak_ptr<Piece> weak_piece, shared_ptr<DecodedVideo> video)
 	assert (content);
 
 	FrameRateChange frc (content->video_frame_rate(), _film->video_frame_rate());
-#if 0
-	XXX
-	if (frc.skip && (frame % 2) == 1) {
-		return;
-	}
-#endif	
-
-	if (content->trimmed (video->dcp_time - content->position ())) {
-		return;
-	}
 
 	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);
diff --git a/test/ffmpeg_seek_test.cc b/test/ffmpeg_seek_test.cc
index e66a1918c..3c175f08c 100644
--- a/test/ffmpeg_seek_test.cc
+++ b/test/ffmpeg_seek_test.cc
@@ -17,6 +17,12 @@
 
 */
 
+/** @file  test/ffmpeg_seek_test.cc
+ *  @brief Test seek using Player with an FFmpegDecoder; note that the player
+ *  can hide problems with FFmpegDecoder seeking as it will skip frames / insert
+ *  black as it sees fit.
+ */
+
 #include <boost/test/unit_test.hpp>
 #include "lib/player.h"
 #include "lib/ffmpeg_decoder.h"
@@ -88,10 +94,11 @@ check (shared_ptr<Player> p, DCPTime t)
 	BOOST_CHECK ((first_audio.get() % (TIME_HZ / film->audio_frame_rate())) == 0);
 }
 
+/* Test basic seeking */
 BOOST_AUTO_TEST_CASE (ffmpeg_seek_test)
 {
-	film = new_test_film ("ffmpeg_audio_test");
-	film->set_name ("ffmpeg_audio_test");
+	film = new_test_film ("ffmpeg_seek_test");
+	film->set_name ("ffmpeg_seek_test");
 	film->set_container (Ratio::from_id ("185"));
 	shared_ptr<FFmpegContent> c (new FFmpegContent (film, "test/data/staircase.mov"));
 	c->set_ratio (Ratio::from_id ("185"));
@@ -108,5 +115,3 @@ BOOST_AUTO_TEST_CASE (ffmpeg_seek_test)
 	check (player, 0.2 * TIME_HZ);
 	check (player, 0.3 * TIME_HZ);
 }
-
-
diff --git a/test/repeat_frame_test.cc b/test/repeat_frame_test.cc
new file mode 100644
index 000000000..52888e2cf
--- /dev/null
+++ b/test/repeat_frame_test.cc
@@ -0,0 +1,51 @@
+/*
+    Copyright (C) 2013 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
+    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,
+    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.
+
+*/
+
+#include <boost/test/unit_test.hpp>
+#include "test.h"
+#include "lib/film.h"
+#include "lib/ratio.h"
+#include "lib/ffmpeg_content.h"
+#include "lib/dcp_content_type.h"
+
+using boost::shared_ptr;
+
+/* Test the repeat of frames by the player when putting a 24fps
+   source into a 48fps DCP.
+*/
+BOOST_AUTO_TEST_CASE (repeat_frame_test)
+{
+	shared_ptr<Film> film = new_test_film ("repeat_frame_test");
+	film->set_name ("repeat_frame_test");
+	film->set_container (Ratio::from_id ("185"));
+	film->set_dcp_content_type (DCPContentType::from_pretty_name ("Test"));
+	shared_ptr<FFmpegContent> c (new FFmpegContent (film, "test/data/red_24.mp4"));
+	c->set_ratio (Ratio::from_id ("185"));
+	film->examine_and_add_content (c);
+
+	wait_for_jobs ();
+
+	film->set_video_frame_rate (48);
+	film->make_dcp ();
+	wait_for_jobs ();
+
+	std::cout << film->dir (film->dcp_name ()) << "\n";
+	check_dcp ("test/data/repeat_frame_test", film->dir (film->dcp_name ()));
+}
+
diff --git a/test/seek_zero_test.cc b/test/seek_zero_test.cc
new file mode 100644
index 000000000..d298a772b
--- /dev/null
+++ b/test/seek_zero_test.cc
@@ -0,0 +1,58 @@
+/*
+    Copyright (C) 2013 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
+    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,
+    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.
+
+*/
+
+/** @file  test/seek_zero_test.cc
+ *  @brief Test seek to zero with a raw FFmpegDecoder (without the player
+ *  confusing things as it might in ffmpeg_seek_test).
+ */
+
+#include <boost/test/unit_test.hpp>
+#include "lib/film.h"
+#include "lib/ffmpeg_content.h"
+#include "lib/ratio.h"
+#include "lib/dcp_content_type.h"
+#include "lib/ffmpeg_decoder.h"
+#include "test.h"
+
+using std::cout;
+using boost::shared_ptr;
+
+BOOST_AUTO_TEST_CASE (seek_zero_test)
+{
+	shared_ptr<Film> film = new_test_film ("seek_zero_test");
+	film->set_name ("seek_zero_test");
+	film->set_container (Ratio::from_id ("185"));
+	film->set_dcp_content_type (DCPContentType::from_pretty_name ("Test"));
+	shared_ptr<FFmpegContent> content (new FFmpegContent (film, "test/data/count300bd48.m2ts"));
+	content->set_ratio (Ratio::from_id ("185"));
+	film->examine_and_add_content (content);
+	wait_for_jobs ();
+
+	FFmpegDecoder decoder (film, content, true, false);
+	shared_ptr<Decoded> a = decoder.get ();
+	cout << a->content_time << "\n";
+	decoder.seek (0, true);
+	shared_ptr<Decoded> b = decoder.get ();
+	cout << b->content_time << "\n";
+
+	/* a will be after no seek, and b after a seek to zero, which should
+	   have the same effect.
+	*/
+	BOOST_CHECK_EQUAL (a->content_time, b->content_time);
+}
diff --git a/test/skip_frame_test.cc b/test/skip_frame_test.cc
new file mode 100644
index 000000000..442047594
--- /dev/null
+++ b/test/skip_frame_test.cc
@@ -0,0 +1,52 @@
+/*
+    Copyright (C) 2013 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
+    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,
+    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.
+
+*/
+
+#include <boost/test/unit_test.hpp>
+#include "test.h"
+#include "lib/film.h"
+#include "lib/ratio.h"
+#include "lib/ffmpeg_content.h"
+#include "lib/dcp_content_type.h"
+
+using boost::shared_ptr;
+
+/* Test the skip of frames by the player when putting a 48fps
+   source into a 24fps DCP.
+*/
+BOOST_AUTO_TEST_CASE (skip_frame_test)
+{
+	shared_ptr<Film> film = new_test_film ("skip_frame_test");
+	film->set_name ("skip_frame_test");
+	film->set_container (Ratio::from_id ("185"));
+	film->set_dcp_content_type (DCPContentType::from_pretty_name ("Test"));
+	shared_ptr<FFmpegContent> c (new FFmpegContent (film, "test/data/count300bd48.m2ts"));
+	c->set_ratio (Ratio::from_id ("185"));
+	film->examine_and_add_content (c);
+
+	wait_for_jobs ();
+	film->write_metadata ();
+
+	film->set_video_frame_rate (24);
+	film->make_dcp ();
+	wait_for_jobs ();
+
+	std::cout << film->dir (film->dcp_name ()) << "\n";
+	check_dcp ("test/data/skip_frame_test", film->dir (film->dcp_name ()));
+}
+
diff --git a/test/wscript b/test/wscript
index 1a924ba0d..3c7484fcd 100644
--- a/test/wscript
+++ b/test/wscript
@@ -39,7 +39,9 @@ def build(bld):
                  repeat_frame_test.cc
                  resampler_test.cc
                  scaling_test.cc
+                 seek_zero_test.cc
                  silence_padding_test.cc
+                 skip_frame_test.cc
                  stream_test.cc
                  test.cc
                  threed_test.cc
-- 
cgit v1.2.3


From 821b556975c44bcb2c8607fc26462b7b79db2fe6 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Fri, 3 Jan 2014 00:47:32 +0000
Subject: Various fix-ups.

---
 src/lib/audio_decoder.cc   | 27 +++++++++++++++++----
 src/lib/audio_decoder.h    |  8 ++++---
 src/lib/decoded.h          | 52 +++++++++++++++++++++-------------------
 src/lib/decoder.cc         |  2 +-
 src/lib/ffmpeg_decoder.cc  | 60 +++++++++++++++++++++++++---------------------
 src/lib/ffmpeg_decoder.h   |  4 ++--
 src/lib/image_decoder.cc   |  4 ++--
 src/lib/image_decoder.h    |  2 +-
 src/lib/player.cc          |  4 ++--
 src/lib/sndfile_decoder.cc |  6 ++---
 src/lib/sndfile_decoder.h  |  6 ++---
 src/lib/video_decoder.cc   | 14 ++++++-----
 src/lib/video_decoder.h    |  2 +-
 test/ffmpeg_pts_offset.cc  | 15 ++++--------
 test/seek_zero_test.cc     |  9 ++++---
 15 files changed, 118 insertions(+), 97 deletions(-)

(limited to 'src/lib/ffmpeg_decoder.h')

diff --git a/src/lib/audio_decoder.cc b/src/lib/audio_decoder.cc
index aecf39644..d85bfaee2 100644
--- a/src/lib/audio_decoder.cc
+++ b/src/lib/audio_decoder.cc
@@ -22,6 +22,8 @@
 #include "exceptions.h"
 #include "log.h"
 #include "resampler.h"
+#include "util.h"
+#include "film.h"
 
 #include "i18n.h"
 
@@ -35,22 +37,26 @@ using boost::shared_ptr;
 AudioDecoder::AudioDecoder (shared_ptr<const Film> film, shared_ptr<const AudioContent> content)
 	: Decoder (film)
 	, _audio_content (content)
-	, _last_audio (0)
+	, _audio_position (0)
 {
 	if (content->output_audio_frame_rate() != content->content_audio_frame_rate() && content->audio_channels ()) {
 		_resampler.reset (new Resampler (content->content_audio_frame_rate(), content->output_audio_frame_rate(), content->audio_channels ()));
 	}
 }
 
+/** Audio timestamping is made hard by many factors, but the final nail in the coffin is resampling.
+ *  We have to assume that we are feeding continuous data into the resampler, and so we get continuous
+ *  data out.  Hence we do the timestamping here, post-resampler, just by counting samples.
+ */
 void
-AudioDecoder::audio (shared_ptr<const AudioBuffers> data, ContentTime time)
+AudioDecoder::audio (shared_ptr<const AudioBuffers> data)
 {
 	if (_resampler) {
 		data = _resampler->run (data);
 	}
 	
-	_pending.push_back (shared_ptr<DecodedAudio> (new DecodedAudio (data, time)));
-	_last_audio = time + (data->frames() * TIME_HZ / _audio_content->output_audio_frame_rate());
+	_pending.push_back (shared_ptr<DecodedAudio> (new DecodedAudio (data, _audio_position)));
+	_audio_position += data->frames ();
 }
 
 void
@@ -62,6 +68,17 @@ AudioDecoder::flush ()
 
 	shared_ptr<const AudioBuffers> b = _resampler->flush ();
 	if (b) {
-		audio (b, _last_audio);
+		_pending.push_back (shared_ptr<DecodedAudio> (new DecodedAudio (b, _audio_position)));
+		_audio_position += b->frames ();
 	}
 }
+
+void
+AudioDecoder::seek (ContentTime t, bool)
+{
+	shared_ptr<const Film> film = _film.lock ();
+	assert (film);
+	
+	FrameRateChange frc = film->active_frame_rate_change (_audio_content->position ());
+	_audio_position = (t + first_audio()) / frc.speed_up;
+}
diff --git a/src/lib/audio_decoder.h b/src/lib/audio_decoder.h
index a295df0cc..12f8505f6 100644
--- a/src/lib/audio_decoder.h
+++ b/src/lib/audio_decoder.h
@@ -44,15 +44,17 @@ public:
 		return _audio_content;
 	}
 
+	void seek (ContentTime time, bool accurate);
+	
 protected:
 
-	void audio (boost::shared_ptr<const AudioBuffers>, ContentTime);
+	virtual ContentTime first_audio () const = 0;
+	void audio (boost::shared_ptr<const AudioBuffers>);
 	void flush ();
 
 	boost::shared_ptr<const AudioContent> _audio_content;
 	boost::shared_ptr<Resampler> _resampler;
-	/* End time of last audio that we wrote to _pending; only used for flushing the resampler */
-	ContentTime _last_audio;
+	AudioFrame _audio_position;
 };
 
 #endif
diff --git a/src/lib/decoded.h b/src/lib/decoded.h
index 1de2ff79e..ff32e43f2 100644
--- a/src/lib/decoded.h
+++ b/src/lib/decoded.h
@@ -22,6 +22,7 @@
 
 #include "types.h"
 #include "rect.h"
+#include "util.h"
 
 class Image;
 
@@ -29,20 +30,13 @@ class Decoded
 {
 public:
 	Decoded ()
-		: content_time (0)
-		, dcp_time (0)
-	{}
-
-	Decoded (DCPTime ct)
-		: content_time (ct)
-		, dcp_time (0)
+		: dcp_time (0)
 	{}
 
 	virtual ~Decoded () {}
 
-	virtual void set_dcp_times (float speed_up, DCPTime offset) = 0;
+	virtual void set_dcp_times (VideoFrame, AudioFrame, FrameRateChange, DCPTime) = 0;
 
-	ContentTime content_time;
 	DCPTime dcp_time;
 };
 
@@ -53,62 +47,70 @@ public:
 	DecodedVideo ()
 		: eyes (EYES_BOTH)
 		, same (false)
+		, frame (0)
 	{}
 
-	DecodedVideo (boost::shared_ptr<const Image> im, Eyes e, bool s, ContentTime ct)
-		: Decoded (ct)
-		, image (im)
+	DecodedVideo (boost::shared_ptr<const Image> im, Eyes e, bool s, VideoFrame f)
+		: image (im)
 		, eyes (e)
 		, same (s)
+		, frame (f)
 	{}
 
-	void set_dcp_times (float speed_up, DCPTime offset) {
-		dcp_time = rint (content_time / speed_up) + offset;
+	void set_dcp_times (VideoFrame video_frame_rate, AudioFrame, FrameRateChange frc, DCPTime offset)
+	{
+		dcp_time = frame * TIME_HZ * frc.factor() / video_frame_rate + offset;
 	}
 	
 	boost::shared_ptr<const Image> image;
 	Eyes eyes;
 	bool same;
+	VideoFrame frame;
 };
 
 class DecodedAudio : public Decoded
 {
 public:
-	DecodedAudio (boost::shared_ptr<const AudioBuffers> d, ContentTime ct)
-		: Decoded (ct)
-		, data (d)
+	DecodedAudio (boost::shared_ptr<const AudioBuffers> d, AudioFrame f)
+		: data (d)
+		, frame (f)
 	{}
 
-	void set_dcp_times (float speed_up, DCPTime offset) {
-		dcp_time = rint (content_time / speed_up) + offset;
+	void set_dcp_times (VideoFrame, AudioFrame audio_frame_rate, FrameRateChange, DCPTime offset)
+	{
+		dcp_time = frame * TIME_HZ / audio_frame_rate + offset;
 	}
 	
 	boost::shared_ptr<const AudioBuffers> data;
+	AudioFrame frame;
 };
 
 class DecodedSubtitle : public Decoded
 {
 public:
 	DecodedSubtitle ()
-		: content_time_to (0)
+		: content_time (0)
+		, content_time_to (0)
 		, dcp_time_to (0)
 	{}
 
 	DecodedSubtitle (boost::shared_ptr<Image> im, dcpomatic::Rect<double> r, ContentTime f, ContentTime t)
-		: Decoded (f)
-		, image (im)
+		: image (im)
 		, rect (r)
+		, content_time (f)
 		, content_time_to (t)
 		, dcp_time_to (0)
 	{}
 
-	void set_dcp_times (float speed_up, DCPTime offset) {
-		dcp_time = rint (content_time / speed_up) + offset;
-		dcp_time_to = rint (content_time_to / speed_up) + offset;
+	void set_dcp_times (VideoFrame, AudioFrame, FrameRateChange frc, DCPTime offset)
+	{
+		dcp_time = rint (content_time / frc.speed_up) + offset;
+		dcp_time_to = rint (content_time_to / frc.speed_up) + offset;
 	}
 
 	boost::shared_ptr<Image> image;
 	dcpomatic::Rect<double> rect;
+	ContentTime content_time;
 	ContentTime content_time_to;
 	DCPTime dcp_time_to;
 };
diff --git a/src/lib/decoder.cc b/src/lib/decoder.cc
index 4e136d619..30244b40b 100644
--- a/src/lib/decoder.cc
+++ b/src/lib/decoder.cc
@@ -47,7 +47,7 @@ Decoder::peek ()
 		_done = pass ();
 	}
 
-	if (_done) {
+	if (_done && _pending.empty ()) {
 		return shared_ptr<Decoded> ();
 	}
 
diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc
index 298284512..25fe655be 100644
--- a/src/lib/ffmpeg_decoder.cc
+++ b/src/lib/ffmpeg_decoder.cc
@@ -68,8 +68,7 @@ FFmpegDecoder::FFmpegDecoder (shared_ptr<const Film> f, shared_ptr<const FFmpegC
 	, _subtitle_codec (0)
 	, _decode_video (video)
 	, _decode_audio (audio)
-	, _video_pts_offset (0)
-	, _audio_pts_offset (0)
+	, _pts_offset (0)
 {
 	setup_subtitle ();
 
@@ -82,9 +81,7 @@ FFmpegDecoder::FFmpegDecoder (shared_ptr<const Film> f, shared_ptr<const FFmpegC
 	   Then we remove big initial gaps in PTS and we allow our
 	   insertion of black frames to work.
 
-	   We will do:
-	     audio_pts_to_use = audio_pts_from_ffmpeg + audio_pts_offset;
-	     video_pts_to_use = video_pts_from_ffmpeg + video_pts_offset;
+	   We will do pts_to_use = pts_from_ffmpeg + pts_offset;
 	*/
 
 	bool const have_video = video && c->first_video();
@@ -93,16 +90,16 @@ FFmpegDecoder::FFmpegDecoder (shared_ptr<const Film> f, shared_ptr<const FFmpegC
 	/* First, make one of them start at 0 */
 
 	if (have_audio && have_video) {
-		_video_pts_offset = _audio_pts_offset = - min (c->first_video().get(), c->audio_stream()->first_audio.get());
+		_pts_offset = - min (c->first_video().get(), c->audio_stream()->first_audio.get());
 	} else if (have_video) {
-		_video_pts_offset = - c->first_video().get();
+		_pts_offset = - c->first_video().get();
 	} else if (have_audio) {
-		_audio_pts_offset = - c->audio_stream()->first_audio.get();
+		_pts_offset = - c->audio_stream()->first_audio.get();
 	}
 
 	/* Now adjust both so that the video pts starts on a frame */
 	if (have_video && have_audio) {
-		double first_video = c->first_video().get() + _video_pts_offset;
+		double first_video = c->first_video().get() + _pts_offset;
 		double const old_first_video = first_video;
 		
 		/* Round the first video up to a frame boundary */
@@ -110,8 +107,7 @@ FFmpegDecoder::FFmpegDecoder (shared_ptr<const Film> f, shared_ptr<const FFmpegC
 			first_video = ceil (first_video * c->video_frame_rate()) / c->video_frame_rate ();
 		}
 
-		_video_pts_offset += first_video - old_first_video;
-		_audio_pts_offset += first_video - old_first_video;
+		_pts_offset += first_video - old_first_video;
 	}
 }
 
@@ -325,10 +321,10 @@ FFmpegDecoder::minimal_run (boost::function<bool (optional<ContentTime>, optiona
 			r = avcodec_decode_video2 (video_codec_context(), _frame, &finished, &_packet);
 			if (r >= 0 && finished) {
 				last_video = rint (
-					(av_frame_get_best_effort_timestamp (_frame) * time_base + _video_pts_offset) * TIME_HZ
+					(av_frame_get_best_effort_timestamp (_frame) * time_base + _pts_offset) * TIME_HZ
 					);
 			}
-				
+
 		} else if (_ffmpeg_content->audio_stream() && _packet.stream_index == _ffmpeg_content->audio_stream()->index (_format_context)) {
 			AVPacket copy_packet = _packet;
 			while (copy_packet.size > 0) {
@@ -337,7 +333,7 @@ FFmpegDecoder::minimal_run (boost::function<bool (optional<ContentTime>, optiona
 				r = avcodec_decode_audio4 (audio_codec_context(), _frame, &finished, &_packet);
 				if (r >= 0 && finished) {
 					last_audio = rint (
-						(av_frame_get_best_effort_timestamp (_frame) * time_base + _audio_pts_offset) *	TIME_HZ
+						(av_frame_get_best_effort_timestamp (_frame) * time_base + _pts_offset) * TIME_HZ
 						);
 				}
 					
@@ -367,18 +363,21 @@ FFmpegDecoder::seek_final_finished (int n, int done) const
 void
 FFmpegDecoder::seek_and_flush (ContentTime t)
 {
-	int64_t s = ((double (t) / TIME_HZ) - _video_pts_offset) /
+	int64_t s = ((double (t) / TIME_HZ) - _pts_offset) /
 		av_q2d (_format_context->streams[_video_stream]->time_base);
-	
+
 	if (_ffmpeg_content->audio_stream ()) {
 		s = min (
 			s, int64_t (
-				((double (t) / TIME_HZ) - _audio_pts_offset) /
+				((double (t) / TIME_HZ) - _pts_offset) /
 				av_q2d (_ffmpeg_content->audio_stream()->stream(_format_context)->time_base)
 				)
 			);
 	}
 
+	/* Ridiculous empirical hack */
+	s--;
+
 	av_seek_frame (_format_context, _video_stream, s, AVSEEK_FLAG_BACKWARD);
 
 	avcodec_flush_buffers (video_codec_context());
@@ -394,6 +393,7 @@ void
 FFmpegDecoder::seek (ContentTime time, bool accurate)
 {
 	Decoder::seek (time, accurate);
+	AudioDecoder::seek (time, accurate);
 	
 	/* If we are doing an accurate seek, our initial shot will be 200ms (200 being
 	   a number plucked from the air) earlier than we want to end up.  The loop below
@@ -405,7 +405,7 @@ FFmpegDecoder::seek (ContentTime time, bool accurate)
 	if (initial_seek < 0) {
 		initial_seek = 0;
 	}
-	
+
 	/* Initial seek time in the video stream's timebase */
 
 	seek_and_flush (initial_seek);
@@ -416,7 +416,7 @@ FFmpegDecoder::seek (ContentTime time, bool accurate)
 	}
 
 	int const N = minimal_run (boost::bind (&FFmpegDecoder::seek_overrun_finished, this, time, _1, _2));
-	
+
 	seek_and_flush (initial_seek);
 	if (N > 0) {
 		minimal_run (boost::bind (&FFmpegDecoder::seek_final_finished, this, N - 1, _3));
@@ -445,16 +445,11 @@ FFmpegDecoder::decode_audio_packet ()
 		}
 
 		if (frame_finished) {
-			ContentTime const t = rint (
-				(av_q2d (_format_context->streams[copy_packet.stream_index]->time_base)
-				 * av_frame_get_best_effort_timestamp(_frame) + _audio_pts_offset) * TIME_HZ
-				);
-
 			int const data_size = av_samples_get_buffer_size (
 				0, audio_codec_context()->channels, _frame->nb_samples, audio_sample_format (), 1
 				);
 			
-			audio (deinterleave_audio (_frame->data, data_size), t);
+			audio (deinterleave_audio (_frame->data, data_size));
 		}
 			
 		copy_packet.data += decode_result;
@@ -503,8 +498,9 @@ FFmpegDecoder::decode_video_packet ()
 		}
 		
 		if (i->second != AV_NOPTS_VALUE) {
-			ContentTime const t = rint ((i->second * av_q2d (_format_context->streams[_video_stream]->time_base) + _video_pts_offset) * TIME_HZ);
-			video (image, false, t);
+			double const pts = i->second * av_q2d (_format_context->streams[_video_stream]->time_base) + _pts_offset;
+			VideoFrame const f = rint (pts * _ffmpeg_content->video_frame_rate ());
+			video (image, false, f);
 		} else {
 			shared_ptr<const Film> film = _film.lock ();
 			assert (film);
@@ -607,3 +603,13 @@ FFmpegDecoder::decode_subtitle_packet ()
 	
 	avsubtitle_free (&sub);
 }
+
+ContentTime
+FFmpegDecoder::first_audio () const
+{
+	if (!_ffmpeg_content->audio_stream ()) {
+		return 0;
+	}
+
+	return _ffmpeg_content->audio_stream()->first_audio.get_value_or(0) + _pts_offset;
+}
diff --git a/src/lib/ffmpeg_decoder.h b/src/lib/ffmpeg_decoder.h
index 55b624bd6..680e39c39 100644
--- a/src/lib/ffmpeg_decoder.h
+++ b/src/lib/ffmpeg_decoder.h
@@ -58,6 +58,7 @@ private:
 
 	bool pass ();
 	void flush ();
+	ContentTime first_audio () const;
 
 	void setup_subtitle ();
 
@@ -85,6 +86,5 @@ private:
 	bool _decode_video;
 	bool _decode_audio;
 
-	double _video_pts_offset;
-	double _audio_pts_offset;
+	double _pts_offset;
 };
diff --git a/src/lib/image_decoder.cc b/src/lib/image_decoder.cc
index a5ca67e0d..204849ecf 100644
--- a/src/lib/image_decoder.cc
+++ b/src/lib/image_decoder.cc
@@ -49,7 +49,7 @@ ImageDecoder::pass ()
 	}
 
 	if (_image && _image_content->still ()) {
-		video (_image, true, _video_position * TIME_HZ / _video_content->video_frame_rate ());
+		video (_image, true, _video_position);
 		++_video_position;
 		return false;
 	}
@@ -82,7 +82,7 @@ ImageDecoder::pass ()
 
 	delete magick_image;
 
-	video (_image, false, _video_position * TIME_HZ / _video_content->video_frame_rate ());
+	video (_image, false, _video_position);
 	++_video_position;
 
 	return false;
diff --git a/src/lib/image_decoder.h b/src/lib/image_decoder.h
index f4d81dfb5..63b4c58e3 100644
--- a/src/lib/image_decoder.h
+++ b/src/lib/image_decoder.h
@@ -41,6 +41,6 @@ private:
 	
 	boost::shared_ptr<const ImageContent> _image_content;
 	boost::shared_ptr<Image> _image;
-	ContentTime _video_position;
+	VideoFrame _video_position;
 };
 
diff --git a/src/lib/player.cc b/src/lib/player.cc
index 4fe81d4b2..da7e7c147 100644
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -119,10 +119,10 @@ Player::pass ()
 				break;
 			}
 
-			dec->set_dcp_times ((*i)->frc.speed_up, offset);
+			dec->set_dcp_times (_film->video_frame_rate(), _film->audio_frame_rate(), (*i)->frc, offset);
 			DCPTime const t = dec->dcp_time - offset;
 			if (t >= (*i)->content->full_length() - (*i)->content->trim_end ()) {
-				/* In the end-trimmed part; decoder has nothing eles to give us */
+				/* In the end-trimmed part; decoder has nothing else to give us */
 				dec.reset ();
 				done = true;
 			} else if (t >= (*i)->content->trim_start ()) {
diff --git a/src/lib/sndfile_decoder.cc b/src/lib/sndfile_decoder.cc
index 5e3f3313b..1c651e614 100644
--- a/src/lib/sndfile_decoder.cc
+++ b/src/lib/sndfile_decoder.cc
@@ -45,7 +45,6 @@ SndfileDecoder::SndfileDecoder (shared_ptr<const Film> f, shared_ptr<const Sndfi
 		throw DecodeError (_("could not open audio file for reading"));
 	}
 
-	_done = 0;
 	_remaining = _info.frames;
 }
 
@@ -94,8 +93,7 @@ SndfileDecoder::pass ()
 	}
 		
 	data->set_frames (this_time);
-	audio (data, _done * TIME_HZ / audio_frame_rate ());
-	_done += this_time;
+	audio (data);
 	_remaining -= this_time;
 
 	return _remaining == 0;
@@ -123,7 +121,7 @@ void
 SndfileDecoder::seek (ContentTime t, bool accurate)
 {
 	Decoder::seek (t, accurate);
+	AudioDecoder::seek (t, accurate);
 
-	_done = t * audio_frame_rate() / TIME_HZ;
 	_remaining = _info.frames - _done;
 }
diff --git a/src/lib/sndfile_decoder.h b/src/lib/sndfile_decoder.h
index 9cbddc9f6..4ecea0846 100644
--- a/src/lib/sndfile_decoder.h
+++ b/src/lib/sndfile_decoder.h
@@ -36,15 +36,15 @@ public:
 	int audio_frame_rate () const;
 
 private:
-	bool has_audio () const {
-		return true;
+	ContentTime first_audio () const {
+		return 0;
 	}
+
 	bool pass ();
 	
 	boost::shared_ptr<const SndfileContent> _sndfile_content;
 	SNDFILE* _sndfile;
 	SF_INFO _info;
-	AudioFrame _done;
 	AudioFrame _remaining;
 	float* _deinterleave_buffer;
 };
diff --git a/src/lib/video_decoder.cc b/src/lib/video_decoder.cc
index 6a16557cd..a3b45716c 100644
--- a/src/lib/video_decoder.cc
+++ b/src/lib/video_decoder.cc
@@ -35,25 +35,27 @@ VideoDecoder::VideoDecoder (shared_ptr<const Film> f, shared_ptr<const VideoCont
 
 /** Called by subclasses when they have a video frame ready */
 void
-VideoDecoder::video (shared_ptr<const Image> image, bool same, ContentTime time)
+VideoDecoder::video (shared_ptr<const Image> image, bool same, VideoFrame frame)
 {
 	switch (_video_content->video_frame_type ()) {
 	case VIDEO_FRAME_TYPE_2D:
-		_pending.push_back (shared_ptr<DecodedVideo> (new DecodedVideo (image, EYES_BOTH, same, time)));
+		_pending.push_back (shared_ptr<DecodedVideo> (new DecodedVideo (image, EYES_BOTH, same, frame)));
 		break;
 	case VIDEO_FRAME_TYPE_3D_LEFT_RIGHT:
 	{
 		int const half = image->size().width / 2;
-		_pending.push_back (shared_ptr<DecodedVideo> (new DecodedVideo (image->crop (Crop (0, half, 0, 0), true), EYES_LEFT, same, time)));
-		_pending.push_back (shared_ptr<DecodedVideo> (new DecodedVideo (image->crop (Crop (half, 0, 0, 0), true), EYES_RIGHT, same, time)));
+		_pending.push_back (shared_ptr<DecodedVideo> (new DecodedVideo (image->crop (Crop (0, half, 0, 0), true), EYES_LEFT, same, frame)));
+		_pending.push_back (shared_ptr<DecodedVideo> (new DecodedVideo (image->crop (Crop (half, 0, 0, 0), true), EYES_RIGHT, same, frame)));
 		break;
 	}
 	case VIDEO_FRAME_TYPE_3D_TOP_BOTTOM:
 	{
 		int const half = image->size().height / 2;
-		_pending.push_back (shared_ptr<DecodedVideo> (new DecodedVideo (image->crop (Crop (0, 0, 0, half), true), EYES_LEFT, same, time)));
-		_pending.push_back (shared_ptr<DecodedVideo> (new DecodedVideo (image->crop (Crop (0, 0, half, 0), true), EYES_RIGHT, same, time)));
+		_pending.push_back (shared_ptr<DecodedVideo> (new DecodedVideo (image->crop (Crop (0, 0, 0, half), true), EYES_LEFT, same, frame)));
+		_pending.push_back (shared_ptr<DecodedVideo> (new DecodedVideo (image->crop (Crop (0, 0, half, 0), true), EYES_RIGHT, same, frame)));
 		break;
 	}
+	default:
+		assert (false);
 	}
 }
diff --git a/src/lib/video_decoder.h b/src/lib/video_decoder.h
index d8c362354..8947c2708 100644
--- a/src/lib/video_decoder.h
+++ b/src/lib/video_decoder.h
@@ -41,7 +41,7 @@ public:
 
 protected:
 
-	void video (boost::shared_ptr<const Image>, bool, ContentTime);
+	void video (boost::shared_ptr<const Image>, bool, VideoFrame);
 	boost::shared_ptr<const VideoContent> _video_content;
 };
 
diff --git a/test/ffmpeg_pts_offset.cc b/test/ffmpeg_pts_offset.cc
index 2090e517b..53303f154 100644
--- a/test/ffmpeg_pts_offset.cc
+++ b/test/ffmpeg_pts_offset.cc
@@ -37,8 +37,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_pts_offset_test)
 		content->_first_video = 0;
 		content->_audio_stream->first_audio = 0;
 		FFmpegDecoder decoder (film, content, true, true);
-		BOOST_CHECK_EQUAL (decoder._video_pts_offset, 0);
-		BOOST_CHECK_EQUAL (decoder._audio_pts_offset, 0);
+		BOOST_CHECK_EQUAL (decoder._pts_offset, 0);
 	}
 
 	{
@@ -46,8 +45,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_pts_offset_test)
 		content->_first_video = 600;
 		content->_audio_stream->first_audio = 600;
 		FFmpegDecoder decoder (film, content, true, true);
-		BOOST_CHECK_EQUAL (decoder._video_pts_offset, -600);
-		BOOST_CHECK_EQUAL (decoder._audio_pts_offset, -600);
+		BOOST_CHECK_EQUAL (decoder._pts_offset, -600);
 	}
 
 	{
@@ -55,8 +53,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_pts_offset_test)
 		content->_first_video = 1.0 / 24.0;
 		content->_audio_stream->first_audio = 0;
 		FFmpegDecoder decoder (film, content, true, true);
-		BOOST_CHECK_EQUAL (decoder._video_pts_offset, 0);
-		BOOST_CHECK_EQUAL (decoder._audio_pts_offset, 0);
+		BOOST_CHECK_EQUAL (decoder._pts_offset, 0);
 	}
 
 	{
@@ -65,8 +62,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_pts_offset_test)
 		content->_first_video = frame + 0.0215;
 		content->_audio_stream->first_audio = 0;
 		FFmpegDecoder decoder (film, content, true, true);
-		BOOST_CHECK_CLOSE (decoder._video_pts_offset, (frame - 0.0215), 0.00001);
-		BOOST_CHECK_CLOSE (decoder._audio_pts_offset, (frame - 0.0215), 0.00001);
+		BOOST_CHECK_CLOSE (decoder._pts_offset, (frame - 0.0215), 0.00001);
 	}
 
 	{
@@ -75,7 +71,6 @@ BOOST_AUTO_TEST_CASE (ffmpeg_pts_offset_test)
 		content->_first_video = frame + 0.0215 + 4.1;
 		content->_audio_stream->first_audio = 4.1;
 		FFmpegDecoder decoder (film, content, true, true);
-		BOOST_CHECK_EQUAL (decoder._video_pts_offset, (frame - 0.0215) - 4.1);
-		BOOST_CHECK_EQUAL (decoder._audio_pts_offset, (frame - 0.0215) - 4.1);
+		BOOST_CHECK_EQUAL (decoder._pts_offset, (frame - 0.0215) - 4.1);
 	}
 }
diff --git a/test/seek_zero_test.cc b/test/seek_zero_test.cc
index 0987f6b9b..c20c99ee7 100644
--- a/test/seek_zero_test.cc
+++ b/test/seek_zero_test.cc
@@ -32,6 +32,7 @@
 
 using std::cout;
 using boost::shared_ptr;
+using boost::dynamic_pointer_cast;
 
 BOOST_AUTO_TEST_CASE (seek_zero_test)
 {
@@ -45,14 +46,12 @@ BOOST_AUTO_TEST_CASE (seek_zero_test)
 	wait_for_jobs ();
 
 	FFmpegDecoder decoder (film, content, true, false);
-	shared_ptr<Decoded> a = decoder.peek ();
-	cout << a->content_time << "\n";
+	shared_ptr<DecodedVideo> a = dynamic_pointer_cast<DecodedVideo> (decoder.peek ());
 	decoder.seek (0, true);
-	shared_ptr<Decoded> b = decoder.peek ();
-	cout << b->content_time << "\n";
+	shared_ptr<DecodedVideo> b = dynamic_pointer_cast<DecodedVideo> (decoder.peek ());
 
 	/* a will be after no seek, and b after a seek to zero, which should
 	   have the same effect.
 	*/
-	BOOST_CHECK_EQUAL (a->content_time, b->content_time);
+	BOOST_CHECK_EQUAL (a->frame, b->frame);
 }
-- 
cgit v1.2.3


From d7b23d44dec9d6357619e8e009e564e475215470 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Fri, 3 Jan 2014 23:18:47 +0000
Subject: Various attempted fixes to audio sync.

---
 src/lib/audio_decoder.cc   | 29 +++++++++++++++++------------
 src/lib/audio_decoder.h    |  5 ++---
 src/lib/decoder.cc         |  9 +++++++++
 src/lib/ffmpeg_decoder.cc  | 20 ++++++++------------
 src/lib/ffmpeg_decoder.h   |  1 -
 src/lib/player.cc          | 13 ++++---------
 src/lib/sndfile_decoder.cc |  5 ++++-
 src/lib/sndfile_decoder.h  |  5 +----
 8 files changed, 45 insertions(+), 42 deletions(-)

(limited to 'src/lib/ffmpeg_decoder.h')

diff --git a/src/lib/audio_decoder.cc b/src/lib/audio_decoder.cc
index adabd5d99..8d3b0e128 100644
--- a/src/lib/audio_decoder.cc
+++ b/src/lib/audio_decoder.cc
@@ -37,7 +37,6 @@ using boost::shared_ptr;
 AudioDecoder::AudioDecoder (shared_ptr<const Film> film, shared_ptr<const AudioContent> content)
 	: Decoder (film)
 	, _audio_content (content)
-	, _audio_position (0)
 {
 	if (content->output_audio_frame_rate() != content->content_audio_frame_rate() && content->audio_channels ()) {
 		_resampler.reset (new Resampler (content->content_audio_frame_rate(), content->output_audio_frame_rate(), content->audio_channels ()));
@@ -47,16 +46,26 @@ AudioDecoder::AudioDecoder (shared_ptr<const Film> film, shared_ptr<const AudioC
 /** Audio timestamping is made hard by many factors, but the final nail in the coffin is resampling.
  *  We have to assume that we are feeding continuous data into the resampler, and so we get continuous
  *  data out.  Hence we do the timestamping here, post-resampler, just by counting samples.
+ *
+ *  The time is passed in here so that after a seek we can set up our _audio_position.  The
+ *  time is ignored once this has been done.
  */
 void
-AudioDecoder::audio (shared_ptr<const AudioBuffers> data)
+AudioDecoder::audio (shared_ptr<const AudioBuffers> data, ContentTime time)
 {
 	if (_resampler) {
 		data = _resampler->run (data);
 	}
 
-	_pending.push_back (shared_ptr<DecodedAudio> (new DecodedAudio (data, _audio_position)));
-	_audio_position += data->frames ();
+	if (!_audio_position) {
+		shared_ptr<const Film> film = _film.lock ();
+		assert (film);
+		FrameRateChange frc = film->active_frame_rate_change (_audio_content->position ());
+		_audio_position = (double (time) / frc.speed_up) * film->audio_frame_rate() / TIME_HZ;
+	}
+
+	_pending.push_back (shared_ptr<DecodedAudio> (new DecodedAudio (data, _audio_position.get ())));
+	_audio_position = _audio_position.get() + data->frames ();
 }
 
 void
@@ -68,17 +77,13 @@ AudioDecoder::flush ()
 
 	shared_ptr<const AudioBuffers> b = _resampler->flush ();
 	if (b) {
-		_pending.push_back (shared_ptr<DecodedAudio> (new DecodedAudio (b, _audio_position)));
-		_audio_position += b->frames ();
+		_pending.push_back (shared_ptr<DecodedAudio> (new DecodedAudio (b, _audio_position.get ())));
+		_audio_position = _audio_position.get() + b->frames ();
 	}
 }
 
 void
-AudioDecoder::seek (ContentTime t, bool)
+AudioDecoder::seek (ContentTime, bool)
 {
-	shared_ptr<const Film> film = _film.lock ();
-	assert (film);
-	
-	FrameRateChange frc = film->active_frame_rate_change (_audio_content->position ());
-	_audio_position = ((t + first_audio()) / frc.speed_up) * film->audio_frame_rate() / TIME_HZ;
+	_audio_position.reset ();
 }
diff --git a/src/lib/audio_decoder.h b/src/lib/audio_decoder.h
index 12f8505f6..bb3aafccd 100644
--- a/src/lib/audio_decoder.h
+++ b/src/lib/audio_decoder.h
@@ -48,13 +48,12 @@ public:
 	
 protected:
 
-	virtual ContentTime first_audio () const = 0;
-	void audio (boost::shared_ptr<const AudioBuffers>);
+	void audio (boost::shared_ptr<const AudioBuffers>, ContentTime);
 	void flush ();
 
 	boost::shared_ptr<const AudioContent> _audio_content;
 	boost::shared_ptr<Resampler> _resampler;
-	AudioFrame _audio_position;
+	boost::optional<AudioFrame> _audio_position;
 };
 
 #endif
diff --git a/src/lib/decoder.cc b/src/lib/decoder.cc
index 30244b40b..53a0c31e1 100644
--- a/src/lib/decoder.cc
+++ b/src/lib/decoder.cc
@@ -40,6 +40,14 @@ Decoder::Decoder (shared_ptr<const Film> f)
 
 }
 
+struct DecodedSorter
+{
+	bool operator() (shared_ptr<Decoded> a, shared_ptr<Decoded> b)
+	{
+		return a->dcp_time < b->dcp_time;
+	}
+};
+
 shared_ptr<Decoded>
 Decoder::peek ()
 {
@@ -51,6 +59,7 @@ Decoder::peek ()
 		return shared_ptr<Decoded> ();
 	}
 
+	_pending.sort (DecodedSorter ());
 	return _pending.front ();
 }
 
diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc
index 25fe655be..dae0ddbe8 100644
--- a/src/lib/ffmpeg_decoder.cc
+++ b/src/lib/ffmpeg_decoder.cc
@@ -445,11 +445,17 @@ FFmpegDecoder::decode_audio_packet ()
 		}
 
 		if (frame_finished) {
+			ContentTime const ct = (
+				av_frame_get_best_effort_timestamp (_frame) *
+				av_q2d (_ffmpeg_content->audio_stream()->stream (_format_context)->time_base)
+				+ _pts_offset
+				) * TIME_HZ;
+			
 			int const data_size = av_samples_get_buffer_size (
 				0, audio_codec_context()->channels, _frame->nb_samples, audio_sample_format (), 1
 				);
-			
-			audio (deinterleave_audio (_frame->data, data_size));
+
+			audio (deinterleave_audio (_frame->data, data_size), ct);
 		}
 			
 		copy_packet.data += decode_result;
@@ -603,13 +609,3 @@ FFmpegDecoder::decode_subtitle_packet ()
 	
 	avsubtitle_free (&sub);
 }
-
-ContentTime
-FFmpegDecoder::first_audio () const
-{
-	if (!_ffmpeg_content->audio_stream ()) {
-		return 0;
-	}
-
-	return _ffmpeg_content->audio_stream()->first_audio.get_value_or(0) + _pts_offset;
-}
diff --git a/src/lib/ffmpeg_decoder.h b/src/lib/ffmpeg_decoder.h
index 680e39c39..ee725b20c 100644
--- a/src/lib/ffmpeg_decoder.h
+++ b/src/lib/ffmpeg_decoder.h
@@ -58,7 +58,6 @@ private:
 
 	bool pass ();
 	void flush ();
-	ContentTime first_audio () const;
 
 	void setup_subtitle ();
 
diff --git a/src/lib/player.cc b/src/lib/player.cc
index eb7b177ec..3db2fe6c9 100644
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -172,11 +172,6 @@ Player::pass ()
 	/* 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) {
@@ -185,7 +180,7 @@ Player::pass ()
 			emit_video (earliest_piece, dv);
 			step_video_position (dv);
 			
-		} else if (dv->dcp_time - _video_position > margin) {
+		} else if (dv->dcp_time > _video_position) {
 
 			/* Too far ahead */
 
@@ -208,7 +203,7 @@ Player::pass ()
 
 			consume = false;
 
-		} else if (abs (dv->dcp_time - _video_position) < margin) {
+		} else if (dv->dcp_time == _video_position) {
 			/* We're ok */
 			emit_video (earliest_piece, dv);
 			step_video_position (dv);
@@ -222,12 +217,12 @@ Player::pass ()
 
 	} else if (da && _audio) {
 
-		if (da->dcp_time - _audio_position > margin) {
+		if (da->dcp_time > _audio_position) {
 			/* Too far ahead */
 			emit_silence (da->dcp_time - _audio_position);
 			consume = false;
 			_statistics.audio.silence += (da->dcp_time - _audio_position);
-		} else if (abs (da->dcp_time - _audio_position) < margin) {
+		} else if (da->dcp_time == _audio_position) {
 			/* We're ok */
 			emit_audio (earliest_piece, da);
 			_statistics.audio.good += da->data->frames();
diff --git a/src/lib/sndfile_decoder.cc b/src/lib/sndfile_decoder.cc
index 1c651e614..d6537843e 100644
--- a/src/lib/sndfile_decoder.cc
+++ b/src/lib/sndfile_decoder.cc
@@ -45,6 +45,7 @@ SndfileDecoder::SndfileDecoder (shared_ptr<const Film> f, shared_ptr<const Sndfi
 		throw DecodeError (_("could not open audio file for reading"));
 	}
 
+	_done = 0;
 	_remaining = _info.frames;
 }
 
@@ -93,7 +94,8 @@ SndfileDecoder::pass ()
 	}
 		
 	data->set_frames (this_time);
-	audio (data);
+	audio (data, _done * TIME_HZ / audio_frame_rate ());
+	_done += this_time;
 	_remaining -= this_time;
 
 	return _remaining == 0;
@@ -123,5 +125,6 @@ SndfileDecoder::seek (ContentTime t, bool accurate)
 	Decoder::seek (t, accurate);
 	AudioDecoder::seek (t, accurate);
 
+	_done = t * audio_frame_rate() / TIME_HZ;
 	_remaining = _info.frames - _done;
 }
diff --git a/src/lib/sndfile_decoder.h b/src/lib/sndfile_decoder.h
index 4ecea0846..46d9c5e5c 100644
--- a/src/lib/sndfile_decoder.h
+++ b/src/lib/sndfile_decoder.h
@@ -36,15 +36,12 @@ public:
 	int audio_frame_rate () const;
 
 private:
-	ContentTime first_audio () const {
-		return 0;
-	}
-
 	bool pass ();
 	
 	boost::shared_ptr<const SndfileContent> _sndfile_content;
 	SNDFILE* _sndfile;
 	SF_INFO _info;
+	AudioFrame _done;
 	AudioFrame _remaining;
 	float* _deinterleave_buffer;
 };
-- 
cgit v1.2.3