resource: cleanup

Author: dbartolini

src/resource/sound_wav.cpp

@@ -21,17 +21,16 @@ namespace wav
 	// See: https://www.mmsp.ece.mcgill.ca/Documents/AudioFormats/WAVE/WAVE.html
 	struct WavHeader
 	{
-		// Header chunk.
-		char riff[4];       // Must contain 'RIFF'.
-		s32 file_size;      // Total file size minus 8.
-		char wave[4];       // Must contain 'WAVE'.
+		char fourcc[4];      // Must contain 'RIFF'.
+		s32 file_size;       // Total file size minus 8.
+		char wave_fourcc[4]; // Must contain 'WAVE'.
 	};
 
 	struct WavFormat
 	{
-		char fmt[4];        // Must contain 'fmt '.
-		s32 fmt_chunk_size; // Size of format chunk minus 8.
-		s16 tag;            // 1 = PCM integer, 3 = float.
+		char fourcc[4];     // Must contain 'fmt '.
+		s32 size;           // Size of this chunk minus 8.
+		s16 tag;            // See WAVE_FORMAT_*
 		s16 channels;       // Number of channels.
 		s32 sample_rate;    // Sample rate in Hz.
 		s32 byte_per_sec;   // Number of bytes to read per second (sample_rate * byte_per_block).
@@ -41,7 +40,7 @@ namespace wav
 
 	struct WavFormatExt
 	{
-		s16 ext_size; // Size of extension (0 or 22).
+		s16 size; // Size of extended data (0 or 22).
 	};
 
 	struct WavFormatExt22
@@ -53,8 +52,8 @@ namespace wav
 
 	struct WavData
 	{
-		char data[4];  // Must contain 'data'.
-		s32 data_size; // Samples size in bytes.
+		char fourcc[4]; // Must contain 'data'.
+		s32 size;       // Samples size in bytes.
 		// Data.
 	};
 
@@ -70,8 +69,8 @@ namespace wav
 		const WavHeader *wav = (WavHeader *)array::begin(buf);
 
 		// Validate header chunk.
-		RETURN_IF_FALSE(WAV, strncmp(wav->riff, "RIFF", 4) == 0, opts, "Bad header chunk");
-		RETURN_IF_FALSE(WAV, strncmp(wav->wave, "WAVE", 4) == 0, opts, "Bad header chunk");
+		RETURN_IF_FALSE(WAV, strncmp(wav->fourcc, "RIFF", 4) == 0, opts, "Bad header chunk");
+		RETURN_IF_FALSE(WAV, strncmp(wav->wave_fourcc, "WAVE", 4) == 0, opts, "Bad header chunk");
 		RETURN_IF_FALSE(WAV, (s32)array::size(buf) == wav->file_size + 8, opts, "Truncated source");
 
 		const WavFormat *fmt = (WavFormat *)&wav[1];
@@ -80,22 +79,22 @@ namespace wav
 		const WavData *data = NULL;
 
 		// Validate format chunk.
-		RETURN_IF_FALSE(WAV, strncmp(fmt->fmt, "fmt ", 4) == 0, opts, "Bad data format chunk");
+		RETURN_IF_FALSE(WAV, strncmp(fmt->fourcc, "fmt ", 4) == 0, opts, "Bad data format chunk");
 		RETURN_IF_FALSE(WAV, fmt->tag == WAVE_FORMAT_PCM, opts, "Unsupported data format");
 
-		if (fmt->fmt_chunk_size == 40 || fmt->fmt_chunk_size == 18) {
+		if (fmt->size == 40 || fmt->size == 18) {
 			fmt_ext = (WavFormatExt *)&fmt[1];
 
-			if (fmt->fmt_chunk_size == 40) {
-				RETURN_IF_FALSE(WAV, fmt_ext->ext_size == 22, opts, "Bad extended data format size");
+			if (fmt->size == 40) {
+				RETURN_IF_FALSE(WAV, fmt_ext->size == 22, opts, "Bad extended data format size");
 				fmt_ext22 = (WavFormatExt22 *)&fmt_ext[1];
 				data = (WavData *)&fmt_ext22[1];
 			} else {
-				RETURN_IF_FALSE(WAV, fmt_ext->ext_size == 0, opts, "Bad extended data format size");
+				RETURN_IF_FALSE(WAV, fmt_ext->size == 0, opts, "Bad extended data format size");
 				data = (WavData *)&fmt_ext[1];
 			}
 		} else {
-			RETURN_IF_FALSE(WAV, fmt->fmt_chunk_size == 16, opts, "Bad data format size");
+			RETURN_IF_FALSE(WAV, fmt->size == 16, opts, "Bad data format size");
 			// Some encoders write extended format data even though they report the format chunk to
 			// be 16-bytes long (i.e. standard, non-extended length). Scan the buffer for the 'data'
 			// chunk.
@@ -126,14 +125,14 @@ namespace wav
 			);
 
 		// Validate data chunk.
-		RETURN_IF_FALSE(WAV, strncmp(data->data, "data", 4) == 0, opts, "Bad data chunk");
-		RETURN_IF_FALSE(WAV, data->data_size <= s32(array::size(buf) - sizeof(*wav)), opts, "Bad data chunk size");
+		RETURN_IF_FALSE(WAV, strncmp(data->fourcc, "data", 4) == 0, opts, "Bad data chunk");
+		RETURN_IF_FALSE(WAV, data->size <= s32(array::size(buf) - sizeof(*wav)), opts, "Bad data chunk size");
 
 		// Convert to intermediate 32-bit float.
 		if (fmt->bit_depth == 8) {
 			const f32 scale = 255.0f;
 			const u8 *pcm = (u8 *)&data[1];
-			for (s32 i = 0; i < data->data_size; i += fmt->byte_per_block) {
+			for (s32 i = 0; i < data->size; i += fmt->byte_per_block) {
 				for (s16 c = 0; c < fmt->channels; ++c) {
 					const f32 conv = *pcm++ / scale * 2.0f - 1.0f;
 					array::push_back(s._samples, clamp(conv, -1.0f, 1.0f));
@@ -142,7 +141,7 @@ namespace wav
 		} else if (fmt->bit_depth == 16) {
 			const f32 scale = 32768.0f;
 			const s16 *pcm = (s16 *)&data[1];
-			for (s32 i = 0; i < data->data_size; i += fmt->byte_per_block) {
+			for (s32 i = 0; i < data->size; i += fmt->byte_per_block) {
 				for (s16 c = 0; c < fmt->channels; ++c) {
 					const f32 conv = *pcm++ / scale;
 					array::push_back(s._samples, clamp(conv, -1.0f, 1.0f));