X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_examiner.h;h=8c31eb2c4aedadae419e7c5e41b83841f848c93b;hb=8d58a7c5f4320ad5c111e336c45e44d6b51ab509;hp=2dd8b2e34baabc95594f4b21c79b92fae7eb679f;hpb=f0e95aa5b7ada81a1c40f06facab2e94e45ab26c;p=dcpomatic.git

diff --git a/src/lib/ffmpeg_examiner.h b/src/lib/ffmpeg_examiner.h
index 2dd8b2e34..8c31eb2c4 100644
--- a/src/lib/ffmpeg_examiner.h
+++ b/src/lib/ffmpeg_examiner.h
@@ -30,8 +30,8 @@ public:
 	FFmpegExaminer (boost::shared_ptr<const FFmpegContent>);
 	
 	float video_frame_rate () const;
-	libdcp::Size video_size () const;
-	VideoFrame video_length () const;
+	dcp::Size video_size () const;
+	ContentTime video_length () const;
 
 	std::vector<boost::shared_ptr<FFmpegSubtitleStream> > subtitle_streams () const {
 		return _subtitle_streams;
@@ -41,17 +41,21 @@ 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;
 };