X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_content.cc;h=97e12cc86e69b653239ba6262dbd0ddddee5b006;hb=61e5cbfc5e2f376c544b246e40c5990bc090033f;hp=fcadc91165ab12179b9e1987467fd912115d97fa;hpb=f67bc45820b4e56f90eecb97ba3b7762c119f9b5;p=dcpomatic.git

diff --git a/src/lib/ffmpeg_content.cc b/src/lib/ffmpeg_content.cc
index fcadc9116..97e12cc86 100644
--- a/src/lib/ffmpeg_content.cc
+++ b/src/lib/ffmpeg_content.cc
@@ -45,8 +45,6 @@ extern "C" {
 
 #include "i18n.h"
 
-#define LOG_GENERAL(...) dcpomatic_log->log (String::compose (__VA_ARGS__), LogEntry::TYPE_GENERAL);
-
 using std::string;
 using std::vector;
 using std::list;
@@ -58,10 +56,12 @@ 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)
@@ -126,7 +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");
-	_decryption_key = node->optional_string_child ("DecryptionKey");
 	_encrypted = node->optional_bool_child("Encrypted").get_value_or(false);
 }
 
@@ -249,9 +248,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));
 	}
-	if (_decryption_key) {
-		node->add_child("DecryptionKey")->add_child_text (_decryption_key.get());
-	}
 	if (_encrypted) {
 		node->add_child("Encypted")->add_child_text ("1");
 	}
@@ -263,7 +259,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);
 
@@ -309,7 +307,7 @@ FFmpegContent::examine (shared_ptr<const Film> film, shared_ptr<Job> job)
 
 			AudioStreamPtr as = audio->streams().front();
 			AudioMapping m = as->mapping ();
-			film->make_audio_mapping_default (m, first_path);
+			m.make_default (film ? film->audio_processor() : 0, first_path);
 			as->set_mapping (m);
 		}
 
@@ -326,6 +324,10 @@ FFmpegContent::examine (shared_ptr<const Film> film, shared_ptr<Job> job)
 	if (examiner->has_video ()) {
 		set_default_colour_conversion ();
 	}
+
+#ifdef DCPOMATIC_VARIANT_SWAROOP
+	_id = examiner->id ();
+#endif
 }
 
 string
@@ -407,14 +409,34 @@ 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());
 	}
 
+	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;
+	}
+
+	/* XXX: subtitle content? */
+
+	return DCPTime();
+}
+
+DCPTime
+FFmpegContent::approximate_length () const
+{
+	if (video) {
+		return DCPTime::from_frames (video->length_after_3d_combine(), 24);
+	}
+
 	DCPOMATIC_ASSERT (audio);
 
-	DCPTime longest;
+	Frame longest = 0;
 	BOOST_FOREACH (AudioStreamPtr i, audio->streams ()) {
-		longest = max (longest, DCPTime::from_frames (llrint (i->length() / frc.speed_up), i->frame_rate()));
+		longest = max (longest, Frame(llrint(i->length())));
 	}
 
-	return longest;
+	return DCPTime::from_frames (longest, 24);
 }
 
 void
@@ -492,7 +514,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);
@@ -668,3 +690,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