X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fmid_side_decoder.cc;h=b9b8dd098c9459e2524de2633c36520632631956;hp=be82f67542a2e3f5109d08bf6c503398ea7a12c4;hb=HEAD;hpb=f90d74f7a0382f0dc63eef81bd553d7a7b38edb2

diff --git a/src/lib/mid_side_decoder.cc b/src/lib/mid_side_decoder.cc
index be82f6754..d3d85622c 100644
--- a/src/lib/mid_side_decoder.cc
+++ b/src/lib/mid_side_decoder.cc
@@ -1,29 +1,37 @@
 /*
-    Copyright (C) 2014 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 "mid_side_decoder.h"
+
 #include "audio_buffers.h"
+#include "audio_mapping.h"
+#include "mid_side_decoder.h"
 
 #include "i18n.h"
 
+
+using std::make_shared;
+using std::min;
+using std::shared_ptr;
 using std::string;
-using boost::shared_ptr;
+using std::vector;
+
 
 string
 MidSideDecoder::name () const
@@ -31,42 +39,72 @@ MidSideDecoder::name () const
 	return _("Mid-side decoder");
 }
 
+
 string
 MidSideDecoder::id () const
 {
 	return N_("mid-side-decoder");
 }
 
-ChannelCount
-MidSideDecoder::in_channels () const
-{
-	return ChannelCount (2);
-}
 
 int
-MidSideDecoder::out_channels (int) const
+MidSideDecoder::out_channels () const
 {
 	return 3;
 }
 
+
 shared_ptr<AudioProcessor>
 MidSideDecoder::clone (int) const
 {
-	return shared_ptr<AudioProcessor> (new MidSideDecoder ());
+	return make_shared<MidSideDecoder>();
 }
 
+
 shared_ptr<AudioBuffers>
-MidSideDecoder::run (shared_ptr<const AudioBuffers> in)
+MidSideDecoder::run (shared_ptr<const AudioBuffers> in, int channels)
 {
-	shared_ptr<AudioBuffers> out (new AudioBuffers (3, in->frames ()));
+	int const N = min (channels, 3);
+	auto out = make_shared<AudioBuffers>(channels, in->frames ());
 	for (int i = 0; i < in->frames(); ++i) {
-		float const left = in->data()[0][i];
-		float const right = in->data()[1][i];
-		float const mid = (left + right) / 2;
-		out->data()[0][i] = left - mid;
-		out->data()[1][i] = right - mid;
-		out->data()[2][i] = mid;
+		auto const left = in->data()[0][i];
+		auto const right = in->data()[1][i];
+		auto const mid = (left + right) / 2;
+		if (N > 0) {
+			out->data()[0][i] = left - mid;
+		}
+		if (N > 1) {
+			out->data()[1][i] = right - mid;
+		}
+		if (N > 2) {
+			out->data()[2][i] = mid;
+		}
+	}
+
+	for (int i = N; i < channels; ++i) {
+		out->make_silent (i);
 	}
 
 	return out;
 }
+
+
+void
+MidSideDecoder::make_audio_mapping_default (AudioMapping& mapping) const
+{
+	/* Just map the first two input channels to our M/S */
+	mapping.make_zero ();
+	for (int i = 0; i < min(2, mapping.input_channels()); ++i) {
+		mapping.set (i, i, 1);
+	}
+}
+
+
+vector<NamedChannel>
+MidSideDecoder::input_names () const
+{
+	return {
+		NamedChannel(_("Left"), 0),
+		NamedChannel(_("Right"), 1)
+	};
+}