X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_decoder.h;h=e3aa484d1a18673be645298d811d338decd4d338;hb=9b240c6d5d4e2189401498a99f98f41d1b15ed31;hp=9cf3de28f7e022b430728bc3c488345d3e749839;hpb=bd75347a20c3952954121ce00ec2ac6fa62a01ac;p=dcpomatic.git

diff --git a/src/lib/ffmpeg_decoder.h b/src/lib/ffmpeg_decoder.h
index 9cf3de28f..e3aa484d1 100644
--- a/src/lib/ffmpeg_decoder.h
+++ b/src/lib/ffmpeg_decoder.h
@@ -35,111 +35,53 @@ extern "C" {
 #include "decoder.h"
 #include "video_decoder.h"
 #include "audio_decoder.h"
-#include "film.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;
-
-class FFmpegAudioStream : public AudioStream
-{
-public:
-	FFmpegAudioStream (std::string n, int i, int s, int64_t c)
-		: AudioStream (s, c)
-		, _name (n)
-		, _id (i)
-	{}
-		  
-	std::string to_string () const;
-
-	std::string name () const {
-		return _name;
-	}
+#include "subtitle_decoder.h"
+#include "ffmpeg.h"
 
-	int id () const {
-		return _id;
-	}
-
-	static boost::shared_ptr<FFmpegAudioStream> create (std::string t, boost::optional<int> v);
-
-private:
-	friend class stream_test;
-	
-	FFmpegAudioStream (std::string t, boost::optional<int> v);
-	
-	std::string _name;
-	int _id;
-};
+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<Film>, boost::shared_ptr<const DecodeOptions>, Job *);
+	FFmpegDecoder (boost::shared_ptr<const Film>, boost::shared_ptr<const FFmpegContent>, bool video, bool audio);
 	~FFmpegDecoder ();
 
-	float frames_per_second () const;
-	Size native_size () const;
-	int time_base_numerator () const;
-	int time_base_denominator () const;
-	int sample_aspect_ratio_numerator () const;
-	int sample_aspect_ratio_denominator () const;
+	void pass ();
+	void seek (VideoContent::Frame, bool);
+	bool done () const;
 
-	void set_audio_stream (boost::shared_ptr<AudioStream>);
-	void set_subtitle_stream (boost::shared_ptr<SubtitleStream>);
+private:
+	friend class ::ffmpeg_pts_offset_test;
 
-	bool seek (SourceFrame);
+	static double compute_pts_offset (double, double, float);
 
-private:
+	void setup_subtitle ();
 
-	bool pass ();
-	PixelFormat pixel_format () const;
 	AVSampleFormat audio_sample_format () const;
 	int bytes_per_audio_sample () const;
 
-	void out_with_sync ();
-	void filter_and_emit_video (AVFrame *);
-
-	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;
-
-	AVFormatContext* _format_context;
-	int _video_stream;
-	
-	AVFrame* _frame;
+	boost::shared_ptr<AudioBuffers> deinterleave_audio (uint8_t** data, int size);
 
-	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;
-
-	boost::optional<double> _first_video;
-	boost::optional<double> _first_audio;
-
+	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;
 };