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

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

37
test/test_pcm_channels.cxx
View File

@@ -20,7 +20,6 @@
#include "test_pcm_util.hxx"
#include "pcm/PcmChannels.hxx"
#include "pcm/Buffer.hxx"
#include "util/ConstBuffer.hxx"
#include <gtest/gtest.h>
@@ -33,18 +32,18 @@ TEST(PcmTest, Channels16)
/* stereo to mono */
auto dest = pcm_convert_channels_16(buffer, 1, 2, { src, N * 2 });
EXPECT_FALSE(dest.IsNull());
EXPECT_EQ(N, dest.size);
auto dest = pcm_convert_channels_16(buffer, 1, 2, src);
EXPECT_NE(dest.data(), nullptr);
EXPECT_EQ(N, dest.size());
for (unsigned i = 0; i < N; ++i)
EXPECT_EQ(int16_t((src[i * 2] + src[i * 2 + 1]) / 2),
dest[i]);
/* mono to stereo */
dest = pcm_convert_channels_16(buffer, 2, 1, { src, N * 2 });
EXPECT_FALSE(dest.IsNull());
EXPECT_EQ(N * 4, dest.size);
dest = pcm_convert_channels_16(buffer, 2, 1, src);
EXPECT_NE(dest.data(), nullptr);
EXPECT_EQ(N * 4, dest.size());
for (unsigned i = 0; i < N; ++i) {
EXPECT_EQ(src[i], dest[i * 2]);
EXPECT_EQ(src[i], dest[i * 2 + 1]);
@@ -52,9 +51,9 @@ TEST(PcmTest, Channels16)
/* stereo to 5.1 */
dest = pcm_convert_channels_16(buffer, 6, 2, { src, N * 2 });
EXPECT_FALSE(dest.IsNull());
EXPECT_EQ(N * 6, dest.size);
dest = pcm_convert_channels_16(buffer, 6, 2, src);
EXPECT_NE(dest.data(), nullptr);
EXPECT_EQ(N * 6, dest.size());
constexpr int16_t silence = 0;
for (unsigned i = 0; i < N; ++i) {
EXPECT_EQ(src[i * 2], dest[i * 6]);
@@ -75,18 +74,18 @@ TEST(PcmTest, Channels32)
/* stereo to mono */
auto dest = pcm_convert_channels_32(buffer, 1, 2, { src, N * 2 });
EXPECT_FALSE(dest.IsNull());
EXPECT_EQ(N, dest.size);
auto dest = pcm_convert_channels_32(buffer, 1, 2, src);
EXPECT_NE(dest.data(), nullptr);
EXPECT_EQ(N, dest.size());
for (unsigned i = 0; i < N; ++i)
EXPECT_EQ(int32_t(((int64_t)src[i * 2] + (int64_t)src[i * 2 + 1]) / 2),
dest[i]);
/* mono to stereo */
dest = pcm_convert_channels_32(buffer, 2, 1, { src, N * 2 });
EXPECT_FALSE(dest.IsNull());
EXPECT_EQ(N * 4, dest.size);
dest = pcm_convert_channels_32(buffer, 2, 1, src);
EXPECT_NE(dest.data(), nullptr);
EXPECT_EQ(N * 4, dest.size());
for (unsigned i = 0; i < N; ++i) {
EXPECT_EQ(src[i], dest[i * 2]);
EXPECT_EQ(src[i], dest[i * 2 + 1]);
@@ -94,9 +93,9 @@ TEST(PcmTest, Channels32)
/* stereo to 5.1 */
dest = pcm_convert_channels_32(buffer, 6, 2, { src, N * 2 });
EXPECT_FALSE(dest.IsNull());
EXPECT_EQ(N * 6, dest.size);
dest = pcm_convert_channels_32(buffer, 6, 2, src);
EXPECT_NE(dest.data(), nullptr);
EXPECT_EQ(N * 6, dest.size());
constexpr int32_t silence = 0;
for (unsigned i = 0; i < N; ++i) {
EXPECT_EQ(src[i * 2], dest[i * 6]);