X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Futil.cc;h=909a93ba8a368aadb8b241571a1a6ad640a1edc8;hb=35c5230d4fac9bbf21be2ede232219ae619d071d;hp=574d1d8894a94b9a6735e81b2246b9632dc8f2b8;hpb=67a68bd971ebe1b35daa3f75873b4ccb53c00ba0;p=dcpomatic.git

diff --git a/src/lib/util.cc b/src/lib/util.cc
index 574d1d889..909a93ba8 100644
--- a/src/lib/util.cc
+++ b/src/lib/util.cc
@@ -36,6 +36,7 @@
 #include "digester.h"
 #include "audio_processor.h"
 #include "compose.hpp"
+#include "audio_buffers.h"
 #include <dcp/locale_convert.h>
 #include <dcp/util.h>
 #include <dcp/raw_convert.h>
@@ -44,6 +45,7 @@
 #include <dcp/subtitle_asset.h>
 extern "C" {
 #include <libavfilter/avfilter.h>
+#include <libavformat/avformat.h>
 #include <libavcodec/avcodec.h>
 }
 #include <curl/curl.h>
@@ -88,6 +90,7 @@ using std::pair;
 using std::cout;
 using std::bad_alloc;
 using std::set_terminate;
+using std::make_pair;
 using boost::shared_ptr;
 using boost::thread;
 using boost::optional;
@@ -101,6 +104,7 @@ using dcp::locale_convert;
  *  in during App::onInit().
  */
 string program_name;
+bool is_batch_converter = false;
 static boost::thread::id ui_thread;
 static boost::filesystem::path backtrace_file;
 
@@ -124,6 +128,22 @@ seconds_to_hms (int s)
 	return buffer;
 }
 
+string
+time_to_hmsf (DCPTime time, Frame rate)
+{
+	Frame f = time.frames_round (rate);
+	int s = f / rate;
+	f -= (s * rate);
+	int m = s / 60;
+	s -= m * 60;
+	int h = m / 60;
+	m -= h * 60;
+
+	char buffer[64];
+	snprintf (buffer, sizeof(buffer), "%d:%02d:%02d.%d", h, m, s, static_cast<int>(f));
+	return buffer;
+}
+
 /** @param s Number of seconds.
  *  @return String containing an approximate description of s (e.g. "about 2 hours")
  */
@@ -137,18 +157,27 @@ seconds_to_approximate_hms (int s)
 
 	string ap;
 
-	bool const hours = h > 0;
-	bool const minutes = h < 6 && m > 0;
-	bool const seconds = h == 0 && m < 10 && s > 0;
+	bool hours = h > 0;
+	bool minutes = h < 6 && m > 0;
+	bool seconds = h == 0 && m < 10 && s > 0;
 
-	if (hours) {
-		if (m > 30 && !minutes) {
-			/// TRANSLATORS: h here is an abbreviation for hours
-			ap += locale_convert<string>(h + 1) + _("h");
-		} else {
-			/// TRANSLATORS: h here is an abbreviation for hours
-			ap += locale_convert<string>(h) + _("h");
+	if (m > 30 && !minutes) {
+		/* round up the hours */
+		++h;
+	}
+	if (s > 30 && !seconds) {
+		/* round up the minutes */
+		++m;
+		if (m == 60) {
+			m = 0;
+			minutes = false;
+			++h;
 		}
+	}
+
+	if (hours) {
+		/// TRANSLATORS: h here is an abbreviation for hours
+		ap += locale_convert<string>(h) + _("h");
 
 		if (minutes || seconds) {
 			ap += N_(" ");
@@ -156,14 +185,8 @@ seconds_to_approximate_hms (int s)
 	}
 
 	if (minutes) {
-		/* Minutes */
-		if (s > 30 && !seconds) {
-			/// TRANSLATORS: m here is an abbreviation for minutes
-			ap += locale_convert<string>(m + 1) + _("m");
-		} else {
-			/// TRANSLATORS: m here is an abbreviation for minutes
-			ap += locale_convert<string>(m) + _("m");
-		}
+		/// TRANSLATORS: m here is an abbreviation for minutes
+		ap += locale_convert<string>(m) + _("m");
 
 		if (seconds) {
 			ap += N_(" ");
@@ -322,14 +345,15 @@ dcpomatic_setup ()
 	SetUnhandledExceptionFilter(exception_handler);
 #endif
 
+	av_register_all ();
 	avfilter_register_all ();
 
 #ifdef DCPOMATIC_OSX
-	/* Add our lib directory to the libltdl search path so that
+	/* Add our library directory to the libltdl search path so that
 	   xmlsec can find xmlsec1-openssl.
 	*/
 	boost::filesystem::path lib = app_contents ();
-	lib /= "lib";
+	lib /= "Frameworks";
 	setenv ("LTDL_LIBRARY_PATH", lib.c_str (), 1);
 #endif
 
@@ -553,7 +577,8 @@ valid_image_file (boost::filesystem::path f)
 	return (
 		ext == ".tif" || ext == ".tiff" || ext == ".jpg" || ext == ".jpeg" ||
 		ext == ".png" || ext == ".bmp" || ext == ".tga" || ext == ".dpx" ||
-		ext == ".j2c" || ext == ".j2k" || ext == ".jp2"
+		ext == ".j2c" || ext == ".j2k" || ext == ".jp2" || ext == ".exr" ||
+		ext == ".jpf"
 		);
 }
 
@@ -697,7 +722,7 @@ careful_string_filter (string s)
 	*/
 
 	string out;
-	string const allowed = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz-_%.";
+	string const allowed = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz-_%.+";
 	for (size_t i = 0; i < s.size(); ++i) {
 		if (allowed.find (s[i]) != string::npos) {
 			out += s[i];
@@ -706,3 +731,61 @@ careful_string_filter (string s)
 
 	return out;
 }
+
+/** @param mapped List of mapped audio channels from a Film.
+ *  @param channels Total number of channels in the Film.
+ *  @return First: number of non-LFE channels, second: number of LFE channels.
+ */
+pair<int, int>
+audio_channel_types (list<int> mapped, int channels)
+{
+	int non_lfe = 0;
+	int lfe = 0;
+
+	BOOST_FOREACH (int i, mapped) {
+		if (i >= channels) {
+			/* This channel is mapped but is not included in the DCP */
+			continue;
+		}
+
+		if (static_cast<dcp::Channel> (i) == dcp::LFE) {
+			++lfe;
+		} else {
+			++non_lfe;
+		}
+	}
+
+	return make_pair (non_lfe, lfe);
+}
+
+shared_ptr<AudioBuffers>
+remap (shared_ptr<const AudioBuffers> input, int output_channels, AudioMapping map)
+{
+	shared_ptr<AudioBuffers> mapped (new AudioBuffers (output_channels, input->frames()));
+	mapped->make_silent ();
+
+	for (int i = 0; i < map.input_channels(); ++i) {
+		for (int j = 0; j < mapped->channels(); ++j) {
+			if (map.get (i, static_cast<dcp::Channel> (j)) > 0) {
+				mapped->accumulate_channel (
+					input.get(),
+					i,
+					static_cast<dcp::Channel> (j),
+					map.get (i, static_cast<dcp::Channel> (j))
+					);
+			}
+		}
+	}
+
+	return mapped;
+}
+
+Eyes
+increment_eyes (Eyes e)
+{
+	if (e == EYES_LEFT) {
+		return EYES_RIGHT;
+	}
+
+	return EYES_LEFT;
+}