Logging improvements to allow prettier displays in the server GUI.

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

diff --git a/src/lib/ffmpeg_examiner.h b/src/lib/ffmpeg_examiner.h
index 8c31eb2c4aedadae419e7c5e41b83841f848c93b..27bff08b47426749eeee7201234a1aed4e955238 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,11 @@
 
 */
 
-#include <boost/optional.hpp>
 #include "ffmpeg.h"
 #include "video_examiner.h"
+#include <boost/optional.hpp>
+
+struct AVStream;
 
 class FFmpegAudioStream;
 class FFmpegSubtitleStream;
@@ -27,16 +29,17 @@ class FFmpegSubtitleStream;
 class FFmpegExaminer : public FFmpeg, public VideoExaminer
 {
 public:
-       FFmpegExaminer (boost::shared_ptr<const FFmpegContent>);
-       
-       float video_frame_rate () const;
+       FFmpegExaminer (boost::shared_ptr<const FFmpegContent>, boost::shared_ptr<Job> job = boost::shared_ptr<Job> ());
+
+       boost::optional<double> video_frame_rate () const;
        dcp::Size video_size () const;
-       ContentTime video_length () const;
+       Frame video_length () 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;
        }
@@ -44,18 +47,44 @@ 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;
        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<ContentTime> _first_video;
+       /** Video length, either obtained from the header or derived by running
+        *  through the whole file.
+        */
+       Frame _video_length;
+       bool _need_video_length;
+
+       typedef std::map<boost::shared_ptr<FFmpegSubtitleStream>, boost::optional<ContentTime> > LastSubtitleMap;
+       LastSubtitleMap _last_subtitle_start;
 };