X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Futil.cc;h=f9877523a0d3b4ef4b0ef56fc1163e866fb5f6fc;hb=e4ca6b23d8c5b25725b6b7c1bfe4db3af932dcc0;hp=d04bbdf24cc8b0948b6c45c18591d39f117c1150;hpb=3b31d2d8a129ae6d8d267427bd6b5bc444b40b2a;p=dcpomatic.git

diff --git a/src/lib/util.cc b/src/lib/util.cc
index d04bbdf24..f9877523a 100644
--- a/src/lib/util.cc
+++ b/src/lib/util.cc
@@ -45,6 +45,7 @@
 #include "image.h"
 #include "text_decoder.h"
 #include "job_manager.h"
+#include <dcp/decrypted_kdm.h>
 #include <dcp/locale_convert.h>
 #include <dcp/util.h>
 #include <dcp/raw_convert.h>
@@ -361,7 +362,7 @@ dcpomatic_setup ()
 	/* Add our library directory to the libltdl search path so that
 	   xmlsec can find xmlsec1-openssl.
 	*/
-	boost::filesystem::path lib = app_contents ();
+	boost::filesystem::path lib = directory_containing_executable().parent_path();
 	lib /= "Frameworks";
 	setenv ("LTDL_LIBRARY_PATH", lib.c_str (), 1);
 #endif
@@ -394,7 +395,6 @@ dcpomatic_setup ()
 
 	Ratio::setup_ratios ();
 	PresetColourConversion::setup_colour_conversion_presets ();
-	VideoContentScale::setup_scales ();
 	DCPContentType::setup_dcp_content_types ();
 	Filter::setup_filters ();
 	CinemaSoundProcessor::setup_cinema_sound_processors ();
@@ -823,7 +823,9 @@ remap (shared_ptr<const AudioBuffers> input, int output_channels, AudioMapping m
 	shared_ptr<AudioBuffers> mapped (new AudioBuffers (output_channels, input->frames()));
 	mapped->make_silent ();
 
-	for (int i = 0; i < map.input_channels(); ++i) {
+	int to_do = min (map.input_channels(), input->channels());
+
+	for (int i = 0; i < to_do; ++i) {
 		for (int j = 0; j < mapped->channels(); ++j) {
 			if (map.get (i, static_cast<dcp::Channel> (j)) > 0) {
 				mapped->accumulate_channel (
@@ -1184,3 +1186,47 @@ linear_to_db (double linear)
 	return 20 * log10(linear);
 }
 
+
+dcp::Size
+scale_for_display (dcp::Size s, dcp::Size display_container, dcp::Size film_container)
+{
+	/* Now scale it down if the display container is smaller than the film container */
+	if (display_container != film_container) {
+		float const scale = min (
+			float (display_container.width) / film_container.width,
+			float (display_container.height) / film_container.height
+			);
+
+		s.width = lrintf (s.width * scale);
+		s.height = lrintf (s.height * scale);
+	}
+
+	return s;
+}
+
+
+dcp::DecryptedKDM
+decrypt_kdm_with_helpful_error (dcp::EncryptedKDM kdm)
+{
+	try {
+		return dcp::DecryptedKDM (kdm, Config::instance()->decryption_chain()->key().get());
+	} catch (dcp::KDMDecryptionError& e) {
+		/* Try to flesh out the error a bit */
+		string const kdm_subject_name = kdm.recipient_x509_subject_name();
+		bool on_chain = false;
+		shared_ptr<const dcp::CertificateChain> dc = Config::instance()->decryption_chain();
+		BOOST_FOREACH (dcp::Certificate i, dc->root_to_leaf()) {
+			if (i.subject() == kdm_subject_name) {
+				on_chain = true;
+			}
+		}
+		if (!on_chain) {
+			throw KDMError (_("This KDM was not made for DCP-o-matic's decryption certificate."), e.what());
+		} else if (on_chain && kdm_subject_name != dc->leaf().subject()) {
+			throw KDMError (_("This KDM was made for DCP-o-matic but not for its leaf certificate."), e.what());
+		} else {
+			throw;
+		}
+	}
+}
+