X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fconfig.cc;h=7364a122c4998c877a7970331840e240c50ec146;hb=5f4a41f20a189ec2863760cd1f5117435277f40f;hp=1d2ef1e40d25f343c8135cfc88f7eb915f7c9f3e;hpb=232ddcc9892a7dfd54efa7533c27c4cfdf71bffd;p=dcpomatic.git

diff --git a/src/lib/config.cc b/src/lib/config.cc
index 1d2ef1e40..7364a122c 100644
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -53,6 +53,7 @@ using std::cout;
 using std::ifstream;
 using std::string;
 using std::list;
+using std::min;
 using std::max;
 using std::remove;
 using std::exception;
@@ -61,7 +62,6 @@ using boost::shared_ptr;
 using boost::optional;
 using boost::dynamic_pointer_cast;
 using boost::algorithm::trim;
-using boost::shared_array;
 using dcp::raw_convert;
 
 Config* Config::_instance = 0;
@@ -94,6 +94,7 @@ Config::set_defaults ()
 	_tms_password = "";
 	_allow_any_dcp_frame_rate = false;
 	_allow_any_container = false;
+	_show_experimental_audio_processors = false;
 	_language = optional<string> ();
 	_default_still_length = 10;
 	_default_container = Ratio::from_id ("185");
@@ -172,6 +173,7 @@ Config::set_defaults ()
 	_player_content_directory = boost::none;
 	_player_playlist_directory = boost::none;
 	_player_kdm_directory = boost::none;
+	_audio_mapping = boost::none;
 #ifdef DCPOMATIC_VARIANT_SWAROOP
 	_player_background_image = boost::none;
 	_kdm_server_url = "http://localhost:8000/{CPL}";
@@ -384,6 +386,7 @@ try
 	_maximum_j2k_bandwidth = f.optional_number_child<int> ("MaximumJ2KBandwidth").get_value_or (250000000);
 	_allow_any_dcp_frame_rate = f.optional_bool_child ("AllowAnyDCPFrameRate").get_value_or (false);
 	_allow_any_container = f.optional_bool_child ("AllowAnyContainer").get_value_or (false);
+	_show_experimental_audio_processors = f.optional_bool_child ("ShowExperimentalAudioProcessors").get_value_or (false);
 
 	_log_types = f.optional_number_child<int> ("LogTypes").get_value_or (LogEntry::TYPE_GENERAL | LogEntry::TYPE_WARNING | LogEntry::TYPE_ERROR);
 	_analyse_ebur128 = f.optional_bool_child("AnalyseEBUR128").get_value_or (true);
@@ -588,6 +591,11 @@ try
 	_player_content_directory = f.optional_string_child("PlayerContentDirectory");
 	_player_playlist_directory = f.optional_string_child("PlayerPlaylistDirectory");
 	_player_kdm_directory = f.optional_string_child("PlayerKDMDirectory");
+
+	if (f.optional_node_child("AudioMapping")) {
+		_audio_mapping = AudioMapping (f.node_child("AudioMapping"), Film::current_state_version);
+	}
+
 #ifdef DCPOMATIC_VARIANT_SWAROOP
 	_player_background_image = f.optional_string_child("PlayerBackgroundImage");
 	_kdm_server_url = f.optional_string_child("KDMServerURL").get_value_or("http://localhost:8000/{CPL}");
@@ -801,6 +809,8 @@ Config::write_config () const
 	root->add_child("AllowAnyDCPFrameRate")->add_child_text (_allow_any_dcp_frame_rate ? "1" : "0");
 	/* [XML] AllowAnyContainer 1 to allow users to user any container ratio for their DCP, 0 to limit the GUI to standard containers. */
 	root->add_child("AllowAnyContainer")->add_child_text (_allow_any_container ? "1" : "0");
+	/* [XML] ShowExperimentalAudioProcessors 1 to offer users the (experimental) audio upmixer processors, 0 to hide them */
+	root->add_child("ShowExperimentalAudioProcessors")->add_child_text (_show_experimental_audio_processors ? "1" : "0");
 	/* [XML] LogTypes Types of logging to write; a bitfield where 1 is general notes, 2 warnings, 4 errors, 8 debug information related
 	   to encoding, 16 debug information related to encoding, 32 debug information for timing purposes, 64 debug information related
 	   to sending email.
@@ -1033,6 +1043,9 @@ Config::write_config () const
 		/* [XML] PlayerKDMDirectory Directory to use for player KDMs in the dual-screen mode. */
 		root->add_child("PlayerKDMDirectory")->add_child_text(_player_kdm_directory->string());
 	}
+	if (_audio_mapping) {
+		_audio_mapping->as_xml (root->add_child("AudioMapping"));
+	}
 #ifdef DCPOMATIC_VARIANT_SWAROOP
 	if (_player_background_image) {
 		root->add_child("PlayerBackgroundImage")->add_child_text(_player_background_image->string());
@@ -1391,3 +1404,53 @@ Config::have_write_permission () const
 	fclose (f);
 	return true;
 }
+
+/** @param  output_channels Number of output channels in use.
+ *  @return Audio mapping for this output channel count (may be a default).
+ */
+AudioMapping
+Config::audio_mapping (int output_channels)
+{
+	if (!_audio_mapping || _audio_mapping->output_channels() != output_channels) {
+		/* Set up a default */
+		_audio_mapping = AudioMapping (MAX_DCP_AUDIO_CHANNELS, output_channels);
+		if (output_channels == 2) {
+			/* Special case for stereo output.
+			   Map so that Lt = L(-3dB) + Ls(-3dB) + C(-6dB) + Lfe(-10dB)
+			   Rt = R(-3dB) + Rs(-3dB) + C(-6dB) + Lfe(-10dB)
+			*/
+			_audio_mapping->set (dcp::LEFT,   0, 1 / sqrt(2));  // L   -> Lt
+			_audio_mapping->set (dcp::RIGHT,  1, 1 / sqrt(2));  // R   -> Rt
+			_audio_mapping->set (dcp::CENTRE, 0, 1 / 2.0);      // C   -> Lt
+			_audio_mapping->set (dcp::CENTRE, 1, 1 / 2.0);      // C   -> Rt
+			_audio_mapping->set (dcp::LFE,    0, 1 / sqrt(10)); // Lfe -> Lt
+			_audio_mapping->set (dcp::LFE,    1, 1 / sqrt(10)); // Lfe -> Rt
+			_audio_mapping->set (dcp::LS,     0, 1 / sqrt(2));  // Ls  -> Lt
+			_audio_mapping->set (dcp::RS,     1, 1 / sqrt(2));  // Rs  -> Rt
+		} else {
+			/* 1:1 mapping */
+			for (int i = 0; i < min (MAX_DCP_AUDIO_CHANNELS, output_channels); ++i) {
+				_audio_mapping->set (i, i, 1);
+			}
+		}
+	}
+
+	return *_audio_mapping;
+}
+
+void
+Config::set_audio_mapping (AudioMapping m)
+{
+	_audio_mapping = m;
+	changed (AUDIO_MAPPING);
+}
+
+void
+Config::set_audio_mapping_to_default ()
+{
+	DCPOMATIC_ASSERT (_audio_mapping);
+	int const ch = _audio_mapping->output_channels ();
+	_audio_mapping = boost::none;
+	_audio_mapping = audio_mapping (ch);
+	changed (AUDIO_MAPPING);
+}