Supporters update.

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

diff --git a/src/lib/ffmpeg_examiner.h b/src/lib/ffmpeg_examiner.h
index 0884a6fb82df8548e21ece95c29de5093f9d8f10..45313ec18cc22f501bf626c74f6bb5459d4a18e4 100644 (file)
--- 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 (std::shared_ptr<const FFmpegContent>, std::shared_ptr<Job> job = std::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<std::shared_ptr<FFmpegSubtitleStream> > subtitle_streams () const {
+       std::vector<std::shared_ptr<FFmpegSubtitleStream>> subtitle_streams () const {
                return _subtitle_streams;
        }
 
-       std::vector<std::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;
@@ -73,6 +77,8 @@ public:
 
        boost::optional<int> bits_per_pixel () const;
 
+       bool has_alpha() const;
+
        boost::optional<double> rotation () const {
                return _rotation;
        }
@@ -87,10 +93,10 @@ private:
 
        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<std::shared_ptr<FFmpegSubtitleStream> > _subtitle_streams;
-       std::vector<std::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.
@@ -115,6 +121,6 @@ private:
                dcpomatic::ContentTime time;
        };
 
-       typedef std::map<std::shared_ptr<FFmpegSubtitleStream>, boost::optional<SubtitleStart> > LastSubtitleMap;
+       typedef std::map<std::shared_ptr<FFmpegSubtitleStream>, boost::optional<SubtitleStart>> LastSubtitleMap;
        LastSubtitleMap _last_subtitle_start;
 };