X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fupmixer_a.cc;h=f402b6691fc982fc180302d9792c9f8d395559b6;hb=037b18b34e3e3fd9b9e692d85f35de17ab67aff8;hp=a5850cf946f65b6e6efdd97f02fc566f08b5933d;hpb=dc27e49291d1d4d0bafee8f26e9c204270a4a2d2;p=dcpomatic.git

diff --git a/src/lib/upmixer_a.cc b/src/lib/upmixer_a.cc
index a5850cf94..f402b6691 100644
--- a/src/lib/upmixer_a.cc
+++ b/src/lib/upmixer_a.cc
@@ -1,44 +1,50 @@
 /*
-    Copyright (C) 2014-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2021 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    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 "upmixer_a.h"
 #include "audio_buffers.h"
 #include "audio_mapping.h"
 
 #include "i18n.h"
 
-using std::string;
+
+using std::make_shared;
 using std::min;
+using std::shared_ptr;
+using std::string;
 using std::vector;
-using boost::shared_ptr;
+
 
 UpmixerA::UpmixerA (int sampling_rate)
 	: _left (0.02, 1900.0 / sampling_rate, 4800.0 / sampling_rate)
 	, _right (0.02, 1900.0 / sampling_rate, 4800.0 / sampling_rate)
-	, _centre (0.02, 150.0 / sampling_rate, 1900.0 / sampling_rate)
-	, _lfe (0.02, 20.0 / sampling_rate, 150.0 / sampling_rate)
+	, _centre (0.01, 150.0 / sampling_rate, 1900.0 / sampling_rate)
+	, _lfe (0.01, 150.0 / sampling_rate)
 	, _ls (0.02, 4800.0 / sampling_rate, 20000.0 / sampling_rate)
 	, _rs (0.02, 4800.0 / sampling_rate, 20000.0 / sampling_rate)
 {
 
 }
 
+
 string
 UpmixerA::name () const
 {
@@ -52,40 +58,43 @@ UpmixerA::id () const
 	return N_("stereo-5.1-upmix-a");
 }
 
+
 int
 UpmixerA::out_channels () const
 {
 	return 6;
 }
 
+
 shared_ptr<AudioProcessor>
 UpmixerA::clone (int sampling_rate) const
 {
-	return shared_ptr<AudioProcessor> (new UpmixerA (sampling_rate));
+	return make_shared<UpmixerA>(sampling_rate);
 }
 
+
 shared_ptr<AudioBuffers>
 UpmixerA::run (shared_ptr<const AudioBuffers> in, int channels)
 {
 	/* Input L and R */
-	shared_ptr<AudioBuffers> in_L = in->channel (0);
-	shared_ptr<AudioBuffers> in_R = in->channel (1);
+	auto in_L = in->channel (0);
+	auto in_R = in->channel (1);
 
-	/* Mix of L and R */
-	shared_ptr<AudioBuffers> in_LR = in_L->clone ();
-	in_LR->accumulate_frames (in_R.get(), 0, 0, in_R->frames ());
-	in_LR->apply_gain (0.5);
+	/* Mix of L and R; -6dB down in amplitude (3dB in terms of power) */
+	auto in_LR = in_L->clone ();
+	in_LR->accumulate_frames (in_R.get(), in_R->frames(), 0, 0);
+	in_LR->apply_gain (-6);
 
 	/* Run filters */
-	vector<shared_ptr<AudioBuffers> > all_out;
-	all_out.push_back (_left.run (in_L));
-	all_out.push_back (_right.run (in_R));
-	all_out.push_back (_centre.run (in_LR));
-	all_out.push_back (_lfe.run (in_LR));
-	all_out.push_back (_ls.run (in_L));
-	all_out.push_back (_rs.run (in_R));
-
-	shared_ptr<AudioBuffers> out (new AudioBuffers (channels, in->frames ()));
+	vector<shared_ptr<AudioBuffers>> all_out;
+	all_out.push_back (_left.run(in_L));
+	all_out.push_back (_right.run(in_R));
+	all_out.push_back (_centre.run(in_LR));
+	all_out.push_back (_lfe.run(in_LR));
+	all_out.push_back (_ls.run(in_L));
+	all_out.push_back (_rs.run(in_R));
+
+	auto out = make_shared<AudioBuffers>(channels, in->frames());
 	int const N = min (channels, 6);
 
 	for (int i = 0; i < N; ++i) {
@@ -110,6 +119,7 @@ UpmixerA::flush ()
 	_rs.flush ();
 }
 
+
 void
 UpmixerA::make_audio_mapping_default (AudioMapping& mapping) const
 {
@@ -120,11 +130,12 @@ UpmixerA::make_audio_mapping_default (AudioMapping& mapping) const
 	}
 }
 
-vector<string>
+
+vector<NamedChannel>
 UpmixerA::input_names () const
 {
-	vector<string> n;
-	n.push_back (_("Upmix L"));
-	n.push_back (_("Upmix R"));
-	return n;
+	return {
+		NamedChannel(_("Upmix L"), 0),
+		NamedChannel(_("Upmix R"), 1)
+	};
 }