Fix export, which has been broken since the boost::signals2 changes. Also update Audiographer, bacause of its incomplete sndfile handling. Audiographer is equal to revision 74

git-svn-id: svn://localhost/ardour2/branches/3.0@6760 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 129 insertions, 0 deletions

diff --git a/libs/audiographer/tests/general/deinterleaver_test.cc b/libs/audiographer/tests/general/deinterleaver_test.cc
new file mode 100644
index 0000000000..3d644a3cf1
--- /dev/null
+++ b/libs/audiographer/tests/general/deinterleaver_test.cc
@@ -0,0 +1,129 @@
+#include "tests/utils.h"
+
+#include "audiographer/general/deinterleaver.h"
+
+using namespace AudioGrapher;
+
+class DeInterleaverTest : public CppUnit::TestFixture
+{
+  CPPUNIT_TEST_SUITE (DeInterleaverTest);
+  CPPUNIT_TEST (testUninitialized);
+  CPPUNIT_TEST (testInvalidOutputIndex);
+  CPPUNIT_TEST (testInvalidInputSize);
+  CPPUNIT_TEST (testOutputSize);
+  CPPUNIT_TEST (testZeroInput);
+  CPPUNIT_TEST_SUITE_END ();
+
+  public:
+	void setUp()
+	{
+		channels = 3;
+		frames_per_channel = 128;
+		total_frames = channels * frames_per_channel;
+		random_data = TestUtils::init_random_data (total_frames, 1.0);
+
+		deinterleaver.reset (new DeInterleaver<float>());
+		sink_a.reset (new VectorSink<float>());
+		sink_b.reset (new VectorSink<float>());
+		sink_c.reset (new VectorSink<float>());
+	}
+
+	void tearDown()
+	{
+		delete [] random_data;
+	}
+
+	void testUninitialized()
+	{
+		deinterleaver.reset (new DeInterleaver<float>());
+		CPPUNIT_ASSERT_THROW (deinterleaver->output(0)->add_output (sink_a), Exception);
+	}
+
+	void testInvalidOutputIndex()
+	{
+		deinterleaver->init (3, frames_per_channel);
+		CPPUNIT_ASSERT_THROW (deinterleaver->output(3)->add_output (sink_a), Exception);
+	}
+
+	void testInvalidInputSize()
+	{
+		deinterleaver->init (channels, frames_per_channel);
+		
+		ProcessContext<float> c (random_data, 2 * total_frames, channels);
+		
+		// Too many, frames % channels == 0
+		CPPUNIT_ASSERT_THROW (deinterleaver->process (c.beginning (total_frames + channels)), Exception);
+		
+		// Too many, frames % channels != 0
+		CPPUNIT_ASSERT_THROW (deinterleaver->process (c.beginning (total_frames + 1)), Exception);
+		
+		// Too few, frames % channels != 0
+		CPPUNIT_ASSERT_THROW (deinterleaver->process (c.beginning (total_frames - 1)), Exception);
+	}
+
+	void assert_outputs (nframes_t expected_frames)
+	{
+		nframes_t generated_frames = 0;
+		
+		generated_frames = sink_a->get_data().size();
+		CPPUNIT_ASSERT_EQUAL (expected_frames, generated_frames);
+		
+		generated_frames = sink_b->get_data().size();
+		CPPUNIT_ASSERT_EQUAL (expected_frames, generated_frames);
+		
+		generated_frames = sink_c->get_data().size();
+		CPPUNIT_ASSERT_EQUAL (expected_frames, generated_frames);
+	}
+
+	void testOutputSize()
+	{
+		deinterleaver->init (channels, frames_per_channel);
+		
+		deinterleaver->output (0)->add_output (sink_a);
+		deinterleaver->output (1)->add_output (sink_b);
+		deinterleaver->output (2)->add_output (sink_c);
+		
+		// Test maximum frame input
+		ProcessContext<float> c (random_data, total_frames, channels);
+		deinterleaver->process (c);
+		assert_outputs (frames_per_channel);
+		
+		// Now with less frames
+		nframes_t const less_frames = frames_per_channel / 4;
+		deinterleaver->process (c.beginning (less_frames * channels));
+		assert_outputs (less_frames);
+	}
+	
+	void testZeroInput()
+	{
+		deinterleaver->init (channels, frames_per_channel);
+		
+		deinterleaver->output (0)->add_output (sink_a);
+		deinterleaver->output (1)->add_output (sink_b);
+		deinterleaver->output (2)->add_output (sink_c);
+		
+		// Input zero frames
+		ProcessContext<float> c (random_data, total_frames, channels);
+		deinterleaver->process (c.beginning (0));
+		
+		// ...and now test regular input
+		deinterleaver->process (c);
+		assert_outputs (frames_per_channel);
+	}
+
+
+  private:
+	boost::shared_ptr<DeInterleaver<float> > deinterleaver;
+
+	boost::shared_ptr<VectorSink<float> > sink_a;
+	boost::shared_ptr<VectorSink<float> > sink_b;
+	boost::shared_ptr<VectorSink<float> > sink_c;
+
+	float * random_data;
+	nframes_t frames_per_channel;
+	nframes_t total_frames;
+	unsigned int channels;
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION (DeInterleaverTest);
+