X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_decoder.h;h=6f027ce1c1ba2687df7d774aa22207883f373a27;hb=661de111c0dbc968ecb004eca5b26f8400b136f1;hp=b553cc42ea2cc15627f99f5ee9cd35cdfffb6f39;hpb=fc56dc97103d00437843a31e1ef0c4915900ad1a;p=dcpomatic.git

diff --git a/src/lib/ffmpeg_decoder.h b/src/lib/ffmpeg_decoder.h
index b553cc42e..6f027ce1c 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.
@@ -50,10 +51,10 @@ public:
 	FFmpegDecoder (boost::shared_ptr<const FFmpegContent>, boost::shared_ptr<Log>);
 
 private:
-	friend class ::ffmpeg_pts_offset_test;
+	friend struct ::ffmpeg_pts_offset_test;
 
+	bool pass (PassReason reason);
 	void seek (ContentTime time, bool);
-	bool pass ();
 	void flush ();
 
 	AVSampleFormat audio_sample_format () const;
@@ -63,10 +64,13 @@ private:
 	void decode_audio_packet ();
 	void decode_subtitle_packet ();
 
+	void decode_bitmap_subtitle (AVSubtitleRect const * rect, ContentTimePeriod period);
+
 	void maybe_add_subtitle ();
 	boost::shared_ptr<AudioBuffers> deinterleave_audio (uint8_t** data, int size);
 
-	std::list<ContentTimePeriod> subtitles_during (ContentTimePeriod, bool starting) 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;