Put Image in dcpomatic:: to avoid Fastvideo name clash.

[dcpomatic.git] / src / lib / ffmpeg_decoder.h

diff --git a/src/lib/ffmpeg_decoder.h b/src/lib/ffmpeg_decoder.h
index 76755c1fcc2d6e1a3c75b202d5b2d5dc6c266d1e..fc15456db0f814f193d14a7835bb57bc18d85263 100644 (file)
--- a/src/lib/ffmpeg_decoder.h
+++ b/src/lib/ffmpeg_decoder.h
@@ -32,10 +32,14 @@ extern "C" {
 #include <boost/thread/mutex.hpp>
 #include <stdint.h>
 
+namespace dcpomatic {
+       class Image;
+}
+
+class AudioBuffers;
+class FFmpegAudioStream;
 class Log;
 class VideoFilterGraph;
-class FFmpegAudioStream;
-class AudioBuffers;
 struct ffmpeg_pts_offset_test;
 
 /** @class FFmpegDecoder
@@ -44,13 +48,14 @@ struct ffmpeg_pts_offset_test;
 class FFmpegDecoder : public FFmpeg, public Decoder
 {
 public:
-       FFmpegDecoder (boost::shared_ptr<const FFmpegContent>, boost::shared_ptr<Log>);
+       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 +65,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<dcpomatic::Image> _black_image;
+
+       std::vector<boost::optional<dcpomatic::ContentTime> > _next_time;
 };