X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_decoder.h;h=b5bcdd35800fbaa07a0556ce00c082f8e4964e91;hb=2bfd531137f1a4874493186015046e33c5a07c1e;hp=9f85c2dca8e5e2d9fc66045cd694dab07c12fb90;hpb=7b2054e2a73844450b5b55c5788c02af671812ce;p=dcpomatic.git

diff --git a/src/lib/ffmpeg_decoder.h b/src/lib/ffmpeg_decoder.h
index 9f85c2dca..b5bcdd358 100644
--- a/src/lib/ffmpeg_decoder.h
+++ b/src/lib/ffmpeg_decoder.h
@@ -21,25 +21,26 @@
  *  @brief A decoder using FFmpeg to decode content.
  */
 
-#include <vector>
-#include <string>
-#include <stdint.h>
-#include <boost/shared_ptr.hpp>
-#include <boost/optional.hpp>
-#include <boost/thread/mutex.hpp>
-extern "C" {
-#include <libavcodec/avcodec.h>
-}
 #include "util.h"
 #include "decoder.h"
 #include "video_decoder.h"
 #include "audio_decoder.h"
 #include "subtitle_decoder.h"
 #include "ffmpeg.h"
+#include "rect.h"
+extern "C" {
+#include <libavcodec/avcodec.h>
+}
+#include <boost/shared_ptr.hpp>
+#include <boost/optional.hpp>
+#include <boost/thread/mutex.hpp>
+#include <stdint.h>
+#include <vector>
+#include <string>
 
 class Log;
 class FilterGraph;
-class ffmpeg_pts_offset_test;
+struct ffmpeg_pts_offset_test;
 
 /** @class FFmpegDecoder
  *  @brief A decoder using FFmpeg to decode content.
@@ -66,7 +67,12 @@ private:
 	void maybe_add_subtitle ();
 	boost::shared_ptr<AudioBuffers> deinterleave_audio (uint8_t** data, int size);
 
-	std::list<ContentTimePeriod> subtitles_during (ContentTimePeriod, bool starting) const;
+	boost::optional<ContentTime> _pending_subtitle_from;
+	boost::shared_ptr<Image> _pending_subtitle_image;
+	boost::optional<dcpomatic::Rect<double> > _pending_subtitle_rect;
+
+	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;