X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fffmpeg_content.h;h=cf1849971450659f5d12ccb64d0b1c681a825561;hp=8bd5ef4fa9b05ab1ddd80dfc433fa94d793ddef7;hb=f515b8daea9d28200be803bb64ff17e9f30343c4;hpb=254b3044d72de6b033d7c584f5abd2b9aa70aad5

diff --git a/src/lib/ffmpeg_content.h b/src/lib/ffmpeg_content.h
index 8bd5ef4fa..cf1849971 100644
--- a/src/lib/ffmpeg_content.h
+++ b/src/lib/ffmpeg_content.h
@@ -21,6 +21,9 @@
 #ifndef DCPOMATIC_FFMPEG_CONTENT_H
 #define DCPOMATIC_FFMPEG_CONTENT_H
 
+#ifdef DCPOMATIC_VARIANT_SWAROOP
+#include "encrypted_ecinema_kdm.h"
+#endif
 #include "content.h"
 #include "audio_stream.h"
 
@@ -41,6 +44,7 @@ public:
 	/** The chosen subtitle stream, or something about it */
 	static int const SUBTITLE_STREAM;
 	static int const FILTERS;
+	static int const KDM;
 };
 
 class FFmpegContent : public Content
@@ -54,12 +58,17 @@ public:
 		return boost::dynamic_pointer_cast<FFmpegContent> (Content::shared_from_this ());
 	}
 
+	boost::shared_ptr<const FFmpegContent> shared_from_this () const {
+		return boost::dynamic_pointer_cast<const FFmpegContent> (Content::shared_from_this ());
+	}
+
 	void examine (boost::shared_ptr<const Film> film, boost::shared_ptr<Job>);
 	void take_settings_from (boost::shared_ptr<const Content> c);
 	std::string summary () const;
 	std::string technical_summary () const;
 	void as_xml (xmlpp::Node *, bool with_paths) const;
-	DCPTime full_length (boost::shared_ptr<const Film> film) const;
+	dcpomatic::DCPTime full_length (boost::shared_ptr<const Film> film) const;
+	dcpomatic::DCPTime approximate_length () const;
 
 	std::string identifier () const;
 
@@ -86,23 +95,34 @@ public:
 
 	void set_subtitle_stream (boost::shared_ptr<FFmpegSubtitleStream>);
 
-	boost::optional<ContentTime> first_video () const {
+	boost::optional<dcpomatic::ContentTime> first_video () const {
 		boost::mutex::scoped_lock lm (_mutex);
 		return _first_video;
 	}
 
 	void signal_subtitle_stream_changed ();
 
-	boost::optional<std::string> decryption_key () const {
-		boost::mutex::scoped_lock lm (_mutex);
-		return _decryption_key;
-	}
+#ifdef DCPOMATIC_VARIANT_SWAROOP
 
 	bool encrypted () const {
 		boost::mutex::scoped_lock lm (_mutex);
 		return _encrypted;
 	}
 
+	void add_kdm (EncryptedECinemaKDM kdm);
+
+	boost::optional<EncryptedECinemaKDM> kdm () const {
+		return _kdm;
+	}
+
+	boost::optional<std::string> id () const {
+		return _id;
+	}
+
+	bool kdm_timing_window_valid () const;
+
+#endif
+
 private:
 	void add_properties (boost::shared_ptr<const Film> film, std::list<UserProperty> &) const;
 
@@ -111,7 +131,7 @@ private:
 
 	std::vector<boost::shared_ptr<FFmpegSubtitleStream> > _subtitle_streams;
 	boost::shared_ptr<FFmpegSubtitleStream> _subtitle_stream;
-	boost::optional<ContentTime> _first_video;
+	boost::optional<dcpomatic::ContentTime> _first_video;
 	/** Video filters that should be used when generating DCPs */
 	std::vector<Filter const *> _filters;
 
@@ -120,8 +140,11 @@ private:
 	boost::optional<AVColorTransferCharacteristic> _color_trc;
 	boost::optional<AVColorSpace> _colorspace;
 	boost::optional<int> _bits_per_pixel;
-	boost::optional<std::string> _decryption_key;
+#ifdef DCPOMATIC_VARIANT_SWAROOP
 	bool _encrypted;
+	boost::optional<EncryptedECinemaKDM> _kdm;
+	boost::optional<std::string> _id;
+#endif
 };
 
 #endif