X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_decoder.h;h=65f36a00461b9115ca67fea8e7ee60c60a944ef8;hb=0b15f493754d1b630338b17f2a6dfc66ccc4f6b7;hp=6be9f8b1cc79b63cf1042f598e2038f25fbe4b0c;hpb=3828baf56467224f5d44049bf1e7a7ed11f43a05;p=dcpomatic.git

diff --git a/src/lib/ffmpeg_decoder.h b/src/lib/ffmpeg_decoder.h
index 6be9f8b1c..65f36a004 100644
--- a/src/lib/ffmpeg_decoder.h
+++ b/src/lib/ffmpeg_decoder.h
@@ -36,6 +36,7 @@ class Log;
 class VideoFilterGraph;
 class FFmpegAudioStream;
 class AudioBuffers;
+class Image;
 struct ffmpeg_pts_offset_test;
 
 /** @class FFmpegDecoder
@@ -44,13 +45,14 @@ struct ffmpeg_pts_offset_test;
 class FFmpegDecoder : public FFmpeg, public Decoder
 {
 public:
-	FFmpegDecoder (boost::shared_ptr<const FFmpegContent>, boost::shared_ptr<Log>, bool fast);
+	FFmpegDecoder (boost::shared_ptr<const Film> film, boost::shared_ptr<const FFmpegContent>, bool fast);
+
+	bool pass ();
+	void seek (dcpomatic::ContentTime time, bool);
 
 private:
 	friend struct ::ffmpeg_pts_offset_test;
 
-	bool pass (PassReason, bool accurate);
-	void seek (ContentTime time, bool);
 	void flush ();
 
 	AVSampleFormat audio_sample_format (boost::shared_ptr<FFmpegAudioStream> stream) const;
@@ -60,19 +62,21 @@ private:
 	void decode_audio_packet ();
 	void decode_subtitle_packet ();
 
-	void decode_bitmap_subtitle (AVSubtitleRect const * rect, ContentTimePeriod period);
-	void decode_ass_subtitle (std::string ass, ContentTimePeriod period);
+	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::list<ContentTimePeriod> image_subtitles_during (ContentTimePeriod, bool starting) const;
-	std::list<ContentTimePeriod> text_subtitles_during (ContentTimePeriod, bool starting) const;
-
-	boost::shared_ptr<Log> _log;
-
 	std::list<boost::shared_ptr<VideoFilterGraph> > _filter_graphs;
 	boost::mutex _filter_graphs_mutex;
 
-	ContentTime _pts_offset;
+	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;
+
+	boost::shared_ptr<Image> _black_image;
+
+	std::vector<boost::optional<dcpomatic::ContentTime> > _next_time;
 };