removed extraneous assert(), added multi-/ test to path-test.cpp

1 files changed, 3 insertions, 3 deletions

diff --git a/src/Wav.cpp b/src/Wav.cpp
index 9fb2423..ff063fb 100755
--- a/src/Wav.cpp
+++ b/src/Wav.cpp
@@ -174,9 +174,9 @@ ASDCP::Wav::SimpleWaveHeader::ReadFromBuffer(const byte_t* buf, ui32_t buf_len,
 	{
 	  ui16_t format = KM_i16_LE(*(ui16_t*)p); p += 2;
 
-	  if ( format != 1 )
+	  if ( format != WAVE_FORMAT_PCM && format != WAVE_FORMAT_EXTENSIBLE )
 	    {
-	      DefaultLogSink().Error("Expecting uncompressed essence, got format type %hu\n", format);
+	      DefaultLogSink().Error("Expecting uncompressed PCM data, got format type %hd\n", format);
 	      return RESULT_RAW_FORMAT;
 	    }
 
@@ -185,7 +185,7 @@ ASDCP::Wav::SimpleWaveHeader::ReadFromBuffer(const byte_t* buf, ui32_t buf_len,
 	  avgbps = KM_i32_LE(*(ui32_t*)p); p += 4;
 	  blockalign = KM_i16_LE(*(ui16_t*)p); p += 2;
 	  bitspersample = KM_i16_LE(*(ui16_t*)p); p += 2;
-	  p += chunk_size - 16;
+	  p += chunk_size - 16; // 16 is the number of bytes read in this block
 	}
       else
 	{