pcm/Volume: convert to class

Prepare for adding state.

3 files changed, 74 insertions, 140 deletions

diff --git a/test/read_mixer.cxx b/test/read_mixer.cxx
index 07ff931c8..5decc5798 100644
--- a/test/read_mixer.cxx
+++ b/test/read_mixer.cxx
@@ -101,15 +101,6 @@ filter_plugin_by_name(gcc_unused const char *name)
 	return NULL;
 }
 
-bool
-pcm_volume(gcc_unused void *buffer, gcc_unused size_t length,
-	   gcc_unused SampleFormat format,
-	   gcc_unused int volume)
-{
-	assert(false);
-	return false;
-}
-
 int main(int argc, gcc_unused char **argv)
 {
 	int volume;
diff --git a/test/software_volume.cxx b/test/software_volume.cxx
index b850217df..ae2d53a08 100644
--- a/test/software_volume.cxx
+++ b/test/software_volume.cxx
@@ -27,12 +27,14 @@
 #include "pcm/Volume.hxx"
 #include "AudioParser.hxx"
 #include "AudioFormat.hxx"
+#include "util/ConstBuffer.hxx"
 #include "util/Error.hxx"
 #include "stdbin.h"
 
 #include <glib.h>
 
 #include <stddef.h>
+#include <stdlib.h>
 #include <unistd.h>
 
 int main(int argc, char **argv)
@@ -55,14 +57,16 @@ int main(int argc, char **argv)
 		}
 	}
 
-	while ((nbytes = read(0, buffer, sizeof(buffer))) > 0) {
-		if (!pcm_volume(buffer, nbytes,
-				audio_format.format,
-				PCM_VOLUME_1 / 2)) {
-			g_printerr("pcm_volume() has failed\n");
-			return 2;
-		}
+	PcmVolume pv;
+	if (!pv.Open(audio_format.format, error)) {
+		fprintf(stderr, "%s\n", error.GetMessage());
+		return EXIT_FAILURE;
+	}
 
-		gcc_unused ssize_t ignored = write(1, buffer, nbytes);
+	while ((nbytes = read(0, buffer, sizeof(buffer))) > 0) {
+		auto dest = pv.Apply({buffer, size_t(nbytes)});
+		gcc_unused ssize_t ignored = write(1, dest.data, dest.size);
 	}
+
+	pv.Close();
 }
diff --git a/test/test_pcm_volume.cxx b/test/test_pcm_volume.cxx
index fae937c30..bba5d3bbf 100644
--- a/test/test_pcm_volume.cxx
+++ b/test/test_pcm_volume.cxx
@@ -17,169 +17,108 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "test_pcm_all.hxx"
 #include "pcm/Volume.hxx"
+#include "pcm/Traits.hxx"
+#include "util/ConstBuffer.hxx"
+#include "util/Error.hxx"
 #include "test_pcm_util.hxx"
 
 #include <algorithm>
 
 #include <string.h>
 
-void
-PcmVolumeTest::TestVolume8()
+template<SampleFormat F, class Traits=SampleTraits<F>,
+	 typename G=RandomInt<typename Traits::value_type>>
+static void
+TestVolume(G g=G())
 {
-	constexpr unsigned N = 256;
-	static int8_t zero[N];
-	const auto src = TestDataBuffer<int8_t, N>();
+	typedef typename Traits::value_type value_type;
+
+	PcmVolume pv;
+	CPPUNIT_ASSERT(pv.Open(F, IgnoreError()));
 
-	int8_t dest[N];
+	constexpr size_t N = 256;
+	static value_type zero[N];
+	const auto _src = TestDataBuffer<value_type, N>(g);
+	const ConstBuffer<void> src(_src, sizeof(_src));
 
-	std::copy(src.begin(), src.end(), dest);
-	CPPUNIT_ASSERT_EQUAL(true,
-			     pcm_volume(dest, sizeof(dest),
-					SampleFormat::S8, 0));
-	CPPUNIT_ASSERT_EQUAL(0, memcmp(dest, zero, sizeof(zero)));
+	pv.SetVolume(0);
+	auto dest = pv.Apply(src);
+	CPPUNIT_ASSERT_EQUAL(src.size, dest.size);
+	CPPUNIT_ASSERT_EQUAL(0, memcmp(dest.data, zero, sizeof(zero)));
 
-	std::copy(src.begin(), src.end(), dest);
-	CPPUNIT_ASSERT_EQUAL(true,
-			     pcm_volume(dest, sizeof(dest),
-					SampleFormat::S8, PCM_VOLUME_1));
-	CPPUNIT_ASSERT_EQUAL(0, memcmp(dest, src, sizeof(src)));
+	pv.SetVolume(PCM_VOLUME_1);
+	dest = pv.Apply(src);
+	CPPUNIT_ASSERT_EQUAL(src.size, dest.size);
+	CPPUNIT_ASSERT_EQUAL(0, memcmp(dest.data, src.data, src.size));
 
-	std::copy(src.begin(), src.end(), dest);
-	CPPUNIT_ASSERT_EQUAL(true,
-			     pcm_volume(dest, sizeof(dest),
-					SampleFormat::S8, PCM_VOLUME_1 / 2));
+	pv.SetVolume(PCM_VOLUME_1 / 2);
+	dest = pv.Apply(src);
+	CPPUNIT_ASSERT_EQUAL(src.size, dest.size);
 
+	const auto _dest = ConstBuffer<value_type>::FromVoid(dest);
 	for (unsigned i = 0; i < N; ++i) {
-		CPPUNIT_ASSERT(dest[i] >= (src[i] - 1) / 2);
-		CPPUNIT_ASSERT(dest[i] <= src[i] / 2 + 1);
+		CPPUNIT_ASSERT(_dest.data[i] >= (_src[i] - 1) / 2);
+		CPPUNIT_ASSERT(_dest.data[i] <= _src[i] / 2 + 1);
 	}
+
+	pv.Close();
 }
 
 void
