X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_decoder.h;h=11f83ed97c9808aeaff603f110814463b51234a6;hb=2d5b8cdde08044d323aa7193dfac6c9f8bca7131;hp=fbd9e5255b57342b7cc3ef3a9c66985b59a75b54;hpb=1d96023ab3987e55fd6452f655dfb900c6012881;p=dcpomatic.git

diff --git a/src/lib/ffmpeg_decoder.h b/src/lib/ffmpeg_decoder.h
index fbd9e5255..11f83ed97 100644
--- a/src/lib/ffmpeg_decoder.h
+++ b/src/lib/ffmpeg_decoder.h
@@ -26,84 +26,64 @@
 #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>
 }
 #include "util.h"
 #include "decoder.h"
+#include "video_decoder.h"
+#include "audio_decoder.h"
+#include "subtitle_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 FilterGraph;
+class ffmpeg_pts_offset_test;
 
 /** @class FFmpegDecoder
  *  @brief A decoder using FFmpeg to decode content.
  */
-class FFmpegDecoder : public Decoder
+class FFmpegDecoder : public VideoDecoder, public AudioDecoder, public SubtitleDecoder, public FFmpeg
 {
 public:
-	FFmpegDecoder (boost::shared_ptr<Film>, boost::shared_ptr<const Options>, Job *, bool);
+	FFmpegDecoder (boost::shared_ptr<const Film>, boost::shared_ptr<const FFmpegContent>, bool video, bool audio);
 	~FFmpegDecoder ();
 
-	/* Methods to query our input video */
-	float frames_per_second () const;
-	Size native_size () const;
-	int audio_channels () const;
-	int audio_sample_rate () const;
-	AVSampleFormat audio_sample_format () const;
-	int64_t audio_channel_layout () const;
-	bool has_subtitles () const;
-
-	std::vector<AudioStream> audio_streams () const;
-	std::vector<SubtitleStream> subtitle_streams () const;
+	void pass ();
+	void seek (VideoContent::Frame, bool);
+	bool done () const;
 
 private:
+	friend class ::ffmpeg_pts_offset_test;
+
+	static double compute_pts_offset (double, double, float);
 
-	bool pass ();
-	PixelFormat pixel_format () const;
-	int time_base_numerator () const;
-	int time_base_denominator () const;
-	int sample_aspect_ratio_numerator () const;
-	int sample_aspect_ratio_denominator () const;
+	void flush ();
 
-	void setup_general ();
-	void setup_video ();
-	void setup_audio ();
 	void setup_subtitle ();
 
-	void maybe_add_subtitle ();
+	AVSampleFormat audio_sample_format () const;
+	int bytes_per_audio_sample () const;
 
-	std::string stream_name (AVStream* s) const;
+	bool decode_video_packet ();
+	void decode_audio_packet ();
+	void decode_subtitle_packet ();
 
-	AVFormatContext* _format_context;
-	int _video_stream;
-	int _audio_stream; ///< may be < 0 if there is no audio
-	int _subtitle_stream; ///< may be < 0 if there is no subtitle
-	
-	AVFrame* _frame;
+	void maybe_add_subtitle ();
+	boost::shared_ptr<AudioBuffers> deinterleave_audio (uint8_t** data, int size);
 
-	std::vector<AudioStream> _audio_streams;
-	std::vector<SubtitleStream> _subtitle_streams;
-	
-	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
+	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;
+	bool _decode_video;
+	bool _decode_audio;
 
-	boost::optional<double> _first_video;
-	boost::optional<double> _first_audio;
+	double _video_pts_offset;
+	double _audio_pts_offset;
+	bool _just_sought;
 };