X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_examiner.h;h=e52234e360fde46d827c6238abc6407c25810b3b;hb=fea83d9ef5d02149f857a11de79ed266773fd5a1;hp=d9c372c3c590a37510ff18b91bbc36dedddd66de;hpb=9f034b0e2b39c2c56b767371af90deb888d8779f;p=dcpomatic.git

diff --git a/src/lib/dcp_examiner.h b/src/lib/dcp_examiner.h
index d9c372c3c..e52234e36 100644
--- 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,14 +31,20 @@ 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 +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 {
@@ -65,6 +71,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 +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;
 	}
@@ -89,6 +106,10 @@ public:
 		return _three_d;
 	}
 
+	dcp::ContentKind content_kind () const {
+		return _content_kind;
+	}
+
 	std::string cpl () const {
 		return _cpl;
 	}
@@ -105,12 +126,18 @@ 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;
 };