diff options
| author | Max Kellermann <max@duempel.org> | 2013-12-28 17:42:03 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2013-12-28 18:30:27 +0100 |
| commit | da29298d4dbe8dddade7cf241dd1af267470f2a8 (patch) | |
| tree | 4cbb96c50418ce5d1dad66db9a946b1ba0a259aa /test | |
| parent | afcf0795c44260f54e74ec854297de439e7562c3 (diff) | |
| download | mpd-da29298d4dbe8dddade7cf241dd1af267470f2a8.tar.gz mpd-da29298d4dbe8dddade7cf241dd1af267470f2a8.tar.xz mpd-da29298d4dbe8dddade7cf241dd1af267470f2a8.zip | |
pcm/PcmMix: improved dithering
Use the existing PcmDither library.
Diffstat (limited to 'test')
| -rw-r--r-- | test/test_pcm_mix.cxx | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/test/test_pcm_mix.cxx b/test/test_pcm_mix.cxx index 2a8a11388..542c4de80 100644 --- a/test/test_pcm_mix.cxx +++ b/test/test_pcm_mix.cxx @@ -21,6 +21,7 @@ #include "test_pcm_all.hxx" #include "test_pcm_util.hxx" #include "pcm/PcmMix.hxx" +#include "pcm/PcmDither.hxx" template<typename T, SampleFormat format, typename G=RandomInt<T>> static void @@ -30,23 +31,26 @@ TestPcmMix(G g=G()) const auto src1 = TestDataBuffer<T, N>(g); const auto src2 = TestDataBuffer<T, N>(g); + PcmDither dither; + /* portion1=1.0: result must be equal to src1 */ auto result = src1; - bool success = pcm_mix(result.begin(), src2.begin(), sizeof(result), + bool success = pcm_mix(dither, + result.begin(), src2.begin(), sizeof(result), format, 1.0); CPPUNIT_ASSERT(success); - AssertEqualWithTolerance(result, src1, 1); + AssertEqualWithTolerance(result, src1, 3); /* portion1=0.0: result must be equal to src2 */ result = src1; - success = pcm_mix(result.begin(), src2.begin(), sizeof(result), + success = pcm_mix(dither, result.begin(), src2.begin(), sizeof(result), format, 0.0); CPPUNIT_ASSERT(success); - AssertEqualWithTolerance(result, src2, 1); + AssertEqualWithTolerance(result, src2, 3); /* portion1=0.5 */ result = src1; - success = pcm_mix(result.begin(), src2.begin(), sizeof(result), + success = pcm_mix(dither, result.begin(), src2.begin(), sizeof(result), format, 0.5); CPPUNIT_ASSERT(success); @@ -54,7 +58,7 @@ TestPcmMix(G g=G()) for (unsigned i = 0; i < N; ++i) expected[i] = (int64_t(src1[i]) + int64_t(src2[i])) / 2; - AssertEqualWithTolerance(result, expected, 1); + AssertEqualWithTolerance(result, expected, 3); } void |