X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_content.cc;h=29ff7e80baeb3f5550f28b674122121f230d381a;hb=c68cf49367957b49a99a9cc04013e9ee5a8c5bfc;hp=f4e4beba923cf4aed67b634831dc334c97ca74d2;hpb=673ba43fb66eb0dee43807501753749f144254a7;p=dcpomatic.git

diff --git a/src/lib/ffmpeg_content.cc b/src/lib/ffmpeg_content.cc
index f4e4beba9..29ff7e80b 100644
--- a/src/lib/ffmpeg_content.cc
+++ b/src/lib/ffmpeg_content.cc
@@ -56,14 +56,18 @@ using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
 using boost::optional;
 using dcp::raw_convert;
+using namespace dcpomatic;
 
 int const FFmpegContentProperty::SUBTITLE_STREAMS = 100;
 int const FFmpegContentProperty::SUBTITLE_STREAM = 101;
 int const FFmpegContentProperty::FILTERS = 102;
+int const FFmpegContentProperty::KDM = 103;
 
 FFmpegContent::FFmpegContent (boost::filesystem::path p)
 	: Content (p)
+#ifdef DCPOMATIC_VARIANT_SWAROOP
 	, _encrypted (false)
+#endif
 {
 
 }
@@ -124,8 +128,9 @@ 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");
-	_decryption_key = node->optional_string_child ("DecryptionKey");
+#ifdef DCPOMATIC_VARIANT_SWAROOP
 	_encrypted = node->optional_bool_child("Encrypted").get_value_or(false);
+#endif
 }
 
 FFmpegContent::FFmpegContent (vector<shared_ptr<Content> > c)
@@ -187,7 +192,9 @@ 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
@@ -247,12 +254,11 @@ 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));
 	}
-	if (_decryption_key) {
-		node->add_child("DecryptionKey")->add_child_text (_decryption_key.get());
-	}
+#ifdef DCPOMATIC_VARIANT_SWAROOP
 	if (_encrypted) {
 		node->add_child("Encypted")->add_child_text ("1");
 	}
+#endif
 }
 
 void
@@ -261,7 +267,9 @@ FFmpegContent::examine (shared_ptr<const Film> film, shared_ptr<Job> job)
 	ChangeSignaller<Content> cc1 (this, FFmpegContentProperty::SUBTITLE_STREAMS);
 	ChangeSignaller<Content> cc2 (this, FFmpegContentProperty::SUBTITLE_STREAM);
 
-	job->set_progress_unknown ();
+	if (job) {
+		job->set_progress_unknown ();
+	}
 
 	Content::examine (film, job);
 
@@ -318,12 +326,18 @@ FFmpegContent::examine (shared_ptr<const Film> film, shared_ptr<Job> job)
 			_subtitle_stream = _subtitle_streams.front ();
 		}
 
+#ifdef DCPOMATIC_VARIANT_SWAROOP
 		_encrypted = first_path.extension() == ".ecinema";
+#endif
 	}
 
 	if (examiner->has_video ()) {
 		set_default_colour_conversion ();
 	}
+
+#ifdef DCPOMATIC_VARIANT_SWAROOP
+	_id = examiner->id ();
+#endif
 }
 
 string
@@ -405,14 +419,17 @@ FFmpegContent::full_length (shared_ptr<const Film> film) const
 		return DCPTime::from_frames (llrint (video->length_after_3d_combine() * frc.factor()), film->video_frame_rate());
 	}
 
-	DCPOMATIC_ASSERT (audio);
-
-	DCPTime longest;
-	BOOST_FOREACH (AudioStreamPtr i, audio->streams ()) {
-		longest = max (longest, DCPTime::from_frames (llrint (i->length() / frc.speed_up), i->frame_rate()));
+	if (audio) {
+		DCPTime longest;
+		BOOST_FOREACH (AudioStreamPtr i, audio->streams()) {
+			longest = max (longest, DCPTime::from_frames(llrint(i->length() / frc.speed_up), i->frame_rate()));
+		}
+		return longest;
 	}
 
-	return longest;
+	/* XXX: subtitle content? */
+
+	return DCPTime();
 }
 
 DCPTime
@@ -507,7 +524,7 @@ FFmpegContent::set_default_colour_conversion ()
 void
 FFmpegContent::add_properties (shared_ptr<const Film> film, list<UserProperty>& p) const
 {
-	Content::add_properties (p);
+	Content::add_properties (film, p);
 
 	if (video) {
 		video->add_properties (p);
@@ -683,3 +700,14 @@ FFmpegContent::take_settings_from (shared_ptr<const Content> c)
 	Content::take_settings_from (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;
+
+}
+#endif