X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_decoder.h;h=680e39c393a9dad5aca9e71cae4337e9108e1472;hb=f0e95aa5b7ada81a1c40f06facab2e94e45ab26c;hp=1e273752a59e874d8fde97fa22d261a56e9a5d2d;hpb=9525e7726e4d488f193957d4fcf1cc1725581ae8;p=dcpomatic.git

diff --git a/src/lib/ffmpeg_decoder.h b/src/lib/ffmpeg_decoder.h
index 1e273752a..680e39c39 100644
--- a/src/lib/ffmpeg_decoder.h
+++ b/src/lib/ffmpeg_decoder.h
@@ -35,108 +35,56 @@ extern "C" {
 #include "decoder.h"
 #include "video_decoder.h"
 #include "audio_decoder.h"
-#include "film.h"
-#include "ffmpeg_content.h"
-
-struct AVFilterGraph;
-struct AVCodecContext;
-struct AVFilterContext;
-struct AVFormatContext;
-struct AVFrame;
-struct AVBufferContext;
-struct AVCodec;
-struct AVStream;
-class Job;
-class Options;
-class Image;
-class Log;
+#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
+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, bool subtitles);
+	FFmpegDecoder (boost::shared_ptr<const Film>, boost::shared_ptr<const FFmpegContent>, bool video, bool audio);
 	~FFmpegDecoder ();
 
-	float video_frame_rate () const;
-	libdcp::Size native_size () const;
-	ContentVideoFrame video_length () const;
-	int time_base_numerator () const;
-	int time_base_denominator () const;
-	int sample_aspect_ratio_numerator () const;
-	int sample_aspect_ratio_denominator () const;
-
-	std::vector<FFmpegSubtitleStream> subtitle_streams () const {
-		return _subtitle_streams;
-	}
-	
-	std::vector<FFmpegAudioStream> audio_streams () const {
-		return _audio_streams;
-	}
-
-	bool seek (double);
-	bool seek_forward ();
-	bool seek_back ();
-	bool pass ();
+	void seek (ContentTime time, bool);
 
 private:
+	friend class ::ffmpeg_pts_offset_test;
 
-	/* No copy construction */
-	FFmpegDecoder (FFmpegDecoder const &);
-	FFmpegDecoder& operator= (FFmpegDecoder const &);
+	bool pass ();
+	void flush ();
+	ContentTime first_audio () const;
+
+	void setup_subtitle ();
 
-	PixelFormat pixel_format () const;
 	AVSampleFormat audio_sample_format () const;
 	int bytes_per_audio_sample () const;
-	bool do_seek (double, bool, bool);
-
-	void filter_and_emit_video ();
-
-	void setup_general ();
-	void setup_video ();
-	void setup_audio ();
-	void setup_subtitle ();
 
+	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);
 
-	void film_changed (Film::Property);
-
-	std::string stream_name (AVStream* s) const;
-
-	boost::shared_ptr<const FFmpegContent> _ffmpeg_content;
-
-	AVFormatContext* _format_context;
-	int _video_stream;
-	
-	AVFrame* _frame;
+	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* _video_codec_context;
-	AVCodec* _video_codec;
-	AVCodecContext* _audio_codec_context;    ///< may be 0 if there is no audio
-	AVCodec* _audio_codec;                   ///< may be 0 if there is no audio
 	AVCodecContext* _subtitle_codec_context; ///< may be 0 if there is no subtitle
-	AVCodec* _subtitle_codec;                ///< may be 0 if there is no subtitle
-
-	AVPacket _packet;
-
+	AVCodec* _subtitle_codec;		 ///< may be 0 if there is no subtitle
+	
 	std::list<boost::shared_ptr<FilterGraph> > _filter_graphs;
 	boost::mutex _filter_graphs_mutex;
 
-        std::vector<FFmpegSubtitleStream> _subtitle_streams;
-        std::vector<FFmpegAudioStream> _audio_streams;
-
 	bool _decode_video;
 	bool _decode_audio;
-	bool _decode_subtitles;
 
-	/* It would appear (though not completely verified) that one must have
-	   a mutex around calls to avcodec_open* and avcodec_close... and here
-	   it is.
-	*/
-	static boost::mutex _mutex;
+	double _pts_offset;
 };