feat: substantial improvements to DLS->SF2 conversion

This patch updates the conversions from DLS to SF2 required for TSF to be usable. It improves initial DLS parsing, ADPCM decoding and adds many more generator and modulator translations.

It improves some issues mentioned by Try in #4, including improved drums in Gothic 2's `OWD_DayStd`.

Author: lmichaelis

src/Dls.c

@@ -150,16 +150,14 @@ static int clamp_16bit(int v) {
 
 // TODO(lmichaelis): These are the 'built in' set of 7 predictor value pairs; additional values can be added
 //  				 to this table by including them as metadata chunks in the WAVE header
-static int ADPCM_ADAPT_COEFF1[7] = {256, 512, 0, 192, 240, 460, 392};
-static int ADPCM_ADAPT_COEFF2[7] = {0, -256, 0, 64, 0, -208, -232};
 static int16_t ADPCM_ADAPT_TABLE[16] = {230, 230, 230, 230, 307, 409, 512, 614, 768, 614, 512, 409, 307, 230, 230, 230};
 
 #define DmInt_read(src, tgt)                                                                                           \
 	memcpy((tgt), (src), sizeof(*(tgt)));                                                                              \
 	(src) += sizeof(*(tgt))
 
 // See https://wiki.multimedia.cx/index.php/Microsoft_ADPCM
-static uint8_t const* DmDls_decodeAdpcmBlock(uint8_t const* adpcm, float* pcm, uint32_t block_size) {
+static uint8_t const* DmDls_decodeAdpcmBlock(uint8_t const* adpcm, float* pcm, uint32_t block_size, int16_t const* coeff1, int16_t const* coeff2) {
 	uint8_t block_predictor;
 	DmInt_read(adpcm, &block_predictor);
 
@@ -176,8 +174,8 @@ static uint8_t const* DmDls_decodeAdpcmBlock(uint8_t const* adpcm, float* pcm, u
 	*pcm++ = (float) sample_b / (float) INT16_MAX;
 	*pcm++ = (float) sample_a / (float) INT16_MAX;
 
-	int coeff_1 = ADPCM_ADAPT_COEFF1[block_predictor];
-	int coeff_2 = ADPCM_ADAPT_COEFF2[block_predictor];
+	int coeff_1 = coeff1[block_predictor];
+	int coeff_2 = coeff2[block_predictor];
 
 	uint32_t remaining = block_size - 7 /* header */;
 	for (uint32_t i = 0; i < remaining; ++i) {
@@ -232,7 +230,7 @@ static size_t DmDls_decodeAdpcm(DmDlsWave const* slf, float* out, size_t len) {
 			break;
 		}
 
-		adpcm = DmDls_decodeAdpcmBlock(adpcm, out + offset, slf->block_align);
+		adpcm = DmDls_decodeAdpcmBlock(adpcm, out + offset, slf->block_align, slf->coefficient_table_0 , slf->coefficient_table_1);
 		offset += frames_per_block;
 	}
 

src/_Dls.h

@@ -3,23 +3,6 @@
 #pragma once
 #include "_Riff.h"
 
-typedef enum DmDlsRegionFlags {
-	DmDlsRegion_NONEXCLUSIVE = 1 << 0,
-} DmDlsRegionFlags;
-
-typedef enum DmDlsWaveSampleFlags {
-	DmDlsWave_NO_TRUNCATION = 0x11,
-	DmDlsWave_NO_COMPRESSION = 0x21,
-} DmDlsWaveSampleFlags;
-
-typedef enum DmDlsLoopType {
-	DmDlsLoop_FORWARD = 0,
-} DmDlsLoopType;
-
-typedef enum DmDlsWaveLinkFlags {
-	DmDlsWaveLink_MASTER_PHASE = 1 << 0,
-} DmDlsWaveLinkFlags;
-
 typedef enum DmDlsArticulatorSource {
 	DmDlsArticulatorSource_NONE = 0,
 	DmDlsArticulatorSource_LFO = 1,
@@ -81,10 +64,25 @@ typedef enum DmDlsArticulatorDestination {
 } DmDlsArticulatorDestination;
 
 typedef enum DmDlsArticulatorTransform {
-	DmDlsArticulatorTransform_NONE = 0,
+	DmDlsArticulatorTransform_LINEAR = 0,
 	DmDlsArticulatorTransform_CONCAVE = 1,
 	DmDlsArticulatorTransform_CONVEX = 2,
 	DmDlsArticulatorTransform_SWITCH = 3,
+
+	DmDlsArticulatorTransform_LINEAR_BIPOLAR = 0x10,
+	DmDlsArticulatorTransform_CONCAVE_BIPOLAR = 0x11,
+	DmDlsArticulatorTransform_CONVEX_BIPOLAR = 0x12,
+	DmDlsArticulatorTransform_SWITCH_BIPOLAR = 0x13,
+
+	DmDlsArticulatorTransform_LINEAR_INVERTED = 0x20,
+	DmDlsArticulatorTransform_CONCAVE_INVERTED = 0x21,
+	DmDlsArticulatorTransform_CONVEX_INVERTED = 0x22,
+	DmDlsArticulatorTransform_SWITCH_INVERTED = 0x23,
+
+	DmDlsArticulatorTransform_LINEAR_INVERTED_BIPOLAR = 0x30,
+	DmDlsArticulatorTransform_CONCAVE_INVERTED_BIPOLAR = 0x31,
+	DmDlsArticulatorTransform_CONVEX_INVERTED_BIPOLAR = 0x32,
+	DmDlsArticulatorTransform_SWITCH_INVERTED_BIPOLAR = 0x33,
 } DmDlsArticulatorTransform;
 
 enum {
@@ -96,11 +94,12 @@ enum {
 typedef struct DmDlsWaveSample {
 	uint16_t unity_note;
 	uint16_t fine_tune;
-	int32_t attenuation;
-	DmDlsWaveSampleFlags flags;
+	int32_t gain;
+	bool allow_truncation;
+	bool allow_compression;
 
 	bool looping;
-	DmDlsLoopType loop_type;
+	bool loop_with_release;
 	uint32_t loop_start;
 	uint32_t loop_length;
 } DmDlsWaveSample;
@@ -110,9 +109,11 @@ typedef struct DmDlsArticulator {
 	uint32_t connection_count;
 	struct DmDlsArticulatorConnection {
 		DmDlsArticulatorSource source;
-		uint16_t control;
+		DmDlsArticulatorSource control;
 		DmDlsArticulatorDestination destination;
-		DmDlsArticulatorTransform transform;
+		DmDlsArticulatorTransform output_transform;
+		DmDlsArticulatorTransform control_transform;
+		DmDlsArticulatorTransform source_transform;
 		int32_t scale;
 	}* connections;
 } DmDlsArticulator;
@@ -122,12 +123,14 @@ typedef struct DmDlsRegion {
 	uint16_t range_high;
 	uint16_t velocity_low;
 	uint16_t velocity_high;
-	DmDlsRegionFlags flags;
 	uint16_t key_group;
+	bool nonexclusive;
 
+	DmInfo info;
 	DmDlsWaveSample sample;
 
-	DmDlsWaveLinkFlags link_flags;
+	bool link_phase_master;
+	bool link_multi_channel;
 	uint16_t link_phase_group;
 	uint32_t link_channel;
 	uint32_t link_table_index;
@@ -168,7 +171,8 @@ typedef struct DmDlsWave {
 
 	// ADPCM only:
 	uint16_t samples_per_block;
-	uint16_t coefficient_table[14];
+	int16_t coefficient_table_0[7];
+	int16_t coefficient_table_1[7];
 
 	DmDlsWaveSample sample;
 

src/_Riff.h

@@ -50,6 +50,7 @@
 #define DM_FOURCC_INSH DM_FOURCC('i', 'n', 's', 'h')
 #define DM_FOURCC_LRGN DM_FOURCC('l', 'r', 'g', 'n')
 #define DM_FOURCC_RGN_ DM_FOURCC('r', 'g', 'n', ' ')
+#define DM_FOURCC_RGN2 DM_FOURCC('r', 'g', 'n', '2')
 #define DM_FOURCC_RGNH DM_FOURCC('r', 'g', 'n', 'h')
 #define DM_FOURCC_WSMP DM_FOURCC('w', 's', 'm', 'p')
 #define DM_FOURCC_WLNK DM_FOURCC('w', 'l', 'n', 'k')
@@ -64,6 +65,11 @@
 #define DM_FOURCC_WAVH DM_FOURCC('w', 'a', 'v', 'h')
 #define DM_FOURCC_WAVU DM_FOURCC('w', 'a', 'v', 'u')
 #define DM_FOURCC_SMPL DM_FOURCC('s', 'm', 'p', 'l')
+#define DM_FOURCC_WVST DM_FOURCC('w', 'v', 's', 't')
+#define DM_FOURCC_CUE_ DM_FOURCC('c', 'u', 'e', ' ')
+#define DM_FOURCC_ADTL DM_FOURCC('a', 'd', 't', 'l')
+#define DM_FOURCC_PAD_ DM_FOURCC('P', 'A', 'D', ' ')
+#define DM_FOURCC_INST DM_FOURCC('i', 'n', 's', 't')
 #define DM_FOURCC_STYH DM_FOURCC('s', 't', 'y', 'h')
 #define DM_FOURCC_PART DM_FOURCC('p', 'a', 'r', 't')
 #define DM_FOURCC_PRTH DM_FOURCC('p', 'r', 't', 'h')