Fix assertion failure when processors return fewer channels than the DCP has.

8 files changed, 47 insertions, 25 deletions

diff --git a/src/lib/analyse_audio_job.h b/src/lib/analyse_audio_job.h
index 4273c19ed..d484bff2c 100644
--- a/src/lib/analyse_audio_job.h
+++ b/src/lib/analyse_audio_job.h
@@ -22,6 +22,7 @@
  */
 
 #include "job.h"
+#include "audio_point.h"
 #include "types.h"
 
 class AudioBuffers;
diff --git a/src/lib/audio_point.h b/src/lib/audio_point.h
index f699233cb..de8538ebe 100644
--- a/src/lib/audio_point.h
+++ b/src/lib/audio_point.h
@@ -17,6 +17,9 @@
 
 */
 
+#ifndef DCPOMATIC_AUDIO_POINT_H
+#define DCPOMATIC_AUDIO_POINT_H
+
 #include <libcxml/cxml.h>
 
 namespace xmlpp {
@@ -46,3 +49,5 @@ public:
 private:
 	float _data[COUNT];
 };
+
+#endif
diff --git a/src/lib/audio_processor.h b/src/lib/audio_processor.h
index 114756f91..2c66d5b07 100644
--- a/src/lib/audio_processor.h
+++ b/src/lib/audio_processor.h
@@ -54,8 +54,8 @@ public:
 	virtual int out_channels () const = 0;
 	/** @return A clone of this AudioProcessor for operation at the specified sampling rate */
 	virtual boost::shared_ptr<AudioProcessor> clone (int sampling_rate) const = 0;
-	/** Process some data, returning the processed result */
-	virtual boost::shared_ptr<AudioBuffers> run (boost::shared_ptr<const AudioBuffers>) = 0;
+	/** Process some data, returning the processed result truncated or padded to `channels' */
+	virtual boost::shared_ptr<AudioBuffers> run (boost::shared_ptr<const AudioBuffers>, int channels) = 0;
 	virtual void flush () {}
 	/** Make the supplied audio mapping into a sensible default for this processor */
 	virtual void make_audio_mapping_default (AudioMapping& mapping) const = 0;
diff --git a/src/lib/mid_side_decoder.cc b/src/lib/mid_side_decoder.cc
index 842d5c8ee..4f619ad57 100644
--- a/src/lib/mid_side_decoder.cc
+++ b/src/lib/mid_side_decoder.cc
@@ -59,16 +59,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;
diff --git a/src/lib/mid_side_decoder.h b/src/lib/mid_side_decoder.h
index 197c7b33b..13e5ca360 100644
--- a/src/lib/mid_side_decoder.h
+++ b/src/lib/mid_side_decoder.h
@@ -27,7 +27,7 @@ public:
 	ChannelCount in_channels () const;
 	int out_channels () const;
 	boost::shared_ptr<AudioProcessor> clone (int) const;
-	boost::shared_ptr<AudioBuffers> run (boost::shared_ptr<const AudioBuffers>);
+	boost::shared_ptr<AudioBuffers> run (boost::shared_ptr<const AudioBuffers>, int channels);
 	void make_audio_mapping_default (AudioMapping& mapping) const;
 	std::vector<std::string> input_names () const;
 };
diff --git a/src/lib/player.cc b/src/lib/player.cc
index 302ab161c..acf977def 100644
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -508,7 +508,7 @@ Player::get_audio (DCPTime time, DCPTime length, bool accurate)
 			}
 
 			if (_audio_processor) {
-				dcp_mapped = _audio_processor->run (dcp_mapped);
+				dcp_mapped = _audio_processor->run (dcp_mapped, _film->audio_channels ());
 			}
 
 			all.audio = dcp_mapped;
diff --git a/src/lib/upmixer_a.cc b/src/lib/upmixer_a.cc
index 1edc0104d..e6ec09c6a 100644
--- a/src/lib/upmixer_a.cc
+++ b/src/lib/upmixer_a.cc
@@ -71,7 +71,7 @@ UpmixerA::clone (int sampling_rate) const
 }
 
 shared_ptr<AudioBuffers>
-UpmixerA::run (shared_ptr<const AudioBuffers> in)
+UpmixerA::run (shared_ptr<const AudioBuffers> in, int channels)
 {
 	/* Input L and R */
 	shared_ptr<AudioBuffers> in_L = in->channel (0);
@@ -83,20 +83,25 @@ UpmixerA::run (shared_ptr<const AudioBuffers> in)
 	in_LR->apply_gain (0.5);
 
 	/* Run filters */
-	shared_ptr<AudioBuffers> L = _left.run (in_L);
-	shared_ptr<AudioBuffers> R = _right.run (in_R);
-	shared_ptr<AudioBuffers> C = _centre.run (in_LR);
-	shared_ptr<AudioBuffers> Lfe = _lfe.run (in_LR);
-	shared_ptr<AudioBuffers> Ls = _ls.run (in_L);
-	shared_ptr<AudioBuffers> Rs = _rs.run (in_R);
-
-	shared_ptr<AudioBuffers> out (new AudioBuffers (6, in->frames ()));
-	out->copy_channel_from (L.get(), 0, 0);
-	out->copy_channel_from (R.get(), 0, 1);
-	out->copy_channel_from (C.get(), 0, 2);
-	out->copy_channel_from (Lfe.get(), 0, 3);
-	out->copy_channel_from (Ls.get(), 0, 4);
-	out->copy_channel_from (Rs.get(), 0, 5);
+	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 ()));
+	int const N = min (channels, 6);
+
+	for (int i = 0; i < N; ++i) {
+		out->copy_channel_from (all_out[i].get(), 0, i);
+	}
+
+	for (int i = N; i < channels; ++i) {
+		out->make_silent (i);
+	}
+
 	return out;
 }
 
diff --git a/src/lib/upmixer_a.h b/src/lib/upmixer_a.h
index 389d52d25..a25c3a329 100644
--- a/src/lib/upmixer_a.h
+++ b/src/lib/upmixer_a.h
@@ -37,7 +37,7 @@ public:
 	ChannelCount in_channels () const;
 	int out_channels () const;
 	boost::shared_ptr<AudioProcessor> clone (int) const;
-	boost::shared_ptr<AudioBuffers> run (boost::shared_ptr<const AudioBuffers>);
+	boost::shared_ptr<AudioBuffers> run (boost::shared_ptr<const AudioBuffers>, int channels);
 	void flush ();
 	void make_audio_mapping_default (AudioMapping& mapping) const;
 	std::vector<std::string> input_names () const;