X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_decoder.h;h=ee725b20c9c46cb066d9e98bbfd6d7331bee45c9;hb=85c65bd422742813992686c17a5e1b718cc3c449;hp=2e64d8801104471a84fde174f8add41e5cd0c6e6;hpb=df52b97f307605aad15ab5f01c8fdcf93afc9d15;p=dcpomatic.git

diff --git a/src/lib/ffmpeg_decoder.h b/src/lib/ffmpeg_decoder.h
index 2e64d8801..ee725b20c 100644
--- a/src/lib/ffmpeg_decoder.h
+++ b/src/lib/ffmpeg_decoder.h
@@ -35,48 +35,49 @@ extern "C" {
 #include "decoder.h"
 #include "video_decoder.h"
 #include "audio_decoder.h"
+#include "subtitle_decoder.h"
 #include "ffmpeg.h"
 
 class Film;
+class FilterGraph;
 class ffmpeg_pts_offset_test;
 
 /** @class FFmpegDecoder
  *  @brief A decoder using FFmpeg to decode content.
  */
-class FFmpegDecoder : public VideoDecoder, public AudioDecoder, public FFmpeg
+class FFmpegDecoder : public VideoDecoder, public AudioDecoder, public SubtitleDecoder, public FFmpeg
 {
 public:
 	FFmpegDecoder (boost::shared_ptr<const Film>, boost::shared_ptr<const FFmpegContent>, bool video, bool audio);
 	~FFmpegDecoder ();
 
-	void pass ();
-	void seek (VideoContent::Frame);
-	void seek_back ();
-	bool done () const;
+	void seek (ContentTime time, bool);
 
 private:
 	friend class ::ffmpeg_pts_offset_test;
 
-	/* No copy construction */
-	FFmpegDecoder (FFmpegDecoder const &);
-	FFmpegDecoder& operator= (FFmpegDecoder const &);
-
-	static double compute_pts_offset (double, double, float);
+	bool pass ();
+	void flush ();
 
 	void setup_subtitle ();
 
 	AVSampleFormat audio_sample_format () const;
 	int bytes_per_audio_sample () const;
-	void do_seek (VideoContent::Frame, bool, bool);
 
 	bool decode_video_packet ();
 	void decode_audio_packet ();
+	void decode_subtitle_packet ();
 
 	void maybe_add_subtitle ();
 	boost::shared_ptr<AudioBuffers> deinterleave_audio (uint8_t** data, int size);
 
+	bool seek_overrun_finished (ContentTime, boost::optional<ContentTime>, boost::optional<ContentTime>) const;
+	bool seek_final_finished (int, int) const;
+	int minimal_run (boost::function<bool (boost::optional<ContentTime>, boost::optional<ContentTime>, int)>);
+	void seek_and_flush (int64_t);
+
 	AVCodecContext* _subtitle_codec_context; ///< may be 0 if there is no subtitle
-	AVCodec* _subtitle_codec;                ///< may be 0 if there is no subtitle
+	AVCodec* _subtitle_codec;		 ///< may be 0 if there is no subtitle
 	
 	std::list<boost::shared_ptr<FilterGraph> > _filter_graphs;
 	boost::mutex _filter_graphs_mutex;
@@ -85,5 +86,4 @@ private:
 	bool _decode_audio;
 
 	double _pts_offset;
-	bool _just_sought;
 };