Reasonably straightforward stuff; main things are adding

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

diff --git a/src/lib/ffmpeg_decoder.h b/src/lib/ffmpeg_decoder.h
index 5475be6122da98b51c4bb8414a837af46d0be087..990d643a704d6ab5223cdb2bebc9467d736f18e6 100644 (file)
--- a/src/lib/ffmpeg_decoder.h
+++ b/src/lib/ffmpeg_decoder.h
@@ -34,7 +34,7 @@ extern "C" {
 #include <stdint.h>
 
 class Log;
-class FilterGraph;
+class VideoFilterGraph;
 class FFmpegAudioStream;
 struct ffmpeg_pts_offset_test;
 
@@ -49,7 +49,7 @@ public:
 private:
        friend struct ::ffmpeg_pts_offset_test;
 
-       bool pass ();
+       bool pass (PassReason, bool accurate);
        void seek (ContentTime time, bool);
        void flush ();
 
@@ -61,16 +61,17 @@ private:
        void decode_subtitle_packet ();
 
        void decode_bitmap_subtitle (AVSubtitleRect const * rect, ContentTimePeriod period);
+       void decode_ass_subtitle (std::string ass, ContentTimePeriod period);
 
        void maybe_add_subtitle ();
-       boost::shared_ptr<AudioBuffers> deinterleave_audio (boost::shared_ptr<FFmpegAudioStream> stream, uint8_t** data, int size);
+       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<FilterGraph> > _filter_graphs;
+       std::list<boost::shared_ptr<VideoFilterGraph> > _filter_graphs;
        boost::mutex _filter_graphs_mutex;
 
        ContentTime _pts_offset;