X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fmid_side_decoder.cc;h=6aadea1a2242facca8522cf489621480fb2aec95;hb=bdae32bb84672026c1a373e809804109e95accf4;hp=842d5c8ee56d066b49a2e631cfa73cabd7eb5d88;hpb=972272a73300c4d33ae43d572eb1d11f65e2e544;p=dcpomatic.git

diff --git a/src/lib/mid_side_decoder.cc b/src/lib/mid_side_decoder.cc
index 842d5c8ee..6aadea1a2 100644
--- a/src/lib/mid_side_decoder.cc
+++ b/src/lib/mid_side_decoder.cc
@@ -40,12 +40,6 @@ MidSideDecoder::id () const
 	return N_("mid-side-decoder");
 }
 
-ChannelCount
-MidSideDecoder::in_channels () const
-{
-	return ChannelCount (2);
-}
-
 int
 MidSideDecoder::out_channels () const
 {
@@ -59,16 +53,27 @@ MidSideDecoder::clone (int) const
 }
 
 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);
+	shared_ptr<AudioBuffers> out (new 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;
+		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;