edits

Author: sandeepmistry

src/SDWaveFile.cpp

@@ -18,32 +18,28 @@
 
 #include "SDWaveFile.h"
 
+struct SubChunkHeader {
+  uint32_t id;
+  uint32_t size;
+};
+
 // based on: http://soundfile.sapp.org/doc/WaveFormat/
 struct WaveFileHeader {
   uint32_t chunkId;
   uint32_t chunkSize;
   uint32_t format;
   struct {
-    uint32_t id;
-    uint32_t size;
+    struct SubChunkHeader header;
     uint16_t audioFormat;
     uint16_t numChannels;
     uint32_t sampleRate;
     uint32_t byteRate;
     uint16_t blockAlign;
     uint16_t bitsPerSample;
   } subChunk1;
-  struct {
-    uint32_t id;
-    uint32_t size;
-  } subChunk2;
+  struct SubChunkHeader subChunk2Header;
 } __attribute__((packed));
 
-struct SubChunkHeader {
-   uint32_t id;
-   uint32_t size;
- };
-
 SDWaveFile::SDWaveFile() : 
   SDWaveFile(NULL)
 {
@@ -58,7 +54,8 @@ SDWaveFile::SDWaveFile(const char* filename) :
   _sampleRate(-1),
   _bitsPerSample(-1),
   _channels(-1),
-  _frames(-1)
+  _frames(-1),
+  _dataOffset(0)
 {
 
 }
@@ -229,24 +226,21 @@ void SDWaveFile::readHeader()
     _file.close();
     return;
   }
+
   struct WaveFileHeader header;
-  int headerSize, dataHeaderOffset;
+  int headerSize;
+  int dataHeaderOffset = 0;
   struct SubChunkHeader sch;
 
-  headerSize = sizeof(struct WaveFileHeader) - sizeof(header.subChunk2);
+  headerSize = sizeof(struct WaveFileHeader) - sizeof(header.subChunk2Header);
   if (_file.read((void *)&header, headerSize) != headerSize) {
     _file.close();
     return;
   }
 
-  if (header.subChunk1.size != 16 || header.subChunk1.audioFormat != 1) {
-    _file.close();
-    return;
-  }
-
   header.chunkId = __REV(header.chunkId);
   header.format = __REV(header.format);
-  header.subChunk1.id = __REV(header.subChunk1.id);
+  header.subChunk1.header.id = __REV(header.subChunk1.header.id);
 
   if (header.chunkId != 0x52494646) { // "RIFF"
     return;
@@ -260,7 +254,12 @@ void SDWaveFile::readHeader()
     return;
   }
 
-  if (header.subChunk1.id != 0x666d7420) { // "fmt "
+  if (header.subChunk1.header.id != 0x666d7420) { // "fmt "
+    return;
+  }
+
+  if (header.subChunk1.header.size != 16 || header.subChunk1.audioFormat != 1) {
+    _file.close();
     return;
   }
 
@@ -269,16 +268,27 @@ void SDWaveFile::readHeader()
       _file.close();
       return;
     }
+
     sch.id = __REV(sch.id);
+
     if (sch.id == 0x64617461) {
-      header.subChunk2.id = sch.id;
-      header.subChunk2.size = sch.size;
+      // found the data section
+      header.subChunk2Header.id = sch.id;
+      header.subChunk2Header.size = sch.size;
       break;
-    } else {
-      _file.seek(_file.position() + sch.size);
-      dataHeaderOffset += 4 + sch.size;
     }
+
+    // skip this header section
+    _file.seek(_file.position() + sch.size);
+    dataHeaderOffset += (4 + sch.size);
   }
+
+  if (header.subChunk2Header.id != 0x64617461) { // "data"
+    // no data section found
+    _file.close();
+    return;
+  }
+
   _dataOffset = sizeof(struct WaveFileHeader) + dataHeaderOffset;
   _file.close();
 
@@ -288,7 +298,7 @@ void SDWaveFile::readHeader()
   _sampleRate = header.subChunk1.sampleRate;
   _bitsPerSample = header.subChunk1.bitsPerSample;
   _blockAlign = header.subChunk1.blockAlign;
-  _frames = header.subChunk2.size / _blockAlign;
+  _frames = header.subChunk2Header.size / _blockAlign;
 
   _isValid = true;
 }

src/SDWaveFile.h

@@ -69,7 +69,7 @@ class SDWaveFile : public SoundFile
   int _channels;
   long _frames;
   int _blockAlign;
-  int _dataOffset;
+  uint32_t _dataOffset;
 };
 
 #endif