X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Faudio_mapping.cc;h=f07d5deced4a9f4e0f5c0a0115f0ecf4c5bfb3e5;hp=d0aa33657fb383c9fbddcdde996186a9485e4b92;hb=f0c10e92b849566e458bc323f8783a6fe83e52d2;hpb=a183c1776cfd020a37d028ebb0f641352f49697b

diff --git a/src/lib/audio_mapping.cc b/src/lib/audio_mapping.cc
index d0aa33657..f07d5dece 100644
--- a/src/lib/audio_mapping.cc
+++ b/src/lib/audio_mapping.cc
@@ -1,118 +1,242 @@
-/* -*- c-basic-offset: 8; default-tab-width: 8; -*- */
-
 /*
-    Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2018 Carl Hetherington <cth@carlh.net>
+
+    This file is part of DCP-o-matic.
 
-    This program is free software; you can redistribute it and/or modify
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
-#include <boost/lexical_cast.hpp>
-#include <libxml++/libxml++.h>
-#include <libcxml/cxml.h>
 #include "audio_mapping.h"
+#include "util.h"
+#include "digester.h"
+#include "audio_processor.h"
+#include <dcp/raw_convert.h>
+#include <libcxml/cxml.h>
+#include <libxml++/libxml++.h>
+#include <boost/regex.hpp>
+#include <iostream>
 
 using std::list;
 using std::cout;
 using std::make_pair;
 using std::pair;
 using std::string;
+using std::min;
+using std::vector;
+using std::abs;
 using boost::shared_ptr;
-using boost::lexical_cast;
 using boost::dynamic_pointer_cast;
+using boost::optional;
+using dcp::raw_convert;
 
 AudioMapping::AudioMapping ()
+	: _input_channels (0)
+	, _output_channels (0)
 {
 
 }
 
-/** Create a default AudioMapping for a given channel count.
- *  @param c Number of channels.
+/** Create an empty AudioMapping.
+ *  @param input_channels Number of input channels.
+ *  @param output_channels Number of output channels.
  */
