patterns: improve WAV pattern (#31)

patterns/wav.hexpat

@@ -1,29 +1,218 @@
 #pragma MIME audio/wav
 
-struct riffHeader{
-	char ckID[4] [[comment("Container Signature"), name("RIFF Header Signature")]];
-	u32 ckSize [[comment("Size of RIFF Header"), name("RIFF Chunk Size")]];
+#include <std/mem.pat>
+
+struct RiffHeader {
+  char ckID[4] [[comment("Container Signature"), name("RIFF Header Signature")]];
+  u32  ckSize [[comment("Size of RIFF Header"), name("RIFF Chunk Size")]];
+  char format[4] [[comment("RIFF format"), name("WAVE Header Signature")]];
 };
 
-struct waveHeader{
-	char format[4] [[name("WAVE Header Signature")]];
-	char ckID[4] [[comment("Format Chunk")]];
-	u32 ckSize [[comment("Chunk size")]];
-	u16 wFormatTag;
-	u16 wChannels;
-	u32 dwSamplesPerSec [[comment("Sample Frequency")]];
-	u32 dwAvgBytesPerSec [[comment("BPS - Used to estimate buffer size")]];
-	u16 wBlockAlign;
+struct WaveChunk {
+  char chunkId[4];
+  u32  chunkSize;
 };
 
-struct pcmHeader{
-	u16 wBitsPerSample;
+enum WaveFormatType : u16 {
+  Unknown,
+  PCM,
+  MS_ADPCM,
+  ALAW = 6,
+  MULAW,
+  IMA_ADPCM  = 0x11,
+  GSM610     = 0x31,
+  MPEG       = 0x50,
+  MPEGLAYER3 = 0x55,
 };
 
-struct wavHeader{
-	riffHeader riff;
-	waveHeader wave;
-	pcmHeader pcm;
+struct WaveFormat {
+  WaveFormatType formatTag;
+  u16            channels;
+  u32            samplesPerSec [[comment("Sample Frequency")]];
+  u32            avgBytesPerSec [[comment("BPS - Used to estimate buffer size")]];
+  u16            blockAlign;
 };
 
-wavHeader header @0x00;
+struct WaveFormatEx {
+  u16 bitsPerSample;
+  u16 extendedDataSize;
+};
+
+struct WaveFormatExDummy {
+  u16 bitsPerSample;
+  u16 extendedDataSize;
+  u8  extendedData[extendedDataSize];
+};
+
+struct WaveFormatPCM {
+  u16 bitsPerSample;
+};
+
+struct WaveMSADPCMCoefSet {
+  s16 coef1;    
+  s16 coef2;
+};
+
+struct WaveFormatMSADPCM : WaveFormatEx {
+  u16                samplesPerBlock;
+  u16                numCoef;
+  WaveMSADPCMCoefSet coef[numCoef];
+};
+
+bitfield WaveMPEGLayer {
+  Layer1  : 1;
+  Layer2  : 1;
+  Layer3  : 1;
+  padding : 13;
+};
+
+bitfield WaveMPEGMode {
+  Stereo : 1;
+  JointStereo : 1;
+  DualChannel : 1;
+  SingleChannel : 1;
+  padding : 12;
+};
+
+bitfield WaveMPEGFlags {
+  PrivateBit : 1;
+  Copyright : 1;
+  OriginalHome : 1;
+  ProtectionBit : 1;
+  IdMPEG1 : 1;
+  padding : 11;
+};
+
+struct WaveFormatMPEG : WaveFormatEx {
+  be WaveMPEGLayer headLayersUsed;
+  u32              headBitrate;
+  be WaveMPEGMode  headMode;
+  u16              headModeExt;
+  u16              headEmphasis;
+  be WaveMPEGFlags headFlags;
+  u32              PTSLow;
+  u32              PTSHigh;
+};
+
+enum WaveFormatMPEGLayer3Flags : u32 {
+  MPEGLAYER3_FLAG_PADDING_ISO,
+  MPEGLAYER3_FLAG_PADDING_ON,
+  MPEGLAYER3_FLAG_PADDING_OFF
+};
+
+struct WaveFormatMPEGLayer3 : WaveFormatEx {
+  u16                       id;
+  WaveFormatMPEGLayer3Flags flags;
+  u16                       blockSize;
+  u16                       framesPerBlock;
+  u16                       codecDelay;
+};
+
+struct WaveFact {
+  u32 uncompressedSize;
+};
+
+enum SampleLookupType : u32 {
+  TYPE_LOOP_FORWARD,
+  TYPE_LOOP_ALTERNATE,
+  TYPE_LOOP_BACKWARD,
+};
+
+struct SampleLookup {
+  u32              id;
+  SampleLookupType type;
+  u32              start;
+  u32              end;
+  u32              fraction;
+  u32              playCount;
+};
+
+struct WaveSample {
+  u32 manufacturer;
+  u32 product;
+  u32 samplePeriod;
+  u32 MIDIUnityNote;
+  u32 MIDIPitchFraction;
+  u32 SMPTEFormat;
+  u32 SMPTEOffset;
+  u32 numSampleLoops;
+  u32 sampleLoopsSize;
+
+  SampleLookup lookups[numSampleLoops];
+};
+
+struct WaveCuePoint {
+  u32  indentifier;
+  u32  position;
+  char chunkID[4];
+  u32  chunkStart;
+  u32  blockStart;
+  u32  sampleOffset;
+};
+
+struct WaveCue {
+  u32          numCuePoints;
+  WaveCuePoint cuePoints[numCuePoints];
+};
+
+struct WaveLabel {
+  u32  id;
+  char text[];
+  padding[sizeof(text) % 2];
+};
+
+using WaveNote = WaveLabel;
+
+struct WaveListItem : WaveChunk {
+  if (chunkId == "labl") {
+    WaveLabel label;
+  } else if (chunkId == "note") {
+    WaveNote note;
+  } else {
+    padding[chunkSize];
+  }
+};
+
+u64 listEnd;
+
+struct WaveList {
+  char type[4];
+
+  WaveListItem item[while ($ < listEnd)];
+};
+
+struct WavData {
+  WaveChunk chunk;
+
+  if (chunk.chunkId == "fmt ") {
+    WaveFormat fmt;
+
+    if (fmt.formatTag == WaveFormatType::PCM) {
+      WaveFormatPCM pcmExtraData;
+    } else if (fmt.formatTag == WaveFormatType::MS_ADPCM) {
+      WaveFormatMSADPCM msAdpcmExtraData;
+    } else if (fmt.formatTag == WaveFormatType::MPEG) {
+      WaveFormatMPEG mpegExtraData;
+    } else if (fmt.formatTag == WaveFormatType::MPEGLAYER3) {
+      WaveFormatMPEGLayer3 mpegLayer3ExtraData;
+    } else {
+      WaveFormatExDummy unknown;
+    }
+  } else if (chunk.chunkId == "data") {
+    padding[chunk.chunkSize];
+  } else if (chunk.chunkId == "fact") {
+    WaveFact fact;
+  } else if (chunk.chunkId == "smpl") {
+    WaveSample smpl;
+  } else if (chunk.chunkId == "cue ") {
+    WaveCue cue;
+  } else if (chunk.chunkId == "LIST") {
+    listEnd = $ + chunk.chunkSize;
+    WaveList list;
+  } else {
+    padding[chunk.chunkSize];
+  }
+};
+
+RiffHeader header @0x00;
+WavData    data[while (!std::mem::eof())] @$;