X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_decoder.h;h=ca42e013e886c2cc08c94ed2edb63d2aae6c831a;hb=8fedaaa75c4586a4cc7ffb393bd71d1fdb091dc8;hp=bd7ba98b84fe0f74edd8e50ca195a9873de2ba4b;hpb=ba8a5a15cc27988e2bbc6acd470d8532f1d8e99f;p=dcpomatic.git

diff --git a/src/lib/ffmpeg_decoder.h b/src/lib/ffmpeg_decoder.h
index bd7ba98b8..ca42e013e 100644
--- a/src/lib/ffmpeg_decoder.h
+++ b/src/lib/ffmpeg_decoder.h
@@ -28,7 +28,6 @@
 extern "C" {
 #include <libavcodec/avcodec.h>
 }
-#include <boost/shared_ptr.hpp>
 #include <boost/thread/mutex.hpp>
 #include <stdint.h>
 
@@ -36,6 +35,7 @@ class Log;
 class VideoFilterGraph;
 class FFmpegAudioStream;
 class AudioBuffers;
+class Image;
 struct ffmpeg_pts_offset_test;
 
 /** @class FFmpegDecoder
@@ -44,35 +44,38 @@ struct ffmpeg_pts_offset_test;
 class FFmpegDecoder : public FFmpeg, public Decoder
 {
 public:
-	FFmpegDecoder (boost::shared_ptr<const FFmpegContent>, boost::shared_ptr<Log>);
+	FFmpegDecoder (std::shared_ptr<const Film> film, std::shared_ptr<const FFmpegContent>, bool fast);
 
 	bool pass ();
-	void seek (ContentTime time, bool);
+	void seek (dcpomatic::ContentTime time, bool);
 
 private:
 	friend struct ::ffmpeg_pts_offset_test;
 
 	void flush ();
 
-	AVSampleFormat audio_sample_format (boost::shared_ptr<FFmpegAudioStream> stream) const;
-	int bytes_per_audio_sample (boost::shared_ptr<FFmpegAudioStream> stream) const;
+	AVSampleFormat audio_sample_format (std::shared_ptr<FFmpegAudioStream> stream) const;
+	int bytes_per_audio_sample (std::shared_ptr<FFmpegAudioStream> stream) const;
 
 	bool decode_video_packet ();
 	void decode_audio_packet ();
 	void decode_subtitle_packet ();
 
-	void decode_bitmap_subtitle (AVSubtitleRect const * rect, ContentTime from);
-	void decode_ass_subtitle (std::string ass, ContentTime from);
+	void decode_bitmap_subtitle (AVSubtitleRect const * rect, dcpomatic::ContentTime from);
+	void decode_ass_subtitle (std::string ass, dcpomatic::ContentTime from);
 
 	void maybe_add_subtitle ();
-	boost::shared_ptr<AudioBuffers> deinterleave_audio (boost::shared_ptr<FFmpegAudioStream> stream) const;
+	std::shared_ptr<AudioBuffers> deinterleave_audio (std::shared_ptr<FFmpegAudioStream> stream) const;
 
-	boost::shared_ptr<Log> _log;
-
-	std::list<boost::shared_ptr<VideoFilterGraph> > _filter_graphs;
+	std::list<std::shared_ptr<VideoFilterGraph> > _filter_graphs;
 	boost::mutex _filter_graphs_mutex;
 
-	ContentTime _pts_offset;
-	boost::optional<ContentTime> _current_subtitle_to;
+	dcpomatic::ContentTime _pts_offset;
+	boost::optional<dcpomatic::ContentTime> _current_subtitle_to;
+	/** true if we have a subtitle which has not had emit_stop called for it yet */
 	bool _have_current_subtitle;
+
+	std::shared_ptr<Image> _black_image;
+
+	std::vector<boost::optional<dcpomatic::ContentTime> > _next_time;
 };