-AudioMapping::AudioMapping (int c)
+AudioMapping::AudioMapping (int input_channels, int output_channels)
+{
+	setup (input_channels, output_channels);
+}
+
+void
+AudioMapping::setup (int input_channels, int output_channels)
+{
+	_input_channels = input_channels;
+	_output_channels = output_channels;
+
+	_gain.resize (_input_channels);
+	for (int i = 0; i < _input_channels; ++i) {
+		_gain[i].resize (_output_channels);
+	}
+
+	make_zero ();
+}
+
+void
+AudioMapping::make_zero ()
+{
+	for (int i = 0; i < _input_channels; ++i) {
+		for (int j = 0; j < _output_channels; ++j) {
+			_gain[i][j] = 0;
+		}
+	}
+}
+
+void
+AudioMapping::make_default (AudioProcessor const * processor, optional<boost::filesystem::path> filename)
 {
-	if (c == 1) {
-		/* Mono -> Centre */
-		add (0, libdcp::CENTRE);
+	static string const regex[] = {
+		".*[\\._-]L[\\._-].*",
+		".*[\\._-]R[\\._-].*",
+		".*[\\._-]C[\\._-].*",
+		".*[\\._-]Lfe[\\._-].*",
+		".*[\\._-]Ls[\\._-].*",
+		".*[\\._-]Rs[\\._-].*"
+	};
+
+	static int const regexes = sizeof(regex) / sizeof(*regex);
+
+	if (processor) {
+		processor->make_audio_mapping_default (*this);
 	} else {
-		/* 1:1 mapping */
-		for (int i = 0; i < c; ++i) {
-			add (i, static_cast<libdcp::Channel> (i));
+		make_zero ();
+		if (input_channels() == 1) {
+			bool guessed = false;
+
+			/* See if we can guess where this stream should go */
+			if (filename) {
+				for (int i = 0; i < regexes; ++i) {
+					boost::regex e (regex[i], boost::regex::icase);
+					if (boost::regex_match(filename->string(), e) && i < output_channels()) {
+						set (0, i, 1);
+						guessed = true;
+					}
+				}
+			}
+
+			if (!guessed) {
+				/* If we have no idea, just put it on centre */
+				set (0, static_cast<int>(dcp::CENTRE), 1);
+			}
+		} else {
+			/* 1:1 mapping */
+			for (int i = 0; i < min (input_channels(), output_channels()); ++i) {
+				set (i, i, 1);
+			}
 		}
 	}
 }
 
-AudioMapping::AudioMapping (shared_ptr<const cxml::Node> node)
+AudioMapping::AudioMapping (cxml::ConstNodePtr node, int state_version)
 {
-	list<shared_ptr<cxml::Node> > const c = node->node_children ("Map");
-	for (list<shared_ptr<cxml::Node> >::const_iterator i = c.begin(); i != c.end(); ++i) {
-		add ((*i)->number_child<int> ("ContentIndex"), static_cast<libdcp::Channel> ((*i)->number_child<int> ("DCP")));
+	if (state_version < 32) {
+		setup (node->number_child<int> ("ContentChannels"), MAX_DCP_AUDIO_CHANNELS);
+	} else {
+		setup (node->number_child<int> ("InputChannels"), node->number_child<int> ("OutputChannels"));
+	}
+
+	if (state_version <= 5) {
+		/* Old-style: on/off mapping */
+		list<cxml::NodePtr> const c = node->node_children ("Map");
+		for (list<cxml::NodePtr>::const_iterator i = c.begin(); i != c.end(); ++i) {
+			set ((*i)->number_child<int> ("ContentIndex"), static_cast<dcp::Channel> ((*i)->number_child<int> ("DCP")), 1);
+		}
+	} else {
+		list<cxml::NodePtr> const c = node->node_children ("Gain");
+		for (list<cxml::NodePtr>::const_iterator i = c.begin(); i != c.end(); ++i) {
+			if (state_version < 32) {
+				set (
+					(*i)->number_attribute<int> ("Content"),
+					static_cast<dcp::Channel> ((*i)->number_attribute<int> ("DCP")),
+					raw_convert<float> ((*i)->content ())
+					);
+			} else {
+				set (
+					(*i)->number_attribute<int> ("Input"),
+					(*i)->number_attribute<int> ("Output"),
+					raw_convert<float> ((*i)->content ())
+					);
+			}
+		}
 	}
 }
 
 void
-AudioMapping::add (int c, libdcp::Channel d)
+AudioMapping::set (int input_channel, int output_channel, float g)
 {
-	_content_to_dcp.push_back (make_pair (c, d));
+	DCPOMATIC_ASSERT (input_channel < int(_gain.size()));
+	DCPOMATIC_ASSERT (output_channel < int(_gain[0].size()));
+	_gain[input_channel][output_channel] = g;
 }
 
-list<int>
-AudioMapping::dcp_to_content (libdcp::Channel d) const
+float
+AudioMapping::get (int input_channel, int output_channel) const
+{
+	DCPOMATIC_ASSERT (input_channel < int (_gain.size()));
+	DCPOMATIC_ASSERT (output_channel < int (_gain[0].size()));
+	return _gain[input_channel][output_channel];
+}
+
+void
+AudioMapping::as_xml (xmlpp::Node* node) const
 {
-	list<int> c;
-	for (list<pair<int, libdcp::Channel> >::const_iterator i = _content_to_dcp.begin(); i != _content_to_dcp.end(); ++i) {
-		if (i->second == d) {
-			c.push_back (i->first);
+	node->add_child ("InputChannels")->add_child_text (raw_convert<string> (_input_channels));
+	node->add_child ("OutputChannels")->add_child_text (raw_convert<string> (_output_channels));
+
+	for (int c = 0; c < _input_channels; ++c) {
+		for (int d = 0; d < _output_channels; ++d) {
+			xmlpp::Element* t = node->add_child ("Gain");
+			t->set_attribute ("Input", raw_convert<string> (c));
+			t->set_attribute ("Output", raw_convert<string> (d));
+			t->add_child_text (raw_convert<string> (get (c, d)));
 		}
 	}
-
-	return c;
 }
 
-list<int>
-AudioMapping::content_channels () const
+/** @return a string which is unique for a given AudioMapping configuration, for
+ *  differentiation between different AudioMappings.
+ */
+string
+AudioMapping::digest () const
 {
-	list<int> c;
-	for (list<pair<int, libdcp::Channel> >::const_iterator i = _content_to_dcp.begin(); i != _content_to_dcp.end(); ++i) {
-		if (find (c.begin(), c.end(), i->first) == c.end ()) {
-			c.push_back (i->first);
+	Digester digester;
+	digester.add (_input_channels);
+	digester.add (_output_channels);
+	for (int i = 0; i < _input_channels; ++i) {
+		for (int j = 0; j < _output_channels; ++j) {
+			digester.add (_gain[i][j]);
 		}
 	}
 
-	return c;
+	return digester.get ();
 }
 
-list<libdcp::Channel>
-AudioMapping::content_to_dcp (int c) const
+list<int>
+AudioMapping::mapped_output_channels () const
 {
-	list<libdcp::Channel> d;
-	for (list<pair<int, libdcp::Channel> >::const_iterator i = _content_to_dcp.begin(); i != _content_to_dcp.end(); ++i) {
-		if (i->first == c) {
-			d.push_back (i->second);
+	static float const minus_96_db = 0.000015849;
+
+	list<int> mapped;
+
+	for (vector<vector<float> >::const_iterator i = _gain.begin(); i != _gain.end(); ++i) {
+		for (size_t j = 0; j < i->size(); ++j) {
+			if (abs ((*i)[j]) > minus_96_db) {
+				mapped.push_back (j);
+			}
 		}
 	}
 
-	return d;
+	mapped.sort ();
+	mapped.unique ();
+
+	return mapped;
 }
 
 void
-AudioMapping::as_xml (xmlpp::Node* node) const
+AudioMapping::unmap_all ()
 {
-	for (list<pair<int, libdcp::Channel> >::const_iterator i = _content_to_dcp.begin(); i != _content_to_dcp.end(); ++i) {
-		xmlpp::Node* t = node->add_child ("Map");
-		t->add_child ("ContentIndex")->add_child_text (lexical_cast<string> (i->first));
-		t->add_child ("DCP")->add_child_text (lexical_cast<string> (i->second));
+	for (vector<vector<float> >::iterator i = _gain.begin(); i != _gain.end(); ++i) {
+		for (vector<float>::iterator j = i->begin(); j != i->end(); ++j) {
+			*j = 0;
+		}
 	}
 }