X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_examiner.h;h=54e283548a49f031a030df4b8b4e823f31bab33b;hb=3c802dd6d1451c2c8a7e188f8379738d72e907eb;hp=fd643a754ff78cfa2caaa7bf80a332173810360f;hpb=c2a17a87868eba87072fc369102b2b3cd8905e5a;p=dcpomatic.git

diff --git a/src/lib/dcp_examiner.h b/src/lib/dcp_examiner.h
index fd643a754..54e283548 100644
--- a/src/lib/dcp_examiner.h
+++ b/src/lib/dcp_examiner.h
@@ -18,51 +18,56 @@
 
 */
 
+
 /** @file  src/lib/dcp_examiner.h
  *  @brief DCPExaminer class.
  */
 
-#include "video_examiner.h"
+
 #include "audio_examiner.h"
-#include "dcp.h"
 #include "dcp_text_track.h"
 #include "dcpomatic_assert.h"
+#include "font_id_allocator.h"
+#include "video_examiner.h"
 #include <dcp/dcp_time.h>
+#include <dcp/rating.h>
+
 
 class DCPContent;
 
-class DCPExaminer : public DCP, public VideoExaminer, public AudioExaminer
+
+class DCPExaminer : public VideoExaminer, public AudioExaminer
 {
 public:
-	explicit DCPExaminer (std::shared_ptr<const DCPContent>, bool tolerant);
+	DCPExaminer(std::shared_ptr<const DCPContent>, bool tolerant);
 
-	bool has_video () const {
+	bool has_video () const override {
 		return _has_video;
 	}
 
-	boost::optional<double> video_frame_rate () const {
+	boost::optional<double> video_frame_rate () const override {
 		return _video_frame_rate;
 	}
 
-	dcp::Size video_size () const {
+	dcp::Size video_size () const override {
 		DCPOMATIC_ASSERT (_has_video);
 		DCPOMATIC_ASSERT (_video_size);
 		return *_video_size;
 	}
 
-	Frame video_length () const {
+	Frame video_length () const override {
 		return _video_length;
 	}
 
-	bool yuv () const {
+	bool yuv () const override {
 		return false;
 	}
 
-	VideoRange range () const {
+	VideoRange range () const override {
 		return VideoRange::FULL;
 	}
 
-	PixelQuanta pixel_quanta () const {
+	PixelQuanta pixel_quanta () const override {
 		return {};
 	}
 
@@ -78,19 +83,23 @@ public:
 		return _needs_assets;
 	}
 
-	bool has_audio () const {
+	bool has_audio () const override {
 		return _has_audio;
 	}
 
-	int audio_channels () const {
+	int audio_channels () const override {
 		return _audio_channels.get_value_or (0);
 	}
 
-	Frame audio_length () const {
+	int active_audio_channels() const {
+		return _active_audio_channels.get_value_or(0);
+	}
+
+	Frame audio_length () const override {
 		return _audio_length;
 	}
 
-	int audio_frame_rate () const {
+	int audio_frame_rate () const override {
 		return _audio_frame_rate.get_value_or (48000);
 	}
 
@@ -99,10 +108,12 @@ public:
 	}
 
 	/** @param type TEXT_OPEN_SUBTITLE or TEXT_CLOSED_CAPTION.
-	 *  @return Number of assets of this type in this DCP.
+	 *  @return the number of "streams" of this type in the DCP.
+	 *  Reels do not affect the return value of this method: if a DCP
+	 *  has any subtitles, type=TEXT_OPEN_SUBTITLE will return 1.
 	 */
 	int text_count (TextType type) const {
-		return _text_count[static_cast<int>(type)];
+		return _text_count[type];
 	}
 
 	boost::optional<dcp::LanguageTag> open_subtitle_language () const {
@@ -127,7 +138,8 @@ public:
 	}
 
 	dcp::ContentKind content_kind () const {
-		return _content_kind;
+		DCPOMATIC_ASSERT(_content_kind);
+		return *_content_kind;
 	}
 
 	std::string cpl () const {
@@ -162,11 +174,14 @@ public:
 		return _atmos_edit_rate;
 	}
 
+	void add_fonts(std::shared_ptr<TextContent> content);
+
 private:
 	boost::optional<double> _video_frame_rate;
 	boost::optional<dcp::Size> _video_size;
 	Frame _video_length = 0;
 	boost::optional<int> _audio_channels;
+	boost::optional<int> _active_audio_channels;
 	boost::optional<int> _audio_frame_rate;
 	Frame _audio_length = 0;
 	std::string _name;
@@ -176,7 +191,7 @@ private:
 	bool _has_audio = false;
 	boost::optional<dcp::LanguageTag> _audio_language;
 	/** number of different assets of each type (OCAP/CCAP) */
-	int _text_count[static_cast<int>(TextType::COUNT)];
+	EnumIndexedVector<int, TextType> _text_count;
 	boost::optional<dcp::LanguageTag> _open_subtitle_language;
 	/** the DCPTextTracks for each of our CCAPs */
 	std::vector<DCPTextTrack> _dcp_text_tracks;
@@ -185,7 +200,7 @@ private:
 	bool _kdm_valid = false;
 	boost::optional<dcp::Standard> _standard;
 	bool _three_d = false;
-	dcp::ContentKind _content_kind;
+	boost::optional<dcp::ContentKind> _content_kind;
 	std::string _cpl;
 	std::list<int64_t> _reel_lengths;
 	std::map<dcp::Marker, dcp::Time> _markers;
@@ -194,4 +209,20 @@ private:
 	bool _has_atmos = false;
 	Frame _atmos_length = 0;
 	dcp::Fraction _atmos_edit_rate;
+
+	struct Font
+	{
+		Font(int reel_index_, std::string asset_id_, std::shared_ptr<dcpomatic::Font> font_)
+			: reel_index(reel_index_)
+			, asset_id(asset_id_)
+			, font(font_)
+		{}
+
+		int reel_index;
+		std::string asset_id;
+		std::shared_ptr<dcpomatic::Font> font;
+	};
+
+	std::vector<Font> _fonts;
+	FontIDAllocator _font_id_allocator;
 };