X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fffmpeg_examiner.h;h=10d060707588be939ba20925c4a2d41b6035bea1;hp=d2e6e1a0a1da1dbd17e9778d2058a8edb389d0d4;hb=HEAD;hpb=c4403784febdbdd42e9c32e67fadb147f11fe566

diff --git a/src/lib/ffmpeg_examiner.h b/src/lib/ffmpeg_examiner.h
index d2e6e1a0a..45313ec18 100644
--- a/src/lib/ffmpeg_examiner.h
+++ b/src/lib/ffmpeg_examiner.h
@@ -18,34 +18,36 @@
 
 */
 
+
 #include "ffmpeg.h"
 #include "video_examiner.h"
 #include <boost/optional.hpp>
 
-struct AVStream;
 
+struct AVStream;
 class FFmpegAudioStream;
 class FFmpegSubtitleStream;
 class Job;
 
+
 class FFmpegExaminer : public FFmpeg, public VideoExaminer
 {
 public:
-	FFmpegExaminer (boost::shared_ptr<const FFmpegContent>, boost::shared_ptr<Job> job = boost::shared_ptr<Job> ());
+	FFmpegExaminer (std::shared_ptr<const FFmpegContent>, std::shared_ptr<Job> job = std::shared_ptr<Job>());
 
-	bool has_video () const;
+	bool has_video () const override;
 
-	boost::optional<double> video_frame_rate () const;
-	dcp::Size video_size () const;
-	Frame video_length () const;
-	boost::optional<double> sample_aspect_ratio () const;
-	bool yuv () const;
+	boost::optional<double> video_frame_rate () const override;
+	boost::optional<dcp::Size> video_size() const override;
+	Frame video_length () const override;
+	boost::optional<double> sample_aspect_ratio () const override;
+	bool yuv () const override;
 
-	std::vector<boost::shared_ptr<FFmpegSubtitleStream> > subtitle_streams () const {
+	std::vector<std::shared_ptr<FFmpegSubtitleStream>> subtitle_streams () const {
 		return _subtitle_streams;
 	}
 
-	std::vector<boost::shared_ptr<FFmpegAudioStream> > audio_streams () const {
+	std::vector<std::shared_ptr<FFmpegAudioStream>> audio_streams () const {
 		return _audio_streams;
 	}
 
@@ -53,6 +55,10 @@ public:
 		return _first_video;
 	}
 
+	VideoRange range () const override;
+
+	PixelQuanta pixel_quanta () const override;
+
 	AVColorRange color_range () const {
 		return video_codec_context()->color_range;
 	}
@@ -71,20 +77,26 @@ public:
 
 	boost::optional<int> bits_per_pixel () const;
 
+	bool has_alpha() const;
+
 	boost::optional<double> rotation () const {
 		return _rotation;
 	}
 
+	bool pulldown () const {
+		return _pulldown;
+	}
+
 private:
-	void video_packet (AVCodecContext *);
-	void audio_packet (AVCodecContext *, boost::shared_ptr<FFmpegAudioStream>);
+	bool video_packet (AVCodecContext* context, std::string& temporal_reference, AVPacket* packet);
+	void audio_packet (AVCodecContext* context, std::shared_ptr<FFmpegAudioStream>, AVPacket* packet);
 
 	std::string stream_name (AVStream* s) const;
 	std::string subtitle_stream_name (AVStream* s) const;
-	boost::optional<dcpomatic::ContentTime> frame_time (AVStream* s) const;
+	boost::optional<dcpomatic::ContentTime> frame_time (AVFrame* frame, AVStream* stream) const;
 
-	std::vector<boost::shared_ptr<FFmpegSubtitleStream> > _subtitle_streams;
-	std::vector<boost::shared_ptr<FFmpegAudioStream> > _audio_streams;
+	std::vector<std::shared_ptr<FFmpegSubtitleStream>> _subtitle_streams;
+	std::vector<std::shared_ptr<FFmpegAudioStream>> _audio_streams;
 	boost::optional<dcpomatic::ContentTime> _first_video;
 	/** Video length, either obtained from the header or derived by running
 	 *  through the whole file.
@@ -93,6 +105,7 @@ private:
 	bool _need_video_length;
 
 	boost::optional<double> _rotation;
+	bool _pulldown;
 
 	struct SubtitleStart
 	{
@@ -108,6 +121,6 @@ private:
 		dcpomatic::ContentTime time;
 	};
 
-	typedef std::map<boost::shared_ptr<FFmpegSubtitleStream>, boost::optional<SubtitleStart> > LastSubtitleMap;
+	typedef std::map<std::shared_ptr<FFmpegSubtitleStream>, boost::optional<SubtitleStart>> LastSubtitleMap;
 	LastSubtitleMap _last_subtitle_start;
 };