Skip to content
Snippets Groups Projects
Commit 97786ec0 authored by Philippe Gorley's avatar Philippe Gorley Committed by Adrien Béraud
Browse files

test: fix audio frame resizer test cases

Change-Id: Ifd62420e19831bb2736248a8ada706429ab5fabc
parent c79897cc
No related branches found
No related tags found
No related merge requests found
...@@ -44,8 +44,8 @@ private: ...@@ -44,8 +44,8 @@ private:
void testBiggerOutput(); void testBiggerOutput();
void testDifferentFormat(); void testDifferentFormat();
void gotFrame(std::unique_ptr<AudioFrame>&& framePtr); void gotFrame(std::shared_ptr<AudioFrame>&& framePtr);
std::unique_ptr<AudioFrame> getFrame(int n); std::shared_ptr<AudioFrame> getFrame(int n);
CPPUNIT_TEST_SUITE(AudioFrameResizerTest); CPPUNIT_TEST_SUITE(AudioFrameResizerTest);
CPPUNIT_TEST(testSameSize); CPPUNIT_TEST(testSameSize);
...@@ -54,7 +54,7 @@ private: ...@@ -54,7 +54,7 @@ private:
CPPUNIT_TEST(testDifferentFormat); CPPUNIT_TEST(testDifferentFormat);
CPPUNIT_TEST_SUITE_END(); CPPUNIT_TEST_SUITE_END();
std::unique_ptr<AudioFrameResizer> q_; std::shared_ptr<AudioFrameResizer> q_;
AudioFormat format_ = AudioFormat::STEREO(); AudioFormat format_ = AudioFormat::STEREO();
int outputSize_ = 960; int outputSize_ = 960;
}; };
...@@ -62,16 +62,16 @@ private: ...@@ -62,16 +62,16 @@ private:
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(AudioFrameResizerTest, AudioFrameResizerTest::name()); CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(AudioFrameResizerTest, AudioFrameResizerTest::name());
void void
AudioFrameResizerTest::gotFrame(std::unique_ptr<AudioFrame>&& framePtr) AudioFrameResizerTest::gotFrame(std::shared_ptr<AudioFrame>&& framePtr)
{ {
CPPUNIT_ASSERT(framePtr && framePtr->pointer()); CPPUNIT_ASSERT(framePtr && framePtr->pointer());
CPPUNIT_ASSERT(framePtr->pointer()->nb_samples == outputSize_); CPPUNIT_ASSERT(framePtr->pointer()->nb_samples == outputSize_);
} }
std::unique_ptr<AudioFrame> std::shared_ptr<AudioFrame>
AudioFrameResizerTest::getFrame(int n) AudioFrameResizerTest::getFrame(int n)
{ {
auto frame = std::make_unique<AudioFrame>(); auto frame = std::make_shared<AudioFrame>();
frame->pointer()->format = format_.sampleFormat; frame->pointer()->format = format_.sampleFormat;
frame->pointer()->sample_rate = format_.sample_rate; frame->pointer()->sample_rate = format_.sample_rate;
frame->pointer()->channels = format_.nb_channels; frame->pointer()->channels = format_.nb_channels;
...@@ -85,7 +85,7 @@ void ...@@ -85,7 +85,7 @@ void
AudioFrameResizerTest::testSameSize() AudioFrameResizerTest::testSameSize()
{ {
// input.nb_samples == output.nb_samples // input.nb_samples == output.nb_samples
q_.reset(new AudioFrameResizer(format_, outputSize_, [this](std::unique_ptr<AudioFrame>&& f){ gotFrame(std::move(f)); })); q_.reset(new AudioFrameResizer(format_, outputSize_, [this](std::shared_ptr<AudioFrame>&& f){ gotFrame(std::move(f)); }));
auto in = getFrame(outputSize_); auto in = getFrame(outputSize_);
// gotFrame should be called after this // gotFrame should be called after this
CPPUNIT_ASSERT_NO_THROW(q_->enqueue(std::move(in))); CPPUNIT_ASSERT_NO_THROW(q_->enqueue(std::move(in)));
...@@ -96,7 +96,7 @@ void ...@@ -96,7 +96,7 @@ void
AudioFrameResizerTest::testBiggerInput() AudioFrameResizerTest::testBiggerInput()
{ {
// input.nb_samples > output.nb_samples // input.nb_samples > output.nb_samples
q_.reset(new AudioFrameResizer(format_, outputSize_, [this](std::unique_ptr<AudioFrame>&& f){ gotFrame(std::move(f)); })); q_.reset(new AudioFrameResizer(format_, outputSize_, [this](std::shared_ptr<AudioFrame>&& f){ gotFrame(std::move(f)); }));
auto in = getFrame(outputSize_ + 100); auto in = getFrame(outputSize_ + 100);
// gotFrame should be called after this // gotFrame should be called after this
CPPUNIT_ASSERT_NO_THROW(q_->enqueue(std::move(in))); CPPUNIT_ASSERT_NO_THROW(q_->enqueue(std::move(in)));
...@@ -107,7 +107,7 @@ void ...@@ -107,7 +107,7 @@ void
AudioFrameResizerTest::testBiggerOutput() AudioFrameResizerTest::testBiggerOutput()
{ {
// input.nb_samples < output.nb_samples // input.nb_samples < output.nb_samples
q_.reset(new AudioFrameResizer(format_, outputSize_, [this](std::unique_ptr<AudioFrame>&& f){ gotFrame(std::move(f)); })); q_.reset(new AudioFrameResizer(format_, outputSize_, [this](std::shared_ptr<AudioFrame>&& f){ gotFrame(std::move(f)); }));
auto in = getFrame(outputSize_ - 100); auto in = getFrame(outputSize_ - 100);
CPPUNIT_ASSERT_NO_THROW(q_->enqueue(std::move(in))); CPPUNIT_ASSERT_NO_THROW(q_->enqueue(std::move(in)));
CPPUNIT_ASSERT(q_->samples() == outputSize_ - 100); CPPUNIT_ASSERT(q_->samples() == outputSize_ - 100);
...@@ -121,7 +121,7 @@ void ...@@ -121,7 +121,7 @@ void
AudioFrameResizerTest::testDifferentFormat() AudioFrameResizerTest::testDifferentFormat()
{ {
// frame format != q_->format_ // frame format != q_->format_
q_.reset(new AudioFrameResizer(format_, outputSize_, [this](std::unique_ptr<AudioFrame>&& f){ gotFrame(std::move(f)); })); q_.reset(new AudioFrameResizer(format_, outputSize_, [this](std::shared_ptr<AudioFrame>&& f){ gotFrame(std::move(f)); }));
auto in = getFrame(960); auto in = getFrame(960);
// XXX this should never be done, but use this as a shortcut for this test case // XXX this should never be done, but use this as a shortcut for this test case
in->pointer()->channels = 1; in->pointer()->channels = 1;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment