Make Atmos content work more like other content. Now its MXFs

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

diff --git a/src/lib/dcp_examiner.h b/src/lib/dcp_examiner.h
index d9c372c3c590a37510ff18b91bbc36dedddd66de..b4c87596c70e354079937132d289a06ed2ba8a42 100644 (file)
--- a/src/lib/dcp_examiner.h
+++ b/src/lib/dcp_examiner.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2020 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -25,20 +25,27 @@
 #include "video_examiner.h"
 #include "audio_examiner.h"
 #include "dcp.h"
+#include <dcp/dcp_time.h>
 
 class DCPContent;
 
 class DCPExaminer : public DCP, public VideoExaminer, public AudioExaminer
 {
 public:
-       DCPExaminer (boost::shared_ptr<const DCPContent>);
+       explicit DCPExaminer (boost::shared_ptr<const DCPContent>, bool tolerant);
+
+       bool has_video () const {
+               return _has_video;
+       }
 
        boost::optional<double> video_frame_rate () const {
                return _video_frame_rate;
        }
 
        dcp::Size video_size () const {
-               return _video_size.get_value_or (dcp::Size (1998, 1080));
+               DCPOMATIC_ASSERT (_has_video);
+               DCPOMATIC_ASSERT (_video_size);
+               return *_video_size;
        }
 
        Frame video_length () const {
@@ -49,12 +56,12 @@ public:
                return false;
        }
 
-       std::string name () const {
-               return _name;
+       VideoRange range () const {
+               return VIDEO_RANGE_FULL;
        }
 
-       bool has_subtitles () const {
-               return _has_subtitles;
+       std::string name () const {
+               return _name;
        }
 
        bool encrypted () const {
@@ -65,6 +72,10 @@ public:
                return _needs_assets;
        }
 
+       bool has_audio () const {
+               return _has_audio;
+       }
+
        int audio_channels () const {
                return _audio_channels.get_value_or (0);
        }
@@ -77,6 +88,13 @@ public:
                return _audio_frame_rate.get_value_or (48000);
        }
 
+       /** @param type TEXT_OPEN_SUBTITLE or TEXT_CLOSED_CAPTION.
+        *  @return Number of assets of this type in this DCP.
+        */
+       int text_count (TextType type) const {
+               return _text_count[type];
+       }
+
        bool kdm_valid () const {
                return _kdm_valid;
        }
@@ -89,6 +107,10 @@ public:
                return _three_d;
        }
 
+       dcp::ContentKind content_kind () const {
+               return _content_kind;
+       }
+
        std::string cpl () const {
                return _cpl;
        }
@@ -97,6 +119,22 @@ public:
                return _reel_lengths;
        }
 
+       std::map<dcp::Marker, dcp::Time> markers () const {
+               return _markers;
+       }
+
+       std::vector<dcp::Rating> ratings () const {
+               return _ratings;
+       }
+
+       std::string content_version () const {
+               return _content_version;
+       }
+
+       bool has_atmos () const {
+               return _has_atmos;
+       }
+
 private:
        boost::optional<double> _video_frame_rate;
        boost::optional<dcp::Size> _video_size;
@@ -105,12 +143,22 @@ private:
        boost::optional<int> _audio_frame_rate;
        Frame _audio_length;
        std::string _name;
-       bool _has_subtitles;
+       /** true if this DCP has video content (but false if it has unresolved references to video content) */
+       bool _has_video;
+       /** true if this DCP has audio content (but false if it has unresolved references to audio content) */
+       bool _has_audio;
+       /** number of different assets of each type (OCAP/CCAP) */
+       int _text_count[TEXT_COUNT];
        bool _encrypted;
        bool _needs_assets;
        bool _kdm_valid;
        boost::optional<dcp::Standard> _standard;
        bool _three_d;
+       dcp::ContentKind _content_kind;
        std::string _cpl;
        std::list<int64_t> _reel_lengths;
+       std::map<dcp::Marker, dcp::Time> _markers;
+       std::vector<dcp::Rating> _ratings;
+       std::string _content_version;
+       bool _has_atmos;
 };