pcm/*: use std::span instead of ConstBuffer

This commit is contained in:
Max Kellermann
2022-07-04 15:27:03 +02:00
parent d89136b09c
commit 4ce1dae673
58 changed files with 572 additions and 595 deletions

View File

@@ -34,7 +34,7 @@ TEST(PcmTest, Format8To16)
PcmDither dither;
auto d = pcm_convert_to_16(buffer, dither, SampleFormat::S8, src);
EXPECT_EQ(N, d.size);
EXPECT_EQ(N, d.size());
for (size_t i = 0; i < N; ++i)
EXPECT_EQ(int(src[i]), d[i] >> 8);
@@ -48,7 +48,7 @@ TEST(PcmTest, Format16To24)
PcmBuffer buffer;
auto d = pcm_convert_to_24(buffer, SampleFormat::S16, src);
EXPECT_EQ(N, d.size);
EXPECT_EQ(N, d.size());
for (size_t i = 0; i < N; ++i)
EXPECT_EQ(int(src[i]), d[i] >> 8);
@@ -62,7 +62,7 @@ TEST(PcmTest, Format16To32)
PcmBuffer buffer;
auto d = pcm_convert_to_32(buffer, SampleFormat::S16, src);
EXPECT_EQ(N, d.size);
EXPECT_EQ(N, d.size());
for (size_t i = 0; i < N; ++i)
EXPECT_EQ(int(src[i]), d[i] >> 16);
@@ -76,9 +76,9 @@ TEST(PcmTest, FormatFloat16)
PcmBuffer buffer1, buffer2;
auto f = pcm_convert_to_float(buffer1, SampleFormat::S16, src);
EXPECT_EQ(N, f.size);
EXPECT_EQ(N, f.size());
for (size_t i = 0; i != f.size; ++i) {
for (size_t i = 0; i != f.size(); ++i) {
EXPECT_GE(f[i], -1.f);
EXPECT_LE(f[i], 1.f);
}
@@ -87,14 +87,14 @@ TEST(PcmTest, FormatFloat16)
auto d = pcm_convert_to_16(buffer2, dither,
SampleFormat::FLOAT,
f.ToVoid());
EXPECT_EQ(N, d.size);
std::as_bytes(f));
EXPECT_EQ(N, d.size());
for (size_t i = 0; i < N; ++i)
EXPECT_EQ(src[i], d[i]);
/* check if clamping works */
auto *writable = const_cast<float *>(f.data);
auto *writable = const_cast<float *>(f.data());
*writable++ = 1.01;
*writable++ = 10;
*writable++ = -1.01;
@@ -102,8 +102,8 @@ TEST(PcmTest, FormatFloat16)
d = pcm_convert_to_16(buffer2, dither,
SampleFormat::FLOAT,
f.ToVoid());
EXPECT_EQ(N, d.size);
std::as_bytes(f));
EXPECT_EQ(N, d.size());
EXPECT_EQ(32767, int(d[0]));
EXPECT_EQ(32767, int(d[1]));
@@ -122,17 +122,17 @@ TEST(PcmTest, FormatFloat32)
PcmBuffer buffer1, buffer2;
auto f = pcm_convert_to_float(buffer1, SampleFormat::S32, src);
EXPECT_EQ(N, f.size);
EXPECT_EQ(N, f.size());
for (size_t i = 0; i != f.size; ++i) {
for (size_t i = 0; i != f.size(); ++i) {
EXPECT_GE(f[i], -1.f);
EXPECT_LE(f[i], 1.f);
}
auto d = pcm_convert_to_32(buffer2,
SampleFormat::FLOAT,
f.ToVoid());
EXPECT_EQ(N, d.size);
std::as_bytes(f));
EXPECT_EQ(N, d.size());
constexpr int error = 64;
@@ -140,7 +140,7 @@ TEST(PcmTest, FormatFloat32)
EXPECT_NEAR(src[i], d[i], error);
/* check if clamping works */
auto *writable = const_cast<float *>(f.data);
auto *writable = const_cast<float *>(f.data());
*writable++ = 1.01;
*writable++ = 10;
*writable++ = -1.01;
@@ -148,8 +148,8 @@ TEST(PcmTest, FormatFloat32)
d = pcm_convert_to_32(buffer2,
SampleFormat::FLOAT,
f.ToVoid());
EXPECT_EQ(N, d.size);
std::as_bytes(f));
EXPECT_EQ(N, d.size());
EXPECT_EQ(2147483647, int(d[0]));
EXPECT_EQ(2147483647, int(d[1]));