Hand-apply 111f02f4fc8ace359a16aea1c88c2821bf3dde31 from master; improve progress...

[dcpomatic.git] / src / lib / ffmpeg_examiner.h

diff --git a/src/lib/ffmpeg_examiner.h b/src/lib/ffmpeg_examiner.h
index 381c5cea9c9e85a48ec894326f92a482f82bf8e7..b873222c112e3d06c77bb989475f2a69f4bc7bbe 100644 (file)
--- 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;
        ContentTime video_length () const;
+       boost::optional<float> sample_aspect_ratio () const;
 
        std::vector<boost::shared_ptr<FFmpegSubtitleStream> > subtitle_streams () const {
                return _subtitle_streams;
@@ -46,6 +47,10 @@ public:
        }
        
 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;
@@ -54,4 +59,9 @@ private:
        std::vector<boost::shared_ptr<FFmpegSubtitleStream> > _subtitle_streams;
        std::vector<boost::shared_ptr<FFmpegAudioStream> > _audio_streams;
        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;
 };