X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_examiner.h;h=b873222c112e3d06c77bb989475f2a69f4bc7bbe;hb=769c71b5c3e050ccfc1c13771d24328fbf76a495;hp=40d7dbf1d8358ff2a8eabfe71a7b58187464de3b;hpb=f58d9e44302151dea9f594acd9fc27a331fa77fb;p=dcpomatic.git

diff --git a/src/lib/ffmpeg_examiner.h b/src/lib/ffmpeg_examiner.h
index 40d7dbf1d..b873222c1 100644
--- a/src/lib/ffmpeg_examiner.h
+++ b/src/lib/ffmpeg_examiner.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,9 +17,9 @@
 
 */
 
-#include <boost/optional.hpp>
 #include "ffmpeg.h"
 #include "video_examiner.h"
+#include <boost/optional.hpp>
 
 class FFmpegAudioStream;
 class FFmpegSubtitleStream;
@@ -27,11 +27,12 @@ class FFmpegSubtitleStream;
 class FFmpegExaminer : public FFmpeg, public VideoExaminer
 {
 public:
-	FFmpegExaminer (boost::shared_ptr<const FFmpegContent>);
+	FFmpegExaminer (boost::shared_ptr<const FFmpegContent>, boost::shared_ptr<Job> job = boost::shared_ptr<Job> ());
 	
-	float video_frame_rate () const;
+	boost::optional<float> video_frame_rate () const;
 	dcp::Size video_size () const;
-	VideoFrame video_length () const;
+	ContentTime video_length () const;
+	boost::optional<float> sample_aspect_ratio () const;
 
 	std::vector<boost::shared_ptr<FFmpegSubtitleStream> > subtitle_streams () const {
 		return _subtitle_streams;
@@ -41,17 +42,26 @@ public:
 		return _audio_streams;
 	}
 
-	boost::optional<double> first_video () const {
+	boost::optional<ContentTime> first_video () const {
 		return _first_video;
 	}
 	
 private:
+	void video_packet (AVCodecContext *);
+	void audio_packet (AVCodecContext *, boost::shared_ptr<FFmpegAudioStream>);
+	void subtitle_packet (AVCodecContext *, boost::shared_ptr<FFmpegSubtitleStream>);
+	
 	std::string stream_name (AVStream* s) const;
 	std::string audio_stream_name (AVStream* s) const;
 	std::string subtitle_stream_name (AVStream* s) const;
-	boost::optional<double> frame_time (int) const;
+	boost::optional<ContentTime> frame_time (AVStream* s) const;
 	
 	std::vector<boost::shared_ptr<FFmpegSubtitleStream> > _subtitle_streams;
 	std::vector<boost::shared_ptr<FFmpegAudioStream> > _audio_streams;
-	boost::optional<double> _first_video;
+	boost::optional<ContentTime> _first_video;
+	/** Video length, either obtained from the header or derived by running
+	 *  through the whole file.
+	 */
+	ContentTime _video_length;
+	bool _need_video_length;
 };