-PcmVolumeTest::TestVolume16()
+PcmVolumeTest::TestVolume8()
 {
-	constexpr unsigned N = 256;
-	static int16_t zero[N];
-	const auto src = TestDataBuffer<int16_t, N>();
-
-	int16_t dest[N];
-
-	std::copy(src.begin(), src.end(), dest);
-	CPPUNIT_ASSERT_EQUAL(true,
-			     pcm_volume(dest, sizeof(dest),
-					SampleFormat::S16, 0));
-	CPPUNIT_ASSERT_EQUAL(0, memcmp(dest, zero, sizeof(zero)));
-
-	std::copy(src.begin(), src.end(), dest);
-	CPPUNIT_ASSERT_EQUAL(true,
-			     pcm_volume(dest, sizeof(dest),
-					SampleFormat::S16, PCM_VOLUME_1));
-	CPPUNIT_ASSERT_EQUAL(0, memcmp(dest, src, sizeof(src)));
-
-	std::copy(src.begin(), src.end(), dest);
-	CPPUNIT_ASSERT_EQUAL(true,
-			     pcm_volume(dest, sizeof(dest),
-					SampleFormat::S16, PCM_VOLUME_1 / 2));
+	TestVolume<SampleFormat::S8>();
+}
 
-	for (unsigned i = 0; i < N; ++i) {
-		CPPUNIT_ASSERT(dest[i] >= (src[i] - 1) / 2);
-		CPPUNIT_ASSERT(dest[i] <= src[i] / 2 + 1);
-	}
+void
+PcmVolumeTest::TestVolume16()
+{
+	TestVolume<SampleFormat::S16>();
 }
 
 void
 PcmVolumeTest::TestVolume24()
 {
-	constexpr unsigned N = 256;
-	static int32_t zero[N];
-	const auto src = TestDataBuffer<int32_t, N>(RandomInt24());
-
-	int32_t dest[N];
-
-	std::copy(src.begin(), src.end(), dest);
-	CPPUNIT_ASSERT_EQUAL(true,
-			     pcm_volume(dest, sizeof(dest),
-					SampleFormat::S24_P32, 0));
-	CPPUNIT_ASSERT_EQUAL(0, memcmp(dest, zero, sizeof(zero)));
-
-	std::copy(src.begin(), src.end(), dest);
-	CPPUNIT_ASSERT_EQUAL(true,
-			     pcm_volume(dest, sizeof(dest),
-					SampleFormat::S24_P32, PCM_VOLUME_1));
-	CPPUNIT_ASSERT_EQUAL(0, memcmp(dest, src, sizeof(src)));
-
-	std::copy(src.begin(), src.end(), dest);
-	CPPUNIT_ASSERT_EQUAL(true,
-			     pcm_volume(dest, sizeof(dest),
-					SampleFormat::S24_P32, PCM_VOLUME_1 / 2));
-
-	for (unsigned i = 0; i < N; ++i) {
-		CPPUNIT_ASSERT(dest[i] >= (src[i] - 1) / 2);
-		CPPUNIT_ASSERT(dest[i] <= src[i] / 2 + 1);
-	}
+	TestVolume<SampleFormat::S24_P32>(RandomInt24());
 }
 
 void
 PcmVolumeTest::TestVolume32()
 {
-	constexpr unsigned N = 256;
-	static int32_t zero[N];
-	const auto src = TestDataBuffer<int32_t, N>();
-
-	int32_t dest[N];
-
-	std::copy(src.begin(), src.end(), dest);
-	CPPUNIT_ASSERT_EQUAL(true,
-			     pcm_volume(dest, sizeof(dest),
-					SampleFormat::S32, 0));
-	CPPUNIT_ASSERT_EQUAL(0, memcmp(dest, zero, sizeof(zero)));
-
-	std::copy(src.begin(), src.end(), dest);
-	CPPUNIT_ASSERT_EQUAL(true,
-			     pcm_volume(dest, sizeof(dest),
-					SampleFormat::S32, PCM_VOLUME_1));
-	CPPUNIT_ASSERT_EQUAL(0, memcmp(dest, src, sizeof(src)));
-
-	std::copy(src.begin(), src.end(), dest);
-	CPPUNIT_ASSERT_EQUAL(true,
-			     pcm_volume(dest, sizeof(dest),
-					SampleFormat::S32, PCM_VOLUME_1 / 2));
-
-	for (unsigned i = 0; i < N; ++i) {
-		CPPUNIT_ASSERT(dest[i] >= (src[i] - 1) / 2);
-		CPPUNIT_ASSERT(dest[i] <= src[i] / 2 + 1);
-	}
+	TestVolume<SampleFormat::S32>();
 }
 
 void
 PcmVolumeTest::TestVolumeFloat()
 {
-	constexpr unsigned N = 256;
-	static float zero[N];
-	const auto src = TestDataBuffer<float, N>(RandomFloat());
+	PcmVolume pv;
+	CPPUNIT_ASSERT(pv.Open(SampleFormat::FLOAT, IgnoreError()));
 
-	float dest[N];
+	constexpr size_t N = 256;
+	static float zero[N];
+	const auto _src = TestDataBuffer<float, N>(RandomFloat());
+	const ConstBuffer<void> src(_src, sizeof(_src));
 
-	std::copy(src.begin(), src.end(), dest);
-	CPPUNIT_ASSERT_EQUAL(true,
-			     pcm_volume(dest, sizeof(dest),
-					SampleFormat::FLOAT, 0));
-	CPPUNIT_ASSERT_EQUAL(0, memcmp(dest, zero, sizeof(zero)));
+	pv.SetVolume(0);
+	auto dest = pv.Apply(src);
+	CPPUNIT_ASSERT_EQUAL(src.size, dest.size);
+	CPPUNIT_ASSERT_EQUAL(0, memcmp(dest.data, zero, sizeof(zero)));
 
-	std::copy(src.begin(), src.end(), dest);
-	CPPUNIT_ASSERT_EQUAL(true,
-			     pcm_volume(dest, sizeof(dest),
-					SampleFormat::FLOAT, PCM_VOLUME_1));
-	CPPUNIT_ASSERT_EQUAL(0, memcmp(dest, src, sizeof(src)));
+	pv.SetVolume(PCM_VOLUME_1);
+	dest = pv.Apply(src);
+	CPPUNIT_ASSERT_EQUAL(src.size, dest.size);
+	CPPUNIT_ASSERT_EQUAL(0, memcmp(dest.data, src.data, src.size));
 
-	std::copy(src.begin(), src.end(), dest);
-	CPPUNIT_ASSERT_EQUAL(true,
-			     pcm_volume(dest, sizeof(dest),
-					SampleFormat::FLOAT,
-					PCM_VOLUME_1 / 2));
+	pv.SetVolume(PCM_VOLUME_1 / 2);
+	dest = pv.Apply(src);
+	CPPUNIT_ASSERT_EQUAL(src.size, dest.size);
 
+	const auto _dest = ConstBuffer<float>::FromVoid(dest);
 	for (unsigned i = 0; i < N; ++i)
-		CPPUNIT_ASSERT_DOUBLES_EQUAL(src[i] / 2, dest[i], 1);
+		CPPUNIT_ASSERT_DOUBLES_EQUAL(_src[i] / 2, _dest.data[i], 1);
+
+	pv.Close();
 }