X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_decoder.h;h=8f0482aad8331dcd12685e1d4724e08469b20eb8;hb=09a9ac376db005a40a351736bcff4077f098825d;hp=a4a9246f0bb16189dd4f30ea63fb79752fa5bff1;hpb=4fbd1901fdabc829cfa7e7d4d0c1272bba87033c;p=dcpomatic.git

diff --git a/src/lib/ffmpeg_decoder.h b/src/lib/ffmpeg_decoder.h
index a4a9246f0..8f0482aad 100644
--- a/src/lib/ffmpeg_decoder.h
+++ b/src/lib/ffmpeg_decoder.h
@@ -26,6 +26,7 @@
 #include <stdint.h>
 #include <boost/shared_ptr.hpp>
 #include <boost/optional.hpp>
+#include <boost/thread/mutex.hpp>
 extern "C" {
 #include <libavcodec/avcodec.h>
 #include <libpostproc/postprocess.h>
@@ -34,74 +35,54 @@ extern "C" {
 #include "decoder.h"
 #include "video_decoder.h"
 #include "audio_decoder.h"
+#include "ffmpeg.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 Film;
+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 FFmpeg
 {
 public:
-	FFmpegDecoder (boost::shared_ptr<Film>, boost::shared_ptr<const Options>, 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 set_audio_stream (boost::optional<AudioStream>);
-	void set_subtitle_stream (boost::optional<SubtitleStream>);
+	void pass ();
+	void seek (VideoContent::Frame);
+	void seek_back ();
+	bool done () const;
 
 private:
+	friend class ::ffmpeg_pts_offset_test;
 
-	bool pass ();
-	PixelFormat pixel_format () const;
-	AVSampleFormat audio_sample_format () const;
-	int bytes_per_audio_sample () const;
+	/* No copy construction */
+	FFmpegDecoder (FFmpegDecoder const &);
+	FFmpegDecoder& operator= (FFmpegDecoder const &);
 
-	void filter_and_emit_video (AVFrame *);
+	static double compute_pts_offset (double, double, float);
 
-	void setup_general ();
-	void setup_video ();
-	void setup_audio ();
 	void setup_subtitle ();
 
-	void maybe_add_subtitle ();
-	boost::shared_ptr<AudioBuffers> deinterleave_audio (uint8_t* data, int size);
+	AVSampleFormat audio_sample_format () const;
+	int bytes_per_audio_sample () const;
+	void do_seek (VideoContent::Frame, bool, bool);
 
-	std::string stream_name (AVStream* s) const;
+	bool decode_video_packet ();
+	void decode_audio_packet ();
 
-	AVFormatContext* _format_context;
-	int _video_stream;
-	
-	AVFrame* _frame;
+	void maybe_add_subtitle ();
+	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
+	
+	std::list<boost::shared_ptr<FilterGraph> > _filter_graphs;
+	boost::mutex _filter_graphs_mutex;
 
-	AVPacket _packet;
-
-	boost::optional<double> _first_video;
-	boost::optional<double> _first_audio;
+	bool _decode_video;
+	bool _decode_audio;
 
-	std::list<boost::shared_ptr<FilterGraph> > _filter_graphs;
+	double _pts_offset;
 };