oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

pcm/PcmChannels: use struct ConstBuffer

Browse Source
This commit is contained in:
Max Kellermann
2013-12-02 09:15:54 +01:00
parent af3b454805
commit 2b44a2c9bd
4 changed files with 95 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
test/test_pcm_channels.cxx
View File

@@ -22,67 +22,60 @@
#include "test_pcm_util.hxx"
#include "pcm/PcmChannels.hxx"
#include "pcm/PcmBuffer.hxx"
#include "util/ConstBuffer.hxx"
void
PcmChannelsTest::TestChannels16()
{
constexpr unsigned N = 256;
constexpr size_t N = 256;
const auto src = TestDataBuffer<int16_t, N * 2>();
PcmBuffer buffer;
/* stereo to mono */
size_t dest_size;
const int16_t *dest =
pcm_convert_channels_16(buffer, 1, 2, src, sizeof(src),
&dest_size);
CPPUNIT_ASSERT(dest != NULL);
CPPUNIT_ASSERT_EQUAL(sizeof(src) / 2, dest_size);
auto dest = pcm_convert_channels_16(buffer, 1, 2, { src, N * 2 });
CPPUNIT_ASSERT(!dest.IsNull());
CPPUNIT_ASSERT_EQUAL(N, dest.size);
for (unsigned i = 0; i < N; ++i)
CPPUNIT_ASSERT_EQUAL(int16_t((src[i * 2] + src[i * 2 + 1]) / 2),
dest[i]);
dest.data[i]);
/* mono to stereo */
dest = pcm_convert_channels_16(buffer, 2, 1, src, sizeof(src),
&dest_size);
CPPUNIT_ASSERT(dest != NULL);
CPPUNIT_ASSERT_EQUAL(sizeof(src) * 2, dest_size);
dest = pcm_convert_channels_16(buffer, 2, 1, { src, N * 2 });
CPPUNIT_ASSERT(!dest.IsNull());
CPPUNIT_ASSERT_EQUAL(N * 4, dest.size);
for (unsigned i = 0; i < N; ++i) {
CPPUNIT_ASSERT_EQUAL(src[i], dest[i * 2]);
CPPUNIT_ASSERT_EQUAL(src[i], dest[i * 2 + 1]);
CPPUNIT_ASSERT_EQUAL(src[i], dest.data[i * 2]);
CPPUNIT_ASSERT_EQUAL(src[i], dest.data[i * 2 + 1]);
}
}
void
PcmChannelsTest::TestChannels32()
{
constexpr unsigned N = 256;
constexpr size_t N = 256;
const auto src = TestDataBuffer<int32_t, N * 2>();
PcmBuffer buffer;
/* stereo to mono */
size_t dest_size;
const int32_t *dest =
pcm_convert_channels_32(buffer, 1, 2, src, sizeof(src),
&dest_size);
CPPUNIT_ASSERT(dest != NULL);
CPPUNIT_ASSERT_EQUAL(sizeof(src) / 2, dest_size);
auto dest = pcm_convert_channels_32(buffer, 1, 2, { src, N * 2 });
CPPUNIT_ASSERT(!dest.IsNull());
CPPUNIT_ASSERT_EQUAL(N, dest.size);
for (unsigned i = 0; i < N; ++i)
CPPUNIT_ASSERT_EQUAL(int32_t(((int64_t)src[i * 2] + (int64_t)src[i * 2 + 1]) / 2),
dest[i]);
dest.data[i]);
/* mono to stereo */
dest = pcm_convert_channels_32(buffer, 2, 1, src, sizeof(src),
&dest_size);
CPPUNIT_ASSERT(dest != NULL);
CPPUNIT_ASSERT_EQUAL(sizeof(src) * 2, dest_size);
dest = pcm_convert_channels_32(buffer, 2, 1, { src, N * 2 });
CPPUNIT_ASSERT(!dest.IsNull());
CPPUNIT_ASSERT_EQUAL(N * 4, dest.size);
for (unsigned i = 0; i < N; ++i) {
CPPUNIT_ASSERT_EQUAL(src[i], dest[i * 2]);
CPPUNIT_ASSERT_EQUAL(src[i], dest[i * 2 + 1]);
CPPUNIT_ASSERT_EQUAL(src[i], dest.data[i * 2]);
CPPUNIT_ASSERT_EQUAL(src[i], dest.data[i * 2 + 1]);
}
}