From 26980f875ac6832404811daba75116fa6c11f891 Mon Sep 17 00:00:00 2001
From: manongjohn <manongjohn@users.noreply.github.com>
Date: Tue, 15 Jun 2021 22:42:16 -0400
Subject: [PATCH] Add support for 32bit PCM WAV files

---
 rhubarb/src/audio/WaveFileReader.cpp | 12 +++++++++++-
 rhubarb/src/audio/WaveFileReader.h   |  1 +
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/rhubarb/src/audio/WaveFileReader.cpp b/rhubarb/src/audio/WaveFileReader.cpp
index df24ccb..30da921 100644
--- a/rhubarb/src/audio/WaveFileReader.cpp
+++ b/rhubarb/src/audio/WaveFileReader.cpp
@@ -4,6 +4,7 @@
 #include <iostream>
 #include "tools/platformTools.h"
 #include "tools/fileTools.h"
+#include <climits>
 
 using std::runtime_error;
 using fmt::format;
@@ -18,7 +19,7 @@ using std::filesystem::path;
 #define INT24_MAX 8388607
 
 // Converts an int in the range min..max to a float in the range -1..1
-float toNormalizedFloat(int value, int min, int max) {
+float toNormalizedFloat(int64_t value, int64_t min, int64_t max) {
 	return (static_cast<float>(value - min) / (max - min) * 2) - 1;
 }
 
@@ -97,6 +98,9 @@ WaveFileReader::WaveFileReader(const path& filePath) :
 						} else if (bitsPerSample <= 24) {
 							formatInfo.sampleFormat = SampleFormat::Int24;
 							bytesPerSample = 3;
+						} else if (bitsPerSample <= 32) {
+							formatInfo.sampleFormat = SampleFormat::Int32;
+							bytesPerSample = 4;
 						} else {
 							throw runtime_error(
 								format("Unsupported sample format: {}-bit PCM.", bitsPerSample));
@@ -172,6 +176,12 @@ inline AudioClip::value_type readSample(
 				sum += toNormalizedFloat(raw, INT24_MIN, INT24_MAX);
 				break;
 			}
+			case SampleFormat::Int32:
+			{
+				int raw = read<int>(file);
+				sum += toNormalizedFloat(raw, INT_MIN, INT_MAX);
+				break;
+			}
 			case SampleFormat::Float32:
 			{
 				sum += read<float>(file);
diff --git a/rhubarb/src/audio/WaveFileReader.h b/rhubarb/src/audio/WaveFileReader.h
index c200f35..208b074 100644
--- a/rhubarb/src/audio/WaveFileReader.h
+++ b/rhubarb/src/audio/WaveFileReader.h
@@ -7,6 +7,7 @@ enum class SampleFormat {
 	UInt8,
 	Int16,
 	Int24,
+	Int32,
 	Float32
 };