float -> double in a few places.

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

diff --git a/src/lib/ffmpeg_examiner.h b/src/lib/ffmpeg_examiner.h
index d6149446ae0984e26719b542d1d4fba66890edec..96720b280bfc869269de92b041b83b4ba2b32d3e 100644 (file)
--- a/src/lib/ffmpeg_examiner.h
+++ b/src/lib/ffmpeg_examiner.h
@@ -21,6 +21,8 @@
 #include "video_examiner.h"
 #include <boost/optional.hpp>
 
+class AVStream;
+
 class FFmpegAudioStream;
 class FFmpegSubtitleStream;
 
@@ -28,16 +30,16 @@ class FFmpegExaminer : public FFmpeg, public VideoExaminer
 {
 public:
        FFmpegExaminer (boost::shared_ptr<const FFmpegContent>, boost::shared_ptr<Job> job = boost::shared_ptr<Job> ());
-       
-       boost::optional<float> video_frame_rate () const;
+
+       boost::optional<double> video_frame_rate () const;
        dcp::Size video_size () const;
        Frame video_length () const;
-       boost::optional<float> sample_aspect_ratio () const;
+       boost::optional<double> sample_aspect_ratio () const;
 
        std::vector<boost::shared_ptr<FFmpegSubtitleStream> > subtitle_streams () const {
                return _subtitle_streams;
        }
-       
+
        std::vector<boost::shared_ptr<FFmpegAudioStream> > audio_streams () const {
                return _audio_streams;
        }
@@ -45,12 +47,30 @@ public:
        boost::optional<ContentTime> first_video () const {
                return _first_video;
        }
-       
+
+       AVColorRange color_range () const {
+               return video_codec_context()->color_range;
+       }
+
+       AVColorPrimaries color_primaries () const {
+               return video_codec_context()->color_primaries;
+       }
+
+       AVColorTransferCharacteristic color_trc () const {
+               return video_codec_context()->color_trc;
+       }
+
+       AVColorSpace colorspace () const {
+               return video_codec_context()->colorspace;
+       }
+
+       int bits_per_pixel () const;
+
 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;