X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fffmpeg_content.cc;h=ac62ac7f44870e6b979ced49e8bfa6f82e69cc16;hp=03763fc289b0135e91cb764ff736cb9591e2853f;hb=a332bd6be323f03dad5b180fb237afe54f1bf81e;hpb=1c11eaf92c5d592be6df07e2ac77cfcf65e3ed0c

diff --git a/src/lib/ffmpeg_content.cc b/src/lib/ffmpeg_content.cc
index 03763fc28..ac62ac7f4 100644
--- a/src/lib/ffmpeg_content.cc
+++ b/src/lib/ffmpeg_content.cc
@@ -34,7 +34,6 @@
 #include "exceptions.h"
 #include "frame_rate_change.h"
 #include "text_content.h"
-#include "decrypted_ecinema_kdm.h"
 #include <dcp/raw_convert.h>
 #include <libcxml/cxml.h>
 extern "C" {
@@ -67,9 +66,6 @@ int const FFmpegContentProperty::KDM = 103;
 
 FFmpegContent::FFmpegContent (boost::filesystem::path p)
 	: Content (p)
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-	, _encrypted (false)
-#endif
 {
 
 }
@@ -130,9 +126,6 @@ FFmpegContent::FFmpegContent (cxml::ConstNodePtr node, int version, list<string>
 	_color_trc = get_optional_enum<AVColorTransferCharacteristic>(node, "ColorTransferCharacteristic");
 	_colorspace = get_optional_enum<AVColorSpace>(node, "Colorspace");
 	_bits_per_pixel = node->optional_number_child<int> ("BitsPerPixel");
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-	_encrypted = node->optional_bool_child("Encrypted").get_value_or(false);
-#endif
 }
 
 FFmpegContent::FFmpegContent (vector<shared_ptr<Content> > c)
@@ -194,9 +187,6 @@ FFmpegContent::FFmpegContent (vector<shared_ptr<Content> > c)
 	_color_trc = ref->_color_trc;
 	_colorspace = ref->_colorspace;
 	_bits_per_pixel = ref->_bits_per_pixel;
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-	_encrypted = ref->_encrypted;
-#endif
 }
 
 void
@@ -256,11 +246,6 @@ FFmpegContent::as_xml (xmlpp::Node* node, bool with_paths) const
 	if (_bits_per_pixel) {
 		node->add_child("BitsPerPixel")->add_child_text (raw_convert<string> (*_bits_per_pixel));
 	}
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-	if (_encrypted) {
-		node->add_child("Encypted")->add_child_text ("1");
-	}
-#endif
 }
 
 void
@@ -327,10 +312,6 @@ FFmpegContent::examine (shared_ptr<const Film> film, shared_ptr<Job> job)
 			text.push_back (shared_ptr<TextContent> (new TextContent (this, TEXT_OPEN_SUBTITLE, TEXT_UNKNOWN)));
 			_subtitle_stream = _subtitle_streams.front ();
 		}
-
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-		_encrypted = first_path.extension() == ".ecinema";
-#endif
 	}
 
 	if (examiner->has_video ()) {
@@ -344,10 +325,6 @@ FFmpegContent::examine (shared_ptr<const Film> film, shared_ptr<Job> job)
 		set_video_frame_rate (24000.0 / 1001);
 		video->set_length (video->length() * 24.0 / 30);
 	}
-
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-	_id = examiner->id ();
-#endif
 }
 
 string
@@ -713,30 +690,3 @@ FFmpegContent::take_settings_from (shared_ptr<const Content> c)
 	_filters = fc->_filters;
 }
 
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-void
-FFmpegContent::add_kdm (EncryptedECinemaKDM kdm)
-{
-	ChangeSignaller<Content> cc (this, FFmpegContentProperty::KDM);
-	boost::mutex::scoped_lock lm (_mutex);
-	_kdm = kdm;
-
-}
-
-bool
-FFmpegContent::kdm_timing_window_valid () const
-{
-	if (!_kdm) {
-		return true;
-	}
-
-	DCPOMATIC_ASSERT (Config::instance()->decryption_chain()->key());
-
-	DecryptedECinemaKDM decrypted (*_kdm, *Config::instance()->decryption_chain()->key());
-
-	dcp::LocalTime now;
-	return (!decrypted.not_valid_before() || *decrypted.not_valid_before() < now) &&
-		(!decrypted.not_valid_after() || now < *decrypted.not_valid_after());
-}
-
-#endif