X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_examiner.h;h=10d060707588be939ba20925c4a2d41b6035bea1;hb=ff639b3cf30afcc097bfd21d39c8d15f466cadd6;hp=4f5110ca041946b416238b78599f84aab3b15018;hpb=5254047c3ad8c8c4b7ed7bf5b735b8448fcf1c29;p=dcpomatic.git

diff --git a/src/lib/ffmpeg_examiner.h b/src/lib/ffmpeg_examiner.h
index 4f5110ca0..10d060707 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;
+	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,7 +55,9 @@ public:
 		return _first_video;
 	}
 
-	VideoRange range () const;
+	VideoRange range () const override;
+
+	PixelQuanta pixel_quanta () const override;
 
 	AVColorRange color_range () const {
 		return video_codec_context()->color_range;
@@ -81,22 +85,16 @@ public:
 		return _pulldown;
 	}
 
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-	boost::optional<std::string> id () const {
-		return _id;
-	}
-#endif
-
 private:
-	void video_packet (AVCodecContext *, std::string& temporal_reference);
-	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.
@@ -107,10 +105,6 @@ private:
 	boost::optional<double> _rotation;
 	bool _pulldown;
 
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-	boost::optional<std::string> _id;
-#endif
-
 	struct SubtitleStart
 	{
 		SubtitleStart (std::string id_, bool image_, dcpomatic::ContentTime time_)
@@ -125,6 +119,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;
 };