Move KDM CLI tool into lib/

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

diff --git a/src/lib/ffmpeg_examiner.h b/src/lib/ffmpeg_examiner.h
index 4f5110ca041946b416238b78599f84aab3b15018..f978eb52bc00e63b55f3ab34034f57ea2893cdb8 100644 (file)
--- a/src/lib/ffmpeg_examiner.h
+++ b/src/lib/ffmpeg_examiner.h
@@ -18,20 +18,22 @@
 
 */
 
+
 #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 (boost::shared_ptr<const FFmpegContent>, boost::shared_ptr<Job> job = boost::shared_ptr<Job> ());
+       FFmpegExaminer (std::shared_ptr<const FFmpegContent>, std::shared_ptr<Job> job = std::shared_ptr<Job>());
 
        bool has_video () const;
 
@@ -41,11 +43,11 @@ public:
        boost::optional<double> sample_aspect_ratio () const;
        bool yuv () const;
 
-       std::vector<boost::shared_ptr<FFmpegSubtitleStream> > subtitle_streams () const {
+       std::vector<std::shared_ptr<FFmpegSubtitleStream>> subtitle_streams () const {
                return _subtitle_streams;
        }
 
-       std::vector<boost::shared_ptr<FFmpegAudioStream> > audio_streams () const {
+       std::vector<std::shared_ptr<FFmpegAudioStream>> audio_streams () const {
                return _audio_streams;
        }
 
@@ -55,6 +57,8 @@ public:
 
        VideoRange range () const;
 
+       PixelQuanta pixel_quanta () const;
+
        AVColorRange color_range () const {
                return video_codec_context()->color_range;
        }
@@ -81,22 +85,16 @@ public:
                return _pulldown;
        }
 
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-       boost::optional<std::string> id () const {
-               return _id;
-       }
-#endif
-
 private:
-       void video_packet (AVCodecContext *, std::string& temporal_reference);
-       void audio_packet (AVCodecContext *, boost::shared_ptr<FFmpegAudioStream>);
+       bool video_packet (AVCodecContext* context, std::string& temporal_reference, AVPacket* packet);
+       void audio_packet (AVCodecContext* context, std::shared_ptr<FFmpegAudioStream>, AVPacket* packet);
 
        std::string stream_name (AVStream* s) const;
        std::string subtitle_stream_name (AVStream* s) const;
        boost::optional<dcpomatic::ContentTime> frame_time (AVStream* s) const;
 
-       std::vector<boost::shared_ptr<FFmpegSubtitleStream> > _subtitle_streams;
-       std::vector<boost::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.
@@ -107,10 +105,6 @@ private:
        boost::optional<double> _rotation;
        bool _pulldown;
 
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-       boost::optional<std::string> _id;
-#endif
-
        struct SubtitleStart
        {
                SubtitleStart (std::string id_, bool image_, dcpomatic::ContentTime time_)
@@ -125,6 +119,6 @@ private:
                dcpomatic::ContentTime time;
        };
 
-       typedef std::map<boost::shared_ptr<FFmpegSubtitleStream>, boost::optional<SubtitleStart> > LastSubtitleMap;
+       typedef std::map<std::shared_ptr<FFmpegSubtitleStream>, boost::optional<SubtitleStart>> LastSubtitleMap;
        LastSubtitleMap _last_subtitle_start;
 };