X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_decoder.h;h=335364d2e18bdacfce192b3a0366ec546f408c3d;hb=f0edd6ab35c3c2b7800a26ec8206adab75e5f633;hp=f54ee2496fa0479fcdcea793e576568bd1452073;hpb=ea910e250a0fb3b0ad3ce0cf32dd27b24c17cd1d;p=dcpomatic.git

diff --git a/src/lib/ffmpeg_decoder.h b/src/lib/ffmpeg_decoder.h
index f54ee2496..335364d2e 100644
--- a/src/lib/ffmpeg_decoder.h
+++ b/src/lib/ffmpeg_decoder.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -29,7 +29,6 @@
 #include <boost/thread/mutex.hpp>
 extern "C" {
 #include <libavcodec/avcodec.h>
-#include <libpostproc/postprocess.h>
 }
 #include "util.h"
 #include "decoder.h"
@@ -38,7 +37,7 @@ extern "C" {
 #include "subtitle_decoder.h"
 #include "ffmpeg.h"
 
-class Film;
+class Log;
 class FilterGraph;
 class ffmpeg_pts_offset_test;
 
@@ -48,22 +47,16 @@ class ffmpeg_pts_offset_test;
 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 (boost::shared_ptr<const FFmpegContent>, boost::shared_ptr<Log>);
 	~FFmpegDecoder ();
 
-	void pass ();
-	void seek (Time time, bool);
-	bool done () const;
-
 private:
 	friend class ::ffmpeg_pts_offset_test;
 
-	static double compute_pts_offset (double, double, float);
-
+	void seek (ContentTime time, bool);
+	bool pass ();
 	void flush ();
 
-	void setup_subtitle ();
-
 	AVSampleFormat audio_sample_format () const;
 	int bytes_per_audio_sample () const;
 
@@ -74,21 +67,19 @@ private:
 	void maybe_add_subtitle ();
 	boost::shared_ptr<AudioBuffers> deinterleave_audio (uint8_t** data, int size);
 
-	bool seek_overrun_finished (Time) const;
+	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 (int)>);
-	void seek_and_flush (int64_t);
+	int minimal_run (boost::function<bool (boost::optional<ContentTime>, boost::optional<ContentTime>, int)>);
+	void seek_and_flush (ContentTime);
 
+	bool has_subtitle_during (ContentTimePeriod) const;
+	
+	boost::shared_ptr<Log> _log;
 	AVCodecContext* _subtitle_codec_context; ///< 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;
 
-	bool _decode_video;
-	bool _decode_audio;
-
-	double _video_pts_offset;
-	double _audio_pts_offset;
-	bool _just_sought;
+	ContentTime _pts_offset;
 };