Make player more tolerant of some DCP errors.

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

diff --git a/src/lib/dcp_examiner.h b/src/lib/dcp_examiner.h
index 9d6faa7e8d49ca230c55a0d7b179d6bc7f6d1a7d..e52234e360fde46d827c6238abc6407c25810b3b 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-2019 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -31,7 +31,7 @@ class DCPContent;
 class DCPExaminer : public DCP, public VideoExaminer, public AudioExaminer
 {
 public:
-       explicit DCPExaminer (boost::shared_ptr<const DCPContent>);
+       explicit DCPExaminer (boost::shared_ptr<const DCPContent>, bool tolerant);
 
        bool has_video () const {
                return _has_video;
@@ -55,12 +55,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 {
@@ -87,6 +87,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;
        }
@@ -99,6 +106,10 @@ public:
                return _three_d;
        }
 
+       dcp::ContentKind content_kind () const {
+               return _content_kind;
+       }
+
        std::string cpl () const {
                return _cpl;
        }
@@ -115,16 +126,18 @@ private:
        boost::optional<int> _audio_frame_rate;
        Frame _audio_length;
        std::string _name;
-       bool _has_subtitles;
-       bool _encrypted;
        /** 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;
 };