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 f54f02c36c005f607de6b8b3720beac8b4a3f2df..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,6 +55,10 @@ public:
                return false;
        }
 
+       VideoRange range () const {
+               return VIDEO_RANGE_FULL;
+       }
+
        std::string name () const {
                return _name;
        }
@@ -83,8 +87,11 @@ public:
                return _audio_frame_rate.get_value_or (48000);
        }
 
-       bool has_text (TextType type) const {
-               return _has_text[type];
+       /** @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 {
@@ -123,7 +130,8 @@ private:
        bool _has_video;
        /** true if this DCP has audio content (but false if it has unresolved references to audio content) */
        bool _has_audio;
-       bool _has_text[TEXT_COUNT];
+       /** number of different assets of each type (OCAP/CCAP) */
+       int _text_count[TEXT_COUNT];
        bool _encrypted;
        bool _needs_assets;
        bool _kdm_valid;