diff options
Diffstat (limited to 'libs/audiographer/tests/general')
10 files changed, 349 insertions, 349 deletions
diff --git a/libs/audiographer/tests/general/chunker_test.cc b/libs/audiographer/tests/general/chunker_test.cc index 12b5da5dbc..b7896e23e6 100644 --- a/libs/audiographer/tests/general/chunker_test.cc +++ b/libs/audiographer/tests/general/chunker_test.cc @@ -20,10 +20,10 @@ class ChunkerTest : public CppUnit::TestFixture public: void setUp() { - frames = 128; - random_data = TestUtils::init_random_data(frames); + samples = 128; + random_data = TestUtils::init_random_data(samples); sink.reset (new VectorSink<float>()); - chunker.reset (new Chunker<float>(frames * 2)); + chunker.reset (new Chunker<float>(samples * 2)); } void tearDown() @@ -34,119 +34,119 @@ class ChunkerTest : public CppUnit::TestFixture void testSynchronousProcess() { chunker->add_output (sink); - framecnt_t frames_output = 0; + samplecnt_t samples_output = 0; - ProcessContext<float> const context (random_data, frames, 1); + ProcessContext<float> const context (random_data, samples, 1); chunker->process (context); - frames_output = sink->get_data().size(); - CPPUNIT_ASSERT_EQUAL ((framecnt_t) 0, frames_output); + samples_output = sink->get_data().size(); + CPPUNIT_ASSERT_EQUAL ((samplecnt_t) 0, samples_output); chunker->process (context); - frames_output = sink->get_data().size(); - CPPUNIT_ASSERT_EQUAL (2 * frames, frames_output); - CPPUNIT_ASSERT (TestUtils::array_equals (random_data, sink->get_array(), frames)); - CPPUNIT_ASSERT (TestUtils::array_equals (random_data, &sink->get_array()[frames], frames)); + samples_output = sink->get_data().size(); + CPPUNIT_ASSERT_EQUAL (2 * samples, samples_output); + CPPUNIT_ASSERT (TestUtils::array_equals (random_data, sink->get_array(), samples)); + CPPUNIT_ASSERT (TestUtils::array_equals (random_data, &sink->get_array()[samples], samples)); sink->reset(); chunker->process (context); - frames_output = sink->get_data().size(); - CPPUNIT_ASSERT_EQUAL ((framecnt_t) 0, frames_output); + samples_output = sink->get_data().size(); + CPPUNIT_ASSERT_EQUAL ((samplecnt_t) 0, samples_output); chunker->process (context); - frames_output = sink->get_data().size(); - CPPUNIT_ASSERT_EQUAL (2 * frames, frames_output); - CPPUNIT_ASSERT (TestUtils::array_equals (random_data, sink->get_array(), frames)); - CPPUNIT_ASSERT (TestUtils::array_equals (random_data, &sink->get_array()[frames], frames)); + samples_output = sink->get_data().size(); + CPPUNIT_ASSERT_EQUAL (2 * samples, samples_output); + CPPUNIT_ASSERT (TestUtils::array_equals (random_data, sink->get_array(), samples)); + CPPUNIT_ASSERT (TestUtils::array_equals (random_data, &sink->get_array()[samples], samples)); } void testAsynchronousProcess() { - assert (frames % 2 == 0); + assert (samples % 2 == 0); chunker->add_output (sink); - framecnt_t frames_output = 0; + samplecnt_t samples_output = 0; - ProcessContext<float> const half_context (random_data, frames / 2, 1); - ProcessContext<float> const context (random_data, frames, 1); + ProcessContext<float> const half_context (random_data, samples / 2, 1); + ProcessContext<float> const context (random_data, samples, 1); // 0.5 chunker->process (half_context); - frames_output = sink->get_data().size(); - CPPUNIT_ASSERT_EQUAL ((framecnt_t) 0, frames_output); + samples_output = sink->get_data().size(); + CPPUNIT_ASSERT_EQUAL ((samplecnt_t) 0, samples_output); // 1.5 chunker->process (context); - frames_output = sink->get_data().size(); - CPPUNIT_ASSERT_EQUAL ((framecnt_t) 0, frames_output); + samples_output = sink->get_data().size(); + CPPUNIT_ASSERT_EQUAL ((samplecnt_t) 0, samples_output); // 2.5 chunker->process (context); - frames_output = sink->get_data().size(); - CPPUNIT_ASSERT_EQUAL (2 * frames, frames_output); - CPPUNIT_ASSERT (TestUtils::array_equals (random_data, sink->get_array(), frames / 2)); - CPPUNIT_ASSERT (TestUtils::array_equals (random_data, &sink->get_array()[frames / 2], frames)); - CPPUNIT_ASSERT (TestUtils::array_equals (random_data, &sink->get_array()[ 3 * frames / 2], frames / 2)); + samples_output = sink->get_data().size(); + CPPUNIT_ASSERT_EQUAL (2 * samples, samples_output); + CPPUNIT_ASSERT (TestUtils::array_equals (random_data, sink->get_array(), samples / 2)); + CPPUNIT_ASSERT (TestUtils::array_equals (random_data, &sink->get_array()[samples / 2], samples)); + CPPUNIT_ASSERT (TestUtils::array_equals (random_data, &sink->get_array()[ 3 * samples / 2], samples / 2)); sink->reset(); // 3.5 chunker->process (context); - frames_output = sink->get_data().size(); - CPPUNIT_ASSERT_EQUAL ((framecnt_t) 0, frames_output); + samples_output = sink->get_data().size(); + CPPUNIT_ASSERT_EQUAL ((samplecnt_t) 0, samples_output); // 4.0 chunker->process (half_context); - frames_output = sink->get_data().size(); - CPPUNIT_ASSERT_EQUAL (2 * frames, frames_output); - CPPUNIT_ASSERT (TestUtils::array_equals (&random_data[frames / 2], sink->get_array(), frames / 2)); - CPPUNIT_ASSERT (TestUtils::array_equals (random_data, &sink->get_array()[frames / 2], frames)); - CPPUNIT_ASSERT (TestUtils::array_equals (random_data, &sink->get_array()[ 3 * frames / 2], frames / 2)); + samples_output = sink->get_data().size(); + CPPUNIT_ASSERT_EQUAL (2 * samples, samples_output); + CPPUNIT_ASSERT (TestUtils::array_equals (&random_data[samples / 2], sink->get_array(), samples / 2)); + CPPUNIT_ASSERT (TestUtils::array_equals (random_data, &sink->get_array()[samples / 2], samples)); + CPPUNIT_ASSERT (TestUtils::array_equals (random_data, &sink->get_array()[ 3 * samples / 2], samples / 2)); } void testChoppingProcess() { sink.reset (new AppendingVectorSink<float>()); - assert (frames % 2 == 0); - chunker.reset (new Chunker<float>(frames / 4)); + assert (samples % 2 == 0); + chunker.reset (new Chunker<float>(samples / 4)); chunker->add_output (sink); - framecnt_t frames_output = 0; + samplecnt_t samples_output = 0; - ProcessContext<float> const half_context (random_data, frames / 2, 1); - ProcessContext<float> const context (random_data, frames, 1); + ProcessContext<float> const half_context (random_data, samples / 2, 1); + ProcessContext<float> const context (random_data, samples, 1); // 0.5 chunker->process (half_context); - frames_output = sink->get_data().size(); - CPPUNIT_ASSERT_EQUAL ((framecnt_t) frames / 2, frames_output); + samples_output = sink->get_data().size(); + CPPUNIT_ASSERT_EQUAL ((samplecnt_t) samples / 2, samples_output); // 1.5 chunker->process (context); - frames_output = sink->get_data().size(); - CPPUNIT_ASSERT_EQUAL ((framecnt_t) frames / 2 * 3, frames_output); + samples_output = sink->get_data().size(); + CPPUNIT_ASSERT_EQUAL ((samplecnt_t) samples / 2 * 3, samples_output); // 2.5 chunker->process (context); - frames_output = sink->get_data().size(); - CPPUNIT_ASSERT_EQUAL (frames / 2 * 5, frames_output); - CPPUNIT_ASSERT (TestUtils::array_equals (random_data, sink->get_array(), frames / 2)); - CPPUNIT_ASSERT (TestUtils::array_equals (random_data, &sink->get_array()[frames / 2], frames)); - CPPUNIT_ASSERT (TestUtils::array_equals (random_data, &sink->get_array()[ 3 * frames / 2], frames / 2)); + samples_output = sink->get_data().size(); + CPPUNIT_ASSERT_EQUAL (samples / 2 * 5, samples_output); + CPPUNIT_ASSERT (TestUtils::array_equals (random_data, sink->get_array(), samples / 2)); + CPPUNIT_ASSERT (TestUtils::array_equals (random_data, &sink->get_array()[samples / 2], samples)); + CPPUNIT_ASSERT (TestUtils::array_equals (random_data, &sink->get_array()[ 3 * samples / 2], samples / 2)); } void testEndOfInputFlagHandling() { boost::shared_ptr<ProcessContextGrabber<float> > grabber(new ProcessContextGrabber<float>()); - assert (frames % 2 == 0); - chunker.reset (new Chunker<float>(frames)); + assert (samples % 2 == 0); + chunker.reset (new Chunker<float>(samples)); chunker->add_output (grabber); - ProcessContext<float> const half_context (random_data, frames / 2, 1); - ProcessContext<float> const context (random_data, frames, 1); + ProcessContext<float> const half_context (random_data, samples / 2, 1); + ProcessContext<float> const context (random_data, samples, 1); context.set_flag(ProcessContext<>::EndOfInput); // Process 0.5 then 1.0 @@ -158,12 +158,12 @@ class ChunkerTest : public CppUnit::TestFixture ProcessContextGrabber<float>::ContextList::iterator it = grabber->contexts.begin(); // first 1.0 not end of input - CPPUNIT_ASSERT_EQUAL(it->frames(), frames); + CPPUNIT_ASSERT_EQUAL(it->samples(), samples); CPPUNIT_ASSERT(!it->has_flag(ProcessContext<>::EndOfInput)); // Then 0.5 with end of input ++it; - CPPUNIT_ASSERT_EQUAL(it->frames(), frames / 2); + CPPUNIT_ASSERT_EQUAL(it->samples(), samples / 2); CPPUNIT_ASSERT(it->has_flag(ProcessContext<>::EndOfInput)); } @@ -172,7 +172,7 @@ class ChunkerTest : public CppUnit::TestFixture boost::shared_ptr<VectorSink<float> > sink; float * random_data; - framecnt_t frames; + samplecnt_t samples; }; CPPUNIT_TEST_SUITE_REGISTRATION (ChunkerTest); diff --git a/libs/audiographer/tests/general/deinterleaver_test.cc b/libs/audiographer/tests/general/deinterleaver_test.cc index f7e15459b3..66d5362d80 100644 --- a/libs/audiographer/tests/general/deinterleaver_test.cc +++ b/libs/audiographer/tests/general/deinterleaver_test.cc @@ -18,9 +18,9 @@ class DeInterleaverTest : public CppUnit::TestFixture void setUp() { channels = 3; - frames_per_channel = 128; - total_frames = channels * frames_per_channel; - random_data = TestUtils::init_random_data (total_frames, 1.0); + samples_per_channel = 128; + total_samples = channels * samples_per_channel; + random_data = TestUtils::init_random_data (total_samples, 1.0); deinterleaver.reset (new DeInterleaver<float>()); sink_a.reset (new VectorSink<float>()); @@ -41,74 +41,74 @@ class DeInterleaverTest : public CppUnit::TestFixture void testInvalidOutputIndex() { - deinterleaver->init (3, frames_per_channel); + deinterleaver->init (3, samples_per_channel); CPPUNIT_ASSERT_THROW (deinterleaver->output(3)->add_output (sink_a), Exception); } void testInvalidInputSize() { - deinterleaver->init (channels, frames_per_channel); + deinterleaver->init (channels, samples_per_channel); - ProcessContext<float> c (random_data, 2 * total_frames, channels); + ProcessContext<float> c (random_data, 2 * total_samples, channels); - // Too many, frames % channels == 0 - CPPUNIT_ASSERT_THROW (deinterleaver->process (c.beginning (total_frames + channels)), Exception); + // Too many, samples % channels == 0 + CPPUNIT_ASSERT_THROW (deinterleaver->process (c.beginning (total_samples + channels)), Exception); - // Too many, frames % channels != 0 - CPPUNIT_ASSERT_THROW (deinterleaver->process (c.beginning (total_frames + 1)), Exception); + // Too many, samples % channels != 0 + CPPUNIT_ASSERT_THROW (deinterleaver->process (c.beginning (total_samples + 1)), Exception); - // Too few, frames % channels != 0 - CPPUNIT_ASSERT_THROW (deinterleaver->process (c.beginning (total_frames - 1)), Exception); + // Too few, samples % channels != 0 + CPPUNIT_ASSERT_THROW (deinterleaver->process (c.beginning (total_samples - 1)), Exception); } - void assert_outputs (framecnt_t expected_frames) + void assert_outputs (samplecnt_t expected_samples) { - framecnt_t generated_frames = 0; + samplecnt_t generated_samples = 0; - generated_frames = sink_a->get_data().size(); - CPPUNIT_ASSERT_EQUAL (expected_frames, generated_frames); + generated_samples = sink_a->get_data().size(); + CPPUNIT_ASSERT_EQUAL (expected_samples, generated_samples); - generated_frames = sink_b->get_data().size(); - CPPUNIT_ASSERT_EQUAL (expected_frames, generated_frames); + generated_samples = sink_b->get_data().size(); + CPPUNIT_ASSERT_EQUAL (expected_samples, generated_samples); - generated_frames = sink_c->get_data().size(); - CPPUNIT_ASSERT_EQUAL (expected_frames, generated_frames); + generated_samples = sink_c->get_data().size(); + CPPUNIT_ASSERT_EQUAL (expected_samples, generated_samples); } void testOutputSize() { - deinterleaver->init (channels, frames_per_channel); + deinterleaver->init (channels, samples_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); + // Test maximum sample input + ProcessContext<float> c (random_data, total_samples, channels); deinterleaver->process (c); - assert_outputs (frames_per_channel); + assert_outputs (samples_per_channel); - // Now with less frames - framecnt_t const less_frames = frames_per_channel / 4; - deinterleaver->process (c.beginning (less_frames * channels)); - assert_outputs (less_frames); + // Now with less samples + samplecnt_t const less_samples = samples_per_channel / 4; + deinterleaver->process (c.beginning (less_samples * channels)); + assert_outputs (less_samples); } void testZeroInput() { - deinterleaver->init (channels, frames_per_channel); + deinterleaver->init (channels, samples_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); + // Input zero samples + ProcessContext<float> c (random_data, total_samples, channels); deinterleaver->process (c.beginning (0)); // ...and now test regular input deinterleaver->process (c); - assert_outputs (frames_per_channel); + assert_outputs (samples_per_channel); } @@ -120,8 +120,8 @@ class DeInterleaverTest : public CppUnit::TestFixture boost::shared_ptr<VectorSink<float> > sink_c; float * random_data; - framecnt_t frames_per_channel; - framecnt_t total_frames; + samplecnt_t samples_per_channel; + samplecnt_t total_samples; unsigned int channels; }; diff --git a/libs/audiographer/tests/general/interleaver_deinterleaver_test.cc b/libs/audiographer/tests/general/interleaver_deinterleaver_test.cc index 4f46a83492..b16a47a795 100644 --- a/libs/audiographer/tests/general/interleaver_deinterleaver_test.cc +++ b/libs/audiographer/tests/general/interleaver_deinterleaver_test.cc @@ -16,12 +16,12 @@ class InterleaverDeInterleaverTest : public CppUnit::TestFixture void setUp() { channels = 3; - frames_per_channel = 128; - total_frames = channels * frames_per_channel; + samples_per_channel = 128; + total_samples = channels * samples_per_channel; - random_data_a = TestUtils::init_random_data (total_frames, 1.0); - random_data_b = TestUtils::init_random_data (frames_per_channel, 1.0); - random_data_c = TestUtils::init_random_data (frames_per_channel, 1.0); + random_data_a = TestUtils::init_random_data (total_samples, 1.0); + random_data_b = TestUtils::init_random_data (samples_per_channel, 1.0); + random_data_c = TestUtils::init_random_data (samples_per_channel, 1.0); deinterleaver.reset (new DeInterleaver<float>()); interleaver.reset (new Interleaver<float>()); @@ -40,8 +40,8 @@ class InterleaverDeInterleaverTest : public CppUnit::TestFixture void testInterleavedInput() { - deinterleaver->init (channels, frames_per_channel); - interleaver->init (channels, frames_per_channel); + deinterleaver->init (channels, samples_per_channel); + interleaver->init (channels, samples_per_channel); deinterleaver->output (0)->add_output (interleaver->input (0)); deinterleaver->output (1)->add_output (interleaver->input (1)); @@ -50,20 +50,20 @@ class InterleaverDeInterleaverTest : public CppUnit::TestFixture interleaver->add_output (sink_a); // Process and assert - ProcessContext<float> c (random_data_a, total_frames, channels); + ProcessContext<float> c (random_data_a, total_samples, channels); deinterleaver->process (c); - CPPUNIT_ASSERT (TestUtils::array_equals (random_data_a, sink_a->get_array(), total_frames)); + CPPUNIT_ASSERT (TestUtils::array_equals (random_data_a, sink_a->get_array(), total_samples)); // And a second round... - framecnt_t less_frames = (frames_per_channel / 10) * channels; - deinterleaver->process (c.beginning (less_frames)); - CPPUNIT_ASSERT (TestUtils::array_equals (random_data_a, sink_a->get_array(), less_frames)); + samplecnt_t less_samples = (samples_per_channel / 10) * channels; + deinterleaver->process (c.beginning (less_samples)); + CPPUNIT_ASSERT (TestUtils::array_equals (random_data_a, sink_a->get_array(), less_samples)); } void testDeInterleavedInput() { - deinterleaver->init (channels, frames_per_channel); - interleaver->init (channels, frames_per_channel); + deinterleaver->init (channels, samples_per_channel); + interleaver->init (channels, samples_per_channel); interleaver->add_output (deinterleaver); @@ -71,28 +71,28 @@ class InterleaverDeInterleaverTest : public CppUnit::TestFixture deinterleaver->output (1)->add_output (sink_b); deinterleaver->output (2)->add_output (sink_c); - ProcessContext<float> c_a (random_data_a, frames_per_channel, 1); - ProcessContext<float> c_b (random_data_b, frames_per_channel, 1); - ProcessContext<float> c_c (random_data_c, frames_per_channel, 1); + ProcessContext<float> c_a (random_data_a, samples_per_channel, 1); + ProcessContext<float> c_b (random_data_b, samples_per_channel, 1); + ProcessContext<float> c_c (random_data_c, samples_per_channel, 1); // Process and assert interleaver->input (0)->process (c_a); interleaver->input (1)->process (c_b); interleaver->input (2)->process (c_c); - CPPUNIT_ASSERT (TestUtils::array_equals (random_data_a, sink_a->get_array(), frames_per_channel)); - CPPUNIT_ASSERT (TestUtils::array_equals (random_data_b, sink_b->get_array(), frames_per_channel)); - CPPUNIT_ASSERT (TestUtils::array_equals (random_data_c, sink_c->get_array(), frames_per_channel)); + CPPUNIT_ASSERT (TestUtils::array_equals (random_data_a, sink_a->get_array(), samples_per_channel)); + CPPUNIT_ASSERT (TestUtils::array_equals (random_data_b, sink_b->get_array(), samples_per_channel)); + CPPUNIT_ASSERT (TestUtils::array_equals (random_data_c, sink_c->get_array(), samples_per_channel)); // And a second round... - framecnt_t less_frames = frames_per_channel / 5; - interleaver->input (0)->process (c_a.beginning (less_frames)); - interleaver->input (1)->process (c_b.beginning (less_frames)); - interleaver->input (2)->process (c_c.beginning (less_frames)); + samplecnt_t less_samples = samples_per_channel / 5; + interleaver->input (0)->process (c_a.beginning (less_samples)); + interleaver->input (1)->process (c_b.beginning (less_samples)); + interleaver->input (2)->process (c_c.beginning (less_samples)); - CPPUNIT_ASSERT (TestUtils::array_equals (random_data_a, sink_a->get_array(), less_frames)); - CPPUNIT_ASSERT (TestUtils::array_equals (random_data_b, sink_b->get_array(), less_frames)); - CPPUNIT_ASSERT (TestUtils::array_equals (random_data_c, sink_c->get_array(), less_frames)); + CPPUNIT_ASSERT (TestUtils::array_equals (random_data_a, sink_a->get_array(), less_samples)); + CPPUNIT_ASSERT (TestUtils::array_equals (random_data_b, sink_b->get_array(), less_samples)); + CPPUNIT_ASSERT (TestUtils::array_equals (random_data_c, sink_c->get_array(), less_samples)); } @@ -108,8 +108,8 @@ class InterleaverDeInterleaverTest : public CppUnit::TestFixture float * random_data_b; float * random_data_c; - framecnt_t frames_per_channel; - framecnt_t total_frames; + samplecnt_t samples_per_channel; + samplecnt_t total_samples; unsigned int channels; }; diff --git a/libs/audiographer/tests/general/interleaver_test.cc b/libs/audiographer/tests/general/interleaver_test.cc index 0b8f8b6952..7adc0387a8 100644 --- a/libs/audiographer/tests/general/interleaver_test.cc +++ b/libs/audiographer/tests/general/interleaver_test.cc @@ -19,13 +19,13 @@ class InterleaverTest : public CppUnit::TestFixture void setUp() { channels = 3; - frames = 128; - random_data = TestUtils::init_random_data (frames, 1.0); + samples = 128; + random_data = TestUtils::init_random_data (samples, 1.0); interleaver.reset (new Interleaver<float>()); sink.reset (new VectorSink<float>()); - interleaver->init (channels, frames); + interleaver->init (channels, samples); } void tearDown() @@ -36,59 +36,59 @@ class InterleaverTest : public CppUnit::TestFixture void testUninitialized() { interleaver.reset (new Interleaver<float>()); - ProcessContext<float> c (random_data, frames, 1); + ProcessContext<float> c (random_data, samples, 1); CPPUNIT_ASSERT_THROW (interleaver->input(0)->process (c), Exception); } void testInvalidInputIndex() { - ProcessContext<float> c (random_data, frames, 1); + ProcessContext<float> c (random_data, samples, 1); CPPUNIT_ASSERT_THROW (interleaver->input (3)->process (c), Exception); } void testInvalidInputSize() { - ProcessContext<float> c (random_data, frames + 1, 1); + ProcessContext<float> c (random_data, samples + 1, 1); CPPUNIT_ASSERT_THROW (interleaver->input (0)->process (c), Exception); - interleaver->input (0)->process (c.beginning (frames)); - interleaver->input (1)->process (c.beginning (frames)); - CPPUNIT_ASSERT_THROW (interleaver->input (2)->process (c.beginning (frames - 1)), Exception); + interleaver->input (0)->process (c.beginning (samples)); + interleaver->input (1)->process (c.beginning (samples)); + CPPUNIT_ASSERT_THROW (interleaver->input (2)->process (c.beginning (samples - 1)), Exception); - interleaver->input (0)->process (c.beginning (frames - 1)); - interleaver->input (1)->process (c.beginning (frames - 1)); - CPPUNIT_ASSERT_THROW (interleaver->input (2)->process (c.beginning (frames)), Exception); + interleaver->input (0)->process (c.beginning (samples - 1)); + interleaver->input (1)->process (c.beginning (samples - 1)); + CPPUNIT_ASSERT_THROW (interleaver->input (2)->process (c.beginning (samples)), Exception); } void testOutputSize() { interleaver->add_output (sink); - ProcessContext<float> c (random_data, frames, 1); + ProcessContext<float> c (random_data, samples, 1); interleaver->input (0)->process (c); interleaver->input (1)->process (c); interleaver->input (2)->process (c); - framecnt_t expected_frames = frames * channels; - framecnt_t generated_frames = sink->get_data().size(); - CPPUNIT_ASSERT_EQUAL (expected_frames, generated_frames); + samplecnt_t expected_samples = samples * channels; + samplecnt_t generated_samples = sink->get_data().size(); + CPPUNIT_ASSERT_EQUAL (expected_samples, generated_samples); - framecnt_t less_frames = frames / 2; - interleaver->input (0)->process (c.beginning (less_frames)); - interleaver->input (1)->process (c.beginning (less_frames)); - interleaver->input (2)->process (c.beginning (less_frames)); + samplecnt_t less_samples = samples / 2; + interleaver->input (0)->process (c.beginning (less_samples)); + interleaver->input (1)->process (c.beginning (less_samples)); + interleaver->input (2)->process (c.beginning (less_samples)); - expected_frames = less_frames * channels; - generated_frames = sink->get_data().size(); - CPPUNIT_ASSERT_EQUAL (expected_frames, generated_frames); + expected_samples = less_samples * channels; + generated_samples = sink->get_data().size(); + CPPUNIT_ASSERT_EQUAL (expected_samples, generated_samples); } void testZeroInput() { interleaver->add_output (sink); - // input zero frames to all inputs - ProcessContext<float> c (random_data, frames, 1); + // input zero samples to all inputs + ProcessContext<float> c (random_data, samples, 1); interleaver->input (0)->process (c.beginning (0)); interleaver->input (1)->process (c.beginning (0)); interleaver->input (2)->process (c.beginning (0)); @@ -100,15 +100,15 @@ class InterleaverTest : public CppUnit::TestFixture interleaver->input (1)->process (c); interleaver->input (2)->process (c); - framecnt_t expected_frames = frames * channels; - framecnt_t generated_frames = sink->get_data().size(); - CPPUNIT_ASSERT_EQUAL (expected_frames, generated_frames); + samplecnt_t expected_samples = samples * channels; + samplecnt_t generated_samples = sink->get_data().size(); + CPPUNIT_ASSERT_EQUAL (expected_samples, generated_samples); } void testChannelSync() { interleaver->add_output (sink); - ProcessContext<float> c (random_data, frames, 1); + ProcessContext<float> c (random_data, samples, 1); interleaver->input (0)->process (c); CPPUNIT_ASSERT_THROW (interleaver->input (0)->process (c), Exception); } @@ -119,9 +119,9 @@ class InterleaverTest : public CppUnit::TestFixture boost::shared_ptr<VectorSink<float> > sink; - framecnt_t channels; + samplecnt_t channels; float * random_data; - framecnt_t frames; + samplecnt_t samples; }; CPPUNIT_TEST_SUITE_REGISTRATION (InterleaverTest); diff --git a/libs/audiographer/tests/general/normalizer_test.cc b/libs/audiographer/tests/general/normalizer_test.cc index fb8cd617c2..74df980028 100644 --- a/libs/audiographer/tests/general/normalizer_test.cc +++ b/libs/audiographer/tests/general/normalizer_test.cc @@ -14,7 +14,7 @@ class NormalizerTest : public CppUnit::TestFixture public: void setUp() { - frames = 1024; + samples = 1024; } void tearDown() @@ -25,23 +25,23 @@ class NormalizerTest : public CppUnit::TestFixture void testConstAmplify() { float target = 0.0; - random_data = TestUtils::init_random_data(frames, 0.5); + random_data = TestUtils::init_random_data(samples, 0.5); normalizer.reset (new Normalizer(target)); peak_reader.reset (new PeakReader()); sink.reset (new VectorSink<float>()); - ProcessContext<float> const c (random_data, frames, 1); + ProcessContext<float> const c (random_data, samples, 1); peak_reader->process (c); float peak = peak_reader->get_peak(); - normalizer->alloc_buffer (frames); + normalizer->alloc_buffer (samples); normalizer->set_peak (peak); normalizer->add_output (sink); normalizer->process (c); peak_reader->reset(); - ConstProcessContext<float> normalized (sink->get_array(), frames, 1); + ConstProcessContext<float> normalized (sink->get_array(), samples, 1); peak_reader->process (normalized); peak = peak_reader->get_peak(); @@ -54,7 +54,7 @@ class NormalizerTest : public CppUnit::TestFixture boost::shared_ptr<VectorSink<float> > sink; float * random_data; - framecnt_t frames; + samplecnt_t samples; }; CPPUNIT_TEST_SUITE_REGISTRATION (NormalizerTest); diff --git a/libs/audiographer/tests/general/peak_reader_test.cc b/libs/audiographer/tests/general/peak_reader_test.cc index a93d28a954..b5f7a6dad1 100644 --- a/libs/audiographer/tests/general/peak_reader_test.cc +++ b/libs/audiographer/tests/general/peak_reader_test.cc @@ -13,8 +13,8 @@ class PeakReaderTest : public CppUnit::TestFixture public: void setUp() { - frames = 128; - random_data = TestUtils::init_random_data(frames); + samples = 128; + random_data = TestUtils::init_random_data(samples); } void tearDown() @@ -25,7 +25,7 @@ class PeakReaderTest : public CppUnit::TestFixture void testProcess() { reader.reset (new PeakReader()); - ProcessContext<float> c (random_data, frames, 1); + ProcessContext<float> c (random_data, samples, 1); float peak = 1.5; random_data[10] = peak; @@ -48,7 +48,7 @@ class PeakReaderTest : public CppUnit::TestFixture boost::shared_ptr<PeakReader> reader; float * random_data; - framecnt_t frames; + samplecnt_t samples; }; CPPUNIT_TEST_SUITE_REGISTRATION (PeakReaderTest); diff --git a/libs/audiographer/tests/general/sample_format_converter_test.cc b/libs/audiographer/tests/general/sample_format_converter_test.cc index 734389a427..92a559aa33 100644 --- a/libs/audiographer/tests/general/sample_format_converter_test.cc +++ b/libs/audiographer/tests/general/sample_format_converter_test.cc @@ -20,8 +20,8 @@ class SampleFormatConverterTest : public CppUnit::TestFixture public: void setUp() { - frames = 128; - random_data = TestUtils::init_random_data(frames, 1.0); + samples = 128; + random_data = TestUtils::init_random_data(samples, 1.0); } void tearDown() @@ -33,30 +33,30 @@ class SampleFormatConverterTest : public CppUnit::TestFixture { // Float never uses dithering and should always use full 32 bits of data boost::shared_ptr<SampleFormatConverter<float> > f_converter (new SampleFormatConverter<float>(1)); - f_converter->init (frames, D_Tri, 32); // Doesn't throw - CPPUNIT_ASSERT_THROW (f_converter->init (frames, D_Tri, 24), Exception); - CPPUNIT_ASSERT_THROW (f_converter->init (frames, D_Tri, 48), Exception); + f_converter->init (samples, D_Tri, 32); // Doesn't throw + CPPUNIT_ASSERT_THROW (f_converter->init (samples, D_Tri, 24), Exception); + CPPUNIT_ASSERT_THROW (f_converter->init (samples, D_Tri, 48), Exception); /* Test that too large data widths throw. We are fine with unnecessarily narrow data widths */ boost::shared_ptr<SampleFormatConverter<int32_t> > i_converter (new SampleFormatConverter<int32_t>(1)); - i_converter->init (frames, D_Tri, 32); // Doesn't throw - i_converter->init (frames, D_Tri, 24); // Doesn't throw - i_converter->init (frames, D_Tri, 8); // Doesn't throw - i_converter->init (frames, D_Tri, 16); // Doesn't throw - CPPUNIT_ASSERT_THROW (i_converter->init (frames, D_Tri, 48), Exception); + i_converter->init (samples, D_Tri, 32); // Doesn't throw + i_converter->init (samples, D_Tri, 24); // Doesn't throw + i_converter->init (samples, D_Tri, 8); // Doesn't throw + i_converter->init (samples, D_Tri, 16); // Doesn't throw + CPPUNIT_ASSERT_THROW (i_converter->init (samples, D_Tri, 48), Exception); boost::shared_ptr<SampleFormatConverter<int16_t> > i16_converter (new SampleFormatConverter<int16_t>(1)); - i16_converter->init (frames, D_Tri, 16); // Doesn't throw - i16_converter->init (frames, D_Tri, 8); // Doesn't throw - CPPUNIT_ASSERT_THROW (i16_converter->init (frames, D_Tri, 32), Exception); - CPPUNIT_ASSERT_THROW (i16_converter->init (frames, D_Tri, 48), Exception); + i16_converter->init (samples, D_Tri, 16); // Doesn't throw + i16_converter->init (samples, D_Tri, 8); // Doesn't throw + CPPUNIT_ASSERT_THROW (i16_converter->init (samples, D_Tri, 32), Exception); + CPPUNIT_ASSERT_THROW (i16_converter->init (samples, D_Tri, 48), Exception); boost::shared_ptr<SampleFormatConverter<uint8_t> > ui_converter (new SampleFormatConverter<uint8_t>(1)); - ui_converter->init (frames, D_Tri, 8); // Doesn't throw - ui_converter->init (frames, D_Tri, 4); // Doesn't throw - CPPUNIT_ASSERT_THROW (ui_converter->init (frames, D_Tri, 16), Exception); + ui_converter->init (samples, D_Tri, 8); // Doesn't throw + ui_converter->init (samples, D_Tri, 4); // Doesn't throw + CPPUNIT_ASSERT_THROW (ui_converter->init (samples, D_Tri, 16), Exception); } void testFrameCount() @@ -64,26 +64,26 @@ class SampleFormatConverterTest : public CppUnit::TestFixture boost::shared_ptr<SampleFormatConverter<int32_t> > converter (new SampleFormatConverter<int32_t>(1)); boost::shared_ptr<VectorSink<int32_t> > sink (new VectorSink<int32_t>()); - converter->init (frames, D_Tri, 32); + converter->init (samples, D_Tri, 32); converter->add_output (sink); - framecnt_t frames_output = 0; + samplecnt_t samples_output = 0; { - ProcessContext<float> pc(random_data, frames / 2, 1); + ProcessContext<float> pc(random_data, samples / 2, 1); converter->process (pc); - frames_output = sink->get_data().size(); - CPPUNIT_ASSERT_EQUAL (frames / 2, frames_output); + samples_output = sink->get_data().size(); + CPPUNIT_ASSERT_EQUAL (samples / 2, samples_output); } { - ProcessContext<float> pc(random_data, frames, 1); + ProcessContext<float> pc(random_data, samples, 1); converter->process (pc); - frames_output = sink->get_data().size(); - CPPUNIT_ASSERT_EQUAL (frames, frames_output); + samples_output = sink->get_data().size(); + CPPUNIT_ASSERT_EQUAL (samples, samples_output); } { - ProcessContext<float> pc(random_data, frames + 1, 1); + ProcessContext<float> pc(random_data, samples + 1, 1); CPPUNIT_ASSERT_THROW(converter->process (pc), Exception); } } @@ -92,17 +92,17 @@ class SampleFormatConverterTest : public CppUnit::TestFixture { boost::shared_ptr<SampleFormatConverter<float> > converter (new SampleFormatConverter<float>(1)); boost::shared_ptr<VectorSink<float> > sink (new VectorSink<float>()); - framecnt_t frames_output = 0; + samplecnt_t samples_output = 0; - converter->init(frames, D_Tri, 32); + converter->init(samples, D_Tri, 32); converter->add_output (sink); converter->set_clip_floats (false); - ProcessContext<float> const pc(random_data, frames, 1); + ProcessContext<float> const pc(random_data, samples, 1); converter->process (pc); - frames_output = sink->get_data().size(); - CPPUNIT_ASSERT_EQUAL (frames, frames_output); - CPPUNIT_ASSERT (TestUtils::array_equals(sink->get_array(), random_data, frames)); + samples_output = sink->get_data().size(); + CPPUNIT_ASSERT_EQUAL (samples, samples_output); + CPPUNIT_ASSERT (TestUtils::array_equals(sink->get_array(), random_data, samples)); // Make sure a few samples are < -1.0 and > 1.0 random_data[10] = -1.5; @@ -110,11 +110,11 @@ class SampleFormatConverterTest : public CppUnit::TestFixture converter->set_clip_floats (true); converter->process (pc); - frames_output = sink->get_data().size(); - CPPUNIT_ASSERT_EQUAL (frames, frames_output); - CPPUNIT_ASSERT (TestUtils::array_filled(sink->get_array(), frames)); + samples_output = sink->get_data().size(); + CPPUNIT_ASSERT_EQUAL (samples, samples_output); + CPPUNIT_ASSERT (TestUtils::array_filled(sink->get_array(), samples)); - for (framecnt_t i = 0; i < frames; ++i) { + for (samplecnt_t i = 0; i < samples; ++i) { // fp comparison needs a bit of tolerance, 1.01 << 1.5 CPPUNIT_ASSERT(sink->get_data()[i] < 1.01); CPPUNIT_ASSERT(sink->get_data()[i] > -1.01); @@ -125,89 +125,89 @@ class SampleFormatConverterTest : public CppUnit::TestFixture { boost::shared_ptr<SampleFormatConverter<int32_t> > converter (new SampleFormatConverter<int32_t>(1)); boost::shared_ptr<VectorSink<int32_t> > sink (new VectorSink<int32_t>()); - framecnt_t frames_output = 0; + samplecnt_t samples_output = 0; - converter->init(frames, D_Tri, 32); + converter->init(samples, D_Tri, 32); converter->add_output (sink); - ProcessContext<float> pc(random_data, frames, 1); + ProcessContext<float> pc(random_data, samples, 1); converter->process (pc); - frames_output = sink->get_data().size(); - CPPUNIT_ASSERT_EQUAL (frames, frames_output); - CPPUNIT_ASSERT (TestUtils::array_filled(sink->get_array(), frames)); + samples_output = sink->get_data().size(); + CPPUNIT_ASSERT_EQUAL (samples, samples_output); + CPPUNIT_ASSERT (TestUtils::array_filled(sink->get_array(), samples)); } void testInt24() { boost::shared_ptr<SampleFormatConverter<int32_t> > converter (new SampleFormatConverter<int32_t>(1)); boost::shared_ptr<VectorSink<int32_t> > sink (new VectorSink<int32_t>()); - framecnt_t frames_output = 0; + samplecnt_t samples_output = 0; - converter->init(frames, D_Tri, 24); + converter->init(samples, D_Tri, 24); converter->add_output (sink); - ProcessContext<float> pc(random_data, frames, 1); + ProcessContext<float> pc(random_data, samples, 1); converter->process (pc); - frames_output = sink->get_data().size(); - CPPUNIT_ASSERT_EQUAL (frames, frames_output); - CPPUNIT_ASSERT (TestUtils::array_filled(sink->get_array(), frames)); + samples_output = sink->get_data().size(); + CPPUNIT_ASSERT_EQUAL (samples, samples_output); + CPPUNIT_ASSERT (TestUtils::array_filled(sink->get_array(), samples)); } void testInt16() { boost::shared_ptr<SampleFormatConverter<int16_t> > converter (new SampleFormatConverter<int16_t>(1)); boost::shared_ptr<VectorSink<int16_t> > sink (new VectorSink<int16_t>()); - framecnt_t frames_output = 0; + samplecnt_t samples_output = 0; - converter->init(frames, D_Tri, 16); + converter->init(samples, D_Tri, 16); converter->add_output (sink); - ProcessContext<float> pc(random_data, frames, 1); + ProcessContext<float> pc(random_data, samples, 1); converter->process (pc); - frames_output = sink->get_data().size(); - CPPUNIT_ASSERT_EQUAL (frames, frames_output); - CPPUNIT_ASSERT (TestUtils::array_filled(sink->get_array(), frames)); + samples_output = sink->get_data().size(); + CPPUNIT_ASSERT_EQUAL (samples, samples_output); + CPPUNIT_ASSERT (TestUtils::array_filled(sink->get_array(), samples)); } void testUint8() { boost::shared_ptr<SampleFormatConverter<uint8_t> > converter (new SampleFormatConverter<uint8_t>(1)); boost::shared_ptr<VectorSink<uint8_t> > sink (new VectorSink<uint8_t>()); - framecnt_t frames_output = 0; + samplecnt_t samples_output = 0; - converter->init(frames, D_Tri, 8); + converter->init(samples, D_Tri, 8); converter->add_output (sink); - ProcessContext<float> pc(random_data, frames, 1); + ProcessContext<float> pc(random_data, samples, 1); converter->process (pc); - frames_output = sink->get_data().size(); - CPPUNIT_ASSERT_EQUAL (frames, frames_output); - CPPUNIT_ASSERT (TestUtils::array_filled(sink->get_array(), frames)); + samples_output = sink->get_data().size(); + CPPUNIT_ASSERT_EQUAL (samples, samples_output); + CPPUNIT_ASSERT (TestUtils::array_filled(sink->get_array(), samples)); } void testChannelCount() { boost::shared_ptr<SampleFormatConverter<int32_t> > converter (new SampleFormatConverter<int32_t>(3)); boost::shared_ptr<VectorSink<int32_t> > sink (new VectorSink<int32_t>()); - framecnt_t frames_output = 0; + samplecnt_t samples_output = 0; - converter->init(frames, D_Tri, 32); + converter->init(samples, D_Tri, 32); converter->add_output (sink); ProcessContext<float> pc(random_data, 4, 1); CPPUNIT_ASSERT_THROW (converter->process (pc), Exception); - framecnt_t new_frame_count = frames - (frames % 3); - converter->process (ProcessContext<float> (pc.data(), new_frame_count, 3)); - frames_output = sink->get_data().size(); - CPPUNIT_ASSERT_EQUAL (new_frame_count, frames_output); - CPPUNIT_ASSERT (TestUtils::array_filled(sink->get_array(), pc.frames())); + samplecnt_t new_sample_count = samples - (samples % 3); + converter->process (ProcessContext<float> (pc.data(), new_sample_count, 3)); + samples_output = sink->get_data().size(); + CPPUNIT_ASSERT_EQUAL (new_sample_count, samples_output); + CPPUNIT_ASSERT (TestUtils::array_filled(sink->get_array(), pc.samples())); } private: float * random_data; - framecnt_t frames; + samplecnt_t samples; }; CPPUNIT_TEST_SUITE_REGISTRATION (SampleFormatConverterTest); diff --git a/libs/audiographer/tests/general/silence_trimmer_test.cc b/libs/audiographer/tests/general/silence_trimmer_test.cc index be53c89978..c6662c92de 100644 --- a/libs/audiographer/tests/general/silence_trimmer_test.cc +++ b/libs/audiographer/tests/general/silence_trimmer_test.cc @@ -17,19 +17,19 @@ class SilenceTrimmerTest : public CppUnit::TestFixture public: void setUp() { - frames = 128; + samples = 128; - random_data = TestUtils::init_random_data(frames); + random_data = TestUtils::init_random_data(samples); random_data[0] = 0.5; - random_data[frames - 1] = 0.5; + random_data[samples - 1] = 0.5; - zero_data = new float[frames]; - memset(zero_data, 0, frames * sizeof(float)); + zero_data = new float[samples]; + memset(zero_data, 0, samples * sizeof(float)); - half_random_data = TestUtils::init_random_data(frames); - memset(half_random_data, 0, (frames / 2) * sizeof(float)); + half_random_data = TestUtils::init_random_data(samples); + memset(half_random_data, 0, (samples / 2) * sizeof(float)); - trimmer.reset (new SilenceTrimmer<float> (frames / 2)); + trimmer.reset (new SilenceTrimmer<float> (samples / 2)); sink.reset (new AppendingVectorSink<float>()); trimmer->set_trim_beginning (true); @@ -48,73 +48,73 @@ class SilenceTrimmerTest : public CppUnit::TestFixture trimmer->add_output (sink); { - ProcessContext<float> c (zero_data, frames, 1); + ProcessContext<float> c (zero_data, samples, 1); trimmer->process (c); - framecnt_t frames_processed = sink->get_data().size(); - CPPUNIT_ASSERT_EQUAL ((framecnt_t) 0, frames_processed); + samplecnt_t samples_processed = sink->get_data().size(); + CPPUNIT_ASSERT_EQUAL ((samplecnt_t) 0, samples_processed); } { - ProcessContext<float> c (random_data, frames, 1); + ProcessContext<float> c (random_data, samples, 1); trimmer->process (c); - framecnt_t frames_processed = sink->get_data().size(); - CPPUNIT_ASSERT_EQUAL (frames, frames_processed); - CPPUNIT_ASSERT (TestUtils::array_equals (sink->get_array(), random_data, frames)); + samplecnt_t samples_processed = sink->get_data().size(); + CPPUNIT_ASSERT_EQUAL (samples, samples_processed); + CPPUNIT_ASSERT (TestUtils::array_equals (sink->get_array(), random_data, samples)); } { - ProcessContext<float> c (zero_data, frames, 1); + ProcessContext<float> c (zero_data, samples, 1); trimmer->process (c); - framecnt_t frames_processed = sink->get_data().size(); - CPPUNIT_ASSERT_EQUAL (frames, frames_processed); + samplecnt_t samples_processed = sink->get_data().size(); + CPPUNIT_ASSERT_EQUAL (samples, samples_processed); } { - ProcessContext<float> c (random_data, frames, 1); + ProcessContext<float> c (random_data, samples, 1); trimmer->process (c); - framecnt_t frames_processed = sink->get_data().size(); - CPPUNIT_ASSERT_EQUAL (3 * frames, frames_processed); - CPPUNIT_ASSERT (TestUtils::array_equals (sink->get_array(), random_data, frames)); - CPPUNIT_ASSERT (TestUtils::array_equals (&sink->get_array()[frames], zero_data, frames)); - CPPUNIT_ASSERT (TestUtils::array_equals (&sink->get_array()[2 * frames], random_data, frames)); + samplecnt_t samples_processed = sink->get_data().size(); + CPPUNIT_ASSERT_EQUAL (3 * samples, samples_processed); + CPPUNIT_ASSERT (TestUtils::array_equals (sink->get_array(), random_data, samples)); + CPPUNIT_ASSERT (TestUtils::array_equals (&sink->get_array()[samples], zero_data, samples)); + CPPUNIT_ASSERT (TestUtils::array_equals (&sink->get_array()[2 * samples], random_data, samples)); } { - ProcessContext<float> c (zero_data, frames, 1); + ProcessContext<float> c (zero_data, samples, 1); trimmer->process (c); - framecnt_t frames_processed = sink->get_data().size(); - CPPUNIT_ASSERT_EQUAL (3 * frames, frames_processed); + samplecnt_t samples_processed = sink->get_data().size(); + CPPUNIT_ASSERT_EQUAL (3 * samples, samples_processed); } } void testPartialBuffers() { trimmer->add_output (sink); - trimmer->reset (frames / 4); + trimmer->reset (samples / 4); trimmer->set_trim_beginning (true); trimmer->set_trim_end (true); { - ProcessContext<float> c (half_random_data, frames, 1); + ProcessContext<float> c (half_random_data, samples, 1); trimmer->process (c); - framecnt_t frames_processed = sink->get_data().size(); - CPPUNIT_ASSERT_EQUAL (frames / 2, frames_processed); - CPPUNIT_ASSERT (TestUtils::array_equals (sink->get_array(), &half_random_data[frames / 2], frames / 2)); + samplecnt_t samples_processed = sink->get_data().size(); + CPPUNIT_ASSERT_EQUAL (samples / 2, samples_processed); + CPPUNIT_ASSERT (TestUtils::array_equals (sink->get_array(), &half_random_data[samples / 2], samples / 2)); } { - ProcessContext<float> c (zero_data, frames, 1); + ProcessContext<float> c (zero_data, samples, 1); trimmer->process (c); - framecnt_t frames_processed = sink->get_data().size(); - CPPUNIT_ASSERT_EQUAL (frames / 2, frames_processed); + samplecnt_t samples_processed = sink->get_data().size(); + CPPUNIT_ASSERT_EQUAL (samples / 2, samples_processed); } { - ProcessContext<float> c (half_random_data, frames, 1); + ProcessContext<float> c (half_random_data, samples, 1); trimmer->process (c); - framecnt_t frames_processed = sink->get_data().size(); - CPPUNIT_ASSERT_EQUAL (2 * frames + frames / 2, frames_processed); - CPPUNIT_ASSERT (TestUtils::array_equals (&sink->get_array()[frames + frames / 2], half_random_data, frames)); + samplecnt_t samples_processed = sink->get_data().size(); + CPPUNIT_ASSERT_EQUAL (2 * samples + samples / 2, samples_processed); + CPPUNIT_ASSERT (TestUtils::array_equals (&sink->get_array()[samples + samples / 2], half_random_data, samples)); } } @@ -129,42 +129,42 @@ class SilenceTrimmerTest : public CppUnit::TestFixture { trimmer->add_output (sink); - framecnt_t silence = frames / 2; + samplecnt_t silence = samples / 2; trimmer->add_silence_to_beginning (silence); { - ProcessContext<float> c (random_data, frames, 1); + ProcessContext<float> c (random_data, samples, 1); trimmer->process (c); } CPPUNIT_ASSERT (TestUtils::array_equals (sink->get_array(), zero_data, silence)); - CPPUNIT_ASSERT (TestUtils::array_equals (&sink->get_array()[silence], random_data, frames)); + CPPUNIT_ASSERT (TestUtils::array_equals (&sink->get_array()[silence], random_data, samples)); } void testAddSilenceEnd() { trimmer->add_output (sink); - framecnt_t silence = frames / 3; + samplecnt_t silence = samples / 3; trimmer->add_silence_to_end (silence); { - ProcessContext<float> c (random_data, frames, 1); + ProcessContext<float> c (random_data, samples, 1); trimmer->process (c); } { - ProcessContext<float> c (random_data, frames, 1); + ProcessContext<float> c (random_data, samples, 1); c.set_flag (ProcessContext<float>::EndOfInput); trimmer->process (c); } - framecnt_t frames_processed = sink->get_data().size(); - framecnt_t total_frames = 2 * frames + silence; - CPPUNIT_ASSERT_EQUAL (total_frames, frames_processed); - CPPUNIT_ASSERT (TestUtils::array_equals (sink->get_array(), random_data, frames)); - CPPUNIT_ASSERT (TestUtils::array_equals (&sink->get_array()[frames], random_data, frames)); - CPPUNIT_ASSERT (TestUtils::array_equals (&sink->get_array()[frames * 2], zero_data, silence)); + samplecnt_t samples_processed = sink->get_data().size(); + samplecnt_t total_samples = 2 * samples + silence; + CPPUNIT_ASSERT_EQUAL (total_samples, samples_processed); + CPPUNIT_ASSERT (TestUtils::array_equals (sink->get_array(), random_data, samples)); + CPPUNIT_ASSERT (TestUtils::array_equals (&sink->get_array()[samples], random_data, samples)); + CPPUNIT_ASSERT (TestUtils::array_equals (&sink->get_array()[samples * 2], zero_data, silence)); } private: @@ -174,7 +174,7 @@ class SilenceTrimmerTest : public CppUnit::TestFixture float * random_data; float * zero_data; float * half_random_data; - framecnt_t frames; + samplecnt_t samples; }; CPPUNIT_TEST_SUITE_REGISTRATION (SilenceTrimmerTest); diff --git a/libs/audiographer/tests/general/sr_converter_test.cc b/libs/audiographer/tests/general/sr_converter_test.cc index 4f5afbb620..b2b7193ff6 100644 --- a/libs/audiographer/tests/general/sr_converter_test.cc +++ b/libs/audiographer/tests/general/sr_converter_test.cc @@ -16,8 +16,8 @@ class SampleRateConverterTest : public CppUnit::TestFixture public: void setUp() { - frames = 128; - random_data = TestUtils::init_random_data(frames); + samples = 128; + random_data = TestUtils::init_random_data(samples); sink.reset (new AppendingVectorSink<float>()); grabber.reset (new ProcessContextGrabber<float>()); converter.reset (new SampleRateConverter (1)); @@ -30,79 +30,79 @@ class SampleRateConverterTest : public CppUnit::TestFixture void testNoConversion() { - assert (frames % 2 == 0); - framecnt_t const half_frames = frames / 2; - framecnt_t frames_output = 0; + assert (samples % 2 == 0); + samplecnt_t const half_samples = samples / 2; + samplecnt_t samples_output = 0; converter->init (44100, 44100); converter->add_output (sink); - ProcessContext<float> c (random_data, half_frames, 1); + ProcessContext<float> c (random_data, half_samples, 1); converter->process (c); - ProcessContext<float> c2 (&random_data[half_frames], half_frames, 1); + ProcessContext<float> c2 (&random_data[half_samples], half_samples, 1); c2.set_flag (ProcessContext<float>::EndOfInput); converter->process (c2); - frames_output = sink->get_data().size(); - CPPUNIT_ASSERT_EQUAL (frames, frames_output); + samples_output = sink->get_data().size(); + CPPUNIT_ASSERT_EQUAL (samples, samples_output); - CPPUNIT_ASSERT (TestUtils::array_equals (random_data, sink->get_array(), frames)); + CPPUNIT_ASSERT (TestUtils::array_equals (random_data, sink->get_array(), samples)); } void testUpsampleLength() { - assert (frames % 2 == 0); - framecnt_t const half_frames = frames / 2; - framecnt_t frames_output = 0; + assert (samples % 2 == 0); + samplecnt_t const half_samples = samples / 2; + samplecnt_t samples_output = 0; converter->init (44100, 88200); - converter->allocate_buffers (half_frames); + converter->allocate_buffers (half_samples); converter->add_output (sink); - ProcessContext<float> c (random_data, half_frames, 1); + ProcessContext<float> c (random_data, half_samples, 1); converter->process (c); - ProcessContext<float> c2 (&random_data[half_frames], half_frames, 1); + ProcessContext<float> c2 (&random_data[half_samples], half_samples, 1); c2.set_flag (ProcessContext<float>::EndOfInput); converter->process (c2); - frames_output = sink->get_data().size(); - framecnt_t tolerance = 3; - CPPUNIT_ASSERT (2 * frames - tolerance < frames_output && frames_output < 2 * frames + tolerance); + samples_output = sink->get_data().size(); + samplecnt_t tolerance = 3; + CPPUNIT_ASSERT (2 * samples - tolerance < samples_output && samples_output < 2 * samples + tolerance); } void testDownsampleLength() { - assert (frames % 2 == 0); - framecnt_t const half_frames = frames / 2; - framecnt_t frames_output = 0; + assert (samples % 2 == 0); + samplecnt_t const half_samples = samples / 2; + samplecnt_t samples_output = 0; converter->init (88200, 44100); - converter->allocate_buffers (half_frames); + converter->allocate_buffers (half_samples); converter->add_output (sink); - ProcessContext<float> c (random_data, half_frames, 1); + ProcessContext<float> c (random_data, half_samples, 1); converter->process (c); - ProcessContext<float> c2 (&random_data[half_frames], half_frames, 1); + ProcessContext<float> c2 (&random_data[half_samples], half_samples, 1); c2.set_flag (ProcessContext<float>::EndOfInput); converter->process (c2); - frames_output = sink->get_data().size(); - framecnt_t tolerance = 3; - CPPUNIT_ASSERT (half_frames - tolerance < frames_output && frames_output < half_frames + tolerance); + samples_output = sink->get_data().size(); + samplecnt_t tolerance = 3; + CPPUNIT_ASSERT (half_samples - tolerance < samples_output && samples_output < half_samples + tolerance); } void testRespectsEndOfInput() { - assert (frames % 2 == 0); - framecnt_t const half_frames = frames / 2; + assert (samples % 2 == 0); + samplecnt_t const half_samples = samples / 2; converter->init (44100, 48000); - converter->allocate_buffers (half_frames); + converter->allocate_buffers (half_samples); converter->add_output (grabber); - ProcessContext<float> c (random_data, half_frames, 1); + ProcessContext<float> c (random_data, half_samples, 1); converter->process (c); - ProcessContext<float> c2 (&random_data[half_frames], half_frames / 2, 1); + ProcessContext<float> c2 (&random_data[half_samples], half_samples / 2, 1); c2.set_flag (ProcessContext<float>::EndOfInput); converter->process (c2); @@ -123,7 +123,7 @@ class SampleRateConverterTest : public CppUnit::TestFixture boost::shared_ptr<ProcessContextGrabber<float> > grabber; float * random_data; - framecnt_t frames; + samplecnt_t samples; }; CPPUNIT_TEST_SUITE_REGISTRATION (SampleRateConverterTest); diff --git a/libs/audiographer/tests/general/threader_test.cc b/libs/audiographer/tests/general/threader_test.cc index cdb21a375b..8662d61a30 100644 --- a/libs/audiographer/tests/general/threader_test.cc +++ b/libs/audiographer/tests/general/threader_test.cc @@ -16,11 +16,11 @@ class ThreaderTest : public CppUnit::TestFixture public: void setUp() { - frames = 128; - random_data = TestUtils::init_random_data (frames, 1.0); + samples = 128; + random_data = TestUtils::init_random_data (samples, 1.0); - zero_data = new float[frames]; - memset (zero_data, 0, frames * sizeof(float)); + zero_data = new float[samples]; + memset (zero_data, 0, samples * sizeof(float)); thread_pool = new Glib::ThreadPool (3); threader.reset (new Threader<float> (*thread_pool)); @@ -53,15 +53,15 @@ class ThreaderTest : public CppUnit::TestFixture threader->add_output (sink_e); threader->add_output (sink_f); - ProcessContext<float> c (random_data, frames, 1); + ProcessContext<float> c (random_data, samples, 1); threader->process (c); - CPPUNIT_ASSERT (TestUtils::array_equals(random_data, sink_a->get_array(), frames)); - CPPUNIT_ASSERT (TestUtils::array_equals(random_data, sink_b->get_array(), frames)); - CPPUNIT_ASSERT (TestUtils::array_equals(random_data, sink_c->get_array(), frames)); - CPPUNIT_ASSERT (TestUtils::array_equals(random_data, sink_d->get_array(), frames)); - CPPUNIT_ASSERT (TestUtils::array_equals(random_data, sink_e->get_array(), frames)); - CPPUNIT_ASSERT (TestUtils::array_equals(random_data, sink_f->get_array(), frames)); + CPPUNIT_ASSERT (TestUtils::array_equals(random_data, sink_a->get_array(), samples)); + CPPUNIT_ASSERT (TestUtils::array_equals(random_data, sink_b->get_array(), samples)); + CPPUNIT_ASSERT (TestUtils::array_equals(random_data, sink_c->get_array(), samples)); + CPPUNIT_ASSERT (TestUtils::array_equals(random_data, sink_d->get_array(), samples)); + CPPUNIT_ASSERT (TestUtils::array_equals(random_data, sink_e->get_array(), samples)); + CPPUNIT_ASSERT (TestUtils::array_equals(random_data, sink_f->get_array(), samples)); } void testRemoveOutput() @@ -73,7 +73,7 @@ class ThreaderTest : public CppUnit::TestFixture threader->add_output (sink_e); threader->add_output (sink_f); - ProcessContext<float> c (random_data, frames, 1); + ProcessContext<float> c (random_data, samples, 1); threader->process (c); // Remove a, b and f @@ -81,15 +81,15 @@ class ThreaderTest : public CppUnit::TestFixture threader->remove_output (sink_b); threader->remove_output (sink_f); - ProcessContext<float> zc (zero_data, frames, 1); + ProcessContext<float> zc (zero_data, samples, 1); threader->process (zc); - CPPUNIT_ASSERT (TestUtils::array_equals(random_data, sink_a->get_array(), frames)); - CPPUNIT_ASSERT (TestUtils::array_equals(random_data, sink_b->get_array(), frames)); - CPPUNIT_ASSERT (TestUtils::array_equals(zero_data, sink_c->get_array(), frames)); - CPPUNIT_ASSERT (TestUtils::array_equals(zero_data, sink_d->get_array(), frames)); - CPPUNIT_ASSERT (TestUtils::array_equals(zero_data, sink_e->get_array(), frames)); - CPPUNIT_ASSERT (TestUtils::array_equals(random_data, sink_f->get_array(), frames)); + CPPUNIT_ASSERT (TestUtils::array_equals(random_data, sink_a->get_array(), samples)); + CPPUNIT_ASSERT (TestUtils::array_equals(random_data, sink_b->get_array(), samples)); + CPPUNIT_ASSERT (TestUtils::array_equals(zero_data, sink_c->get_array(), samples)); + CPPUNIT_ASSERT (TestUtils::array_equals(zero_data, sink_d->get_array(), samples)); + CPPUNIT_ASSERT (TestUtils::array_equals(zero_data, sink_e->get_array(), samples)); + CPPUNIT_ASSERT (TestUtils::array_equals(random_data, sink_f->get_array(), samples)); } void testClearOutputs() @@ -101,19 +101,19 @@ class ThreaderTest : public CppUnit::TestFixture threader->add_output (sink_e); threader->add_output (sink_f); - ProcessContext<float> c (random_data, frames, 1); + ProcessContext<float> c (random_data, samples, 1); threader->process (c); threader->clear_outputs(); - ProcessContext<float> zc (zero_data, frames, 1); + ProcessContext<float> zc (zero_data, samples, 1); threader->process (zc); - CPPUNIT_ASSERT (TestUtils::array_equals(random_data, sink_a->get_array(), frames)); - CPPUNIT_ASSERT (TestUtils::array_equals(random_data, sink_b->get_array(), frames)); - CPPUNIT_ASSERT (TestUtils::array_equals(random_data, sink_c->get_array(), frames)); - CPPUNIT_ASSERT (TestUtils::array_equals(random_data, sink_d->get_array(), frames)); - CPPUNIT_ASSERT (TestUtils::array_equals(random_data, sink_e->get_array(), frames)); - CPPUNIT_ASSERT (TestUtils::array_equals(random_data, sink_f->get_array(), frames)); + CPPUNIT_ASSERT (TestUtils::array_equals(random_data, sink_a->get_array(), samples)); + CPPUNIT_ASSERT (TestUtils::array_equals(random_data, sink_b->get_array(), samples)); + CPPUNIT_ASSERT (TestUtils::array_equals(random_data, sink_c->get_array(), samples)); + CPPUNIT_ASSERT (TestUtils::array_equals(random_data, sink_d->get_array(), samples)); + CPPUNIT_ASSERT (TestUtils::array_equals(random_data, sink_e->get_array(), samples)); + CPPUNIT_ASSERT (TestUtils::array_equals(random_data, sink_f->get_array(), samples)); } void testExceptions() @@ -125,13 +125,13 @@ class ThreaderTest : public CppUnit::TestFixture threader->add_output (sink_e); threader->add_output (throwing_sink); - ProcessContext<float> c (random_data, frames, 1); + ProcessContext<float> c (random_data, samples, 1); CPPUNIT_ASSERT_THROW (threader->process (c), Exception); - CPPUNIT_ASSERT (TestUtils::array_equals(random_data, sink_a->get_array(), frames)); - CPPUNIT_ASSERT (TestUtils::array_equals(random_data, sink_b->get_array(), frames)); - CPPUNIT_ASSERT (TestUtils::array_equals(random_data, sink_c->get_array(), frames)); - CPPUNIT_ASSERT (TestUtils::array_equals(random_data, sink_e->get_array(), frames)); + CPPUNIT_ASSERT (TestUtils::array_equals(random_data, sink_a->get_array(), samples)); + CPPUNIT_ASSERT (TestUtils::array_equals(random_data, sink_b->get_array(), samples)); + CPPUNIT_ASSERT (TestUtils::array_equals(random_data, sink_c->get_array(), samples)); + CPPUNIT_ASSERT (TestUtils::array_equals(random_data, sink_e->get_array(), samples)); } private: @@ -149,7 +149,7 @@ class ThreaderTest : public CppUnit::TestFixture float * random_data; float * zero_data; - framecnt_t frames; + samplecnt_t samples; }; CPPUNIT_TEST_SUITE_REGISTRATION (ThreaderTest); |