Merge pull request #986 from ufleisch/ufleisch/wav-extensible-subformat

WAV: Support subformat in WAVE_FORMAT_EXTENSIBLE (#850)

2 files changed, 15 insertions, 0 deletions

diff --git a/tests/data/uint8we.wav b/tests/data/uint8we.wav
new file mode 100644
index 00000000..9623db22
--- /dev/null
+++ b/tests/data/uint8we.wav
diff --git a/tests/test_wav.cpp b/tests/test_wav.cpp
index 59484443..61081393 100644
--- a/tests/test_wav.cpp
+++ b/tests/test_wav.cpp
@@ -57,6 +57,7 @@ class TestWAV : public CppUnit::TestFixture
   CPPUNIT_TEST(testFileWithGarbageAppended);
   CPPUNIT_TEST(testStripAndProperties);
   CPPUNIT_TEST(testPCMWithFactChunk);
+  CPPUNIT_TEST(testWaveFormatExtensible);
   CPPUNIT_TEST_SUITE_END();
 
 public:
@@ -369,6 +370,20 @@ public:
     CPPUNIT_ASSERT_EQUAL(1, f.audioProperties()->format());
   }
 
+  void testWaveFormatExtensible()
+  {
+    RIFF::WAV::File f(TEST_FILE_PATH_C("uint8we.wav"));
+    CPPUNIT_ASSERT(f.audioProperties());
+    CPPUNIT_ASSERT_EQUAL(2, f.audioProperties()->lengthInSeconds());
+    CPPUNIT_ASSERT_EQUAL(2937, f.audioProperties()->lengthInMilliseconds());
+    CPPUNIT_ASSERT_EQUAL(128, f.audioProperties()->bitrate());
+    CPPUNIT_ASSERT_EQUAL(2, f.audioProperties()->channels());
+    CPPUNIT_ASSERT_EQUAL(8000, f.audioProperties()->sampleRate());
+    CPPUNIT_ASSERT_EQUAL(8, f.audioProperties()->bitsPerSample());
+    CPPUNIT_ASSERT_EQUAL(23493U, f.audioProperties()->sampleFrames());
+    CPPUNIT_ASSERT_EQUAL(1, f.audioProperties()->format());
+  }
+
 };
 
 CPPUNIT_TEST_SUITE_REGISTRATION(TestWAV);