From 0bacb12db131e6d937457c9f109167b5da6540ed Mon Sep 17 00:00:00 2001 From: Alice Date: Thu, 29 Sep 2016 19:19:57 -0400 Subject: [PATCH] Improve testing for WavImporterTest --- .../WavAudioImporter/Test/WavImporterTest.cpp | 37 +++++++++++++++++++ .../WavAudioImporter/WavHeader.h | 2 + 2 files changed, 39 insertions(+) diff --git a/src/MagnumPlugins/WavAudioImporter/Test/WavImporterTest.cpp b/src/MagnumPlugins/WavAudioImporter/Test/WavImporterTest.cpp index c230ea135..f57c9d00c 100644 --- a/src/MagnumPlugins/WavAudioImporter/Test/WavImporterTest.cpp +++ b/src/MagnumPlugins/WavAudioImporter/Test/WavImporterTest.cpp @@ -172,6 +172,11 @@ void WavImporterTest::invalidFactChunk() { CORRADE_COMPARE(importer.format(), Buffer::Format::Mono16); CORRADE_COMPARE(importer.frequency(), 22050); + + + CORRADE_COMPARE_AS(importer.data().slice(0,4), + Containers::Array::from(-27, -11, -1, -9).slice(0,4), + TestSuite::Compare::Container); } void WavImporterTest::mono8() { @@ -180,6 +185,10 @@ void WavImporterTest::mono8() { CORRADE_COMPARE(importer.format(), Buffer::Format::Mono8); CORRADE_COMPARE(importer.frequency(), 22050); + + CORRADE_COMPARE_AS(importer.data().slice(0,4), + Containers::Array::from(127, 127, 127, 127).slice(0,4), + TestSuite::Compare::Container); } void WavImporterTest::mono8junk() { @@ -188,6 +197,10 @@ void WavImporterTest::mono8junk() { CORRADE_COMPARE(importer.format(), Buffer::Format::Mono8); CORRADE_COMPARE(importer.frequency(), 22050); + + CORRADE_COMPARE_AS(importer.data().slice(0,4), + Containers::Array::from(127, 127, 127, 127).slice(0,4), + TestSuite::Compare::Container); } void WavImporterTest::mono8ALaw() { @@ -196,6 +209,11 @@ void WavImporterTest::mono8ALaw() { CORRADE_COMPARE(importer.format(), Buffer::Format::MonoALaw); CORRADE_COMPARE(importer.frequency(), 8000); + + + CORRADE_COMPARE_AS(importer.data().slice(0,4), + Containers::Array::from(87, 84, 85, 85).slice(0,4), + TestSuite::Compare::Container); } void WavImporterTest::mono8MuLaw() { @@ -204,6 +222,11 @@ void WavImporterTest::mono8MuLaw() { CORRADE_COMPARE(importer.format(), Buffer::Format::MonoMuLaw); CORRADE_COMPARE(importer.frequency(), 8000); + + + CORRADE_COMPARE_AS(importer.data().slice(0,4), + Containers::Array::from(-5, -3, -1, -2).slice(0,4), + TestSuite::Compare::Container); } void WavImporterTest::mono16() { @@ -234,6 +257,11 @@ void WavImporterTest::stereo8ALaw() { CORRADE_COMPARE(importer.format(), Buffer::Format::StereoALaw); CORRADE_COMPARE(importer.frequency(), 8000); + + + CORRADE_COMPARE_AS(importer.data().slice(0,4), + Containers::Array::from(-43, -43, -43, -43).slice(0,4), + TestSuite::Compare::Container); } void WavImporterTest::stereo8MuLaw() { @@ -242,6 +270,11 @@ void WavImporterTest::stereo8MuLaw() { CORRADE_COMPARE(importer.format(), Buffer::Format::StereoMuLaw); CORRADE_COMPARE(importer.frequency(), 8000); + + + CORRADE_COMPARE_AS(importer.data().slice(0,4), + Containers::Array::from(-1, -1, -1, -1).slice(0,4), + TestSuite::Compare::Container); } void WavImporterTest::stereo12() { @@ -260,6 +293,10 @@ void WavImporterTest::stereo16() { CORRADE_COMPARE(importer.format(), Buffer::Format::Stereo16); CORRADE_COMPARE(importer.frequency(), 44100); + + CORRADE_COMPARE_AS(importer.data(), + Containers::Array::from(39, 79, 39, 79), + TestSuite::Compare::Container); } void WavImporterTest::stereo24() { diff --git a/src/MagnumPlugins/WavAudioImporter/WavHeader.h b/src/MagnumPlugins/WavAudioImporter/WavHeader.h index 1f2e527ae..678dbe5cd 100644 --- a/src/MagnumPlugins/WavAudioImporter/WavHeader.h +++ b/src/MagnumPlugins/WavAudioImporter/WavHeader.h @@ -36,7 +36,9 @@ namespace Magnum { namespace Audio { /** @brief WAV audio format */ enum class WavAudioFormat: UnsignedShort { + Unknown = 0x0000, /**< Unknown */ Pcm = 0x0001, /**< PCM */ + Adpcm = 0x0002, /**< Adaptive Differential PCM */ IeeeFloat = 0x0003, /**< IEEE Float */ ALaw = 0x0006, /**< A-Law */ MuLaw = 0x0007, /**< μ-Law */