Fix truncated log timestamps in at least some cases.

[dcpomatic.git] / src / lib / mid_side_decoder.cc

diff --git a/src/lib/mid_side_decoder.cc b/src/lib/mid_side_decoder.cc
index be82f67542a2e3f5109d08bf6c503398ea7a12c4..6aadea1a2242facca8522cf489621480fb2aec95 100644 (file)
--- a/src/lib/mid_side_decoder.cc
+++ b/src/lib/mid_side_decoder.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -19,10 +19,13 @@
 
 #include "mid_side_decoder.h"
 #include "audio_buffers.h"
+#include "audio_mapping.h"
 
 #include "i18n.h"
 
 using std::string;
+using std::min;
+using std::vector;
 using boost::shared_ptr;
 
 string
@@ -37,14 +40,8 @@ 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;
 }
@@ -56,17 +53,49 @@ 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;
 }
+
+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<string>
+MidSideDecoder::input_names () const
+{
+       vector<string> n;
+
+       n.push_back (_("Left"));
+       n.push_back (_("Right"));
+
+       return n;
+}