hound testing

.gitignore

@@ -9,7 +9,3 @@
 **/.idea/
 
 **/Cargo.lock
-
-# Test assets
-/tests/files/assets/
-/tests/picture/assets/

Cargo.toml

@@ -39,6 +39,7 @@ criterion = { version = "0.3.5", features = ["html_reports"] }
 tempfile = "3.3.0"
 # tag_writer example
 structopt = { version = "0.3.26", default-features = false }
+hound = {git="https://github.com/ruuda/hound.git", branch="master"}
 
 [lib]
 bench = false

src/iff/wav/properties.rs

@@ -91,6 +91,11 @@ impl WavProperties {
 		self.sample_rate
 	}
 
+	/// bits per sample
+	pub fn bit_depth(&self) -> u8 {
+		self.bit_depth
+	}
+
 	/// Channel count
 	pub fn channels(&self) -> u8 {
 		self.channels
@@ -118,11 +123,16 @@ pub(super) fn read_properties(
 	let sample_rate = fmt.read_u32::<LittleEndian>()?;
 	let bytes_per_second = fmt.read_u32::<LittleEndian>()?;
 
-	// Skip 2 bytes
+	let block_align = fmt.read_u16::<LittleEndian>()?;
-	// Block align (2)
-	fmt.read_u16::<LittleEndian>()?;
 
 	let bits_per_sample = fmt.read_u16::<LittleEndian>()?;
+	let bytes_per_sample = block_align / u16::from(channels);
+
+	// We allow bits_per_sample to be less than bytes_per_sample so that
+	// we can support things such as 24 bit samples in 4 byte containers.
+	if Some(bits_per_sample) > bytes_per_sample.checked_mul(8) {
+		return Err(LoftyError::Wav("sample bits exceeds size of sample"));
+	}
 
 	if format_tag == EXTENSIBLE {
 		if fmt.len() < 40 {
@@ -190,7 +200,7 @@ pub(super) fn read_properties(
 		overall_bitrate,
 		audio_bitrate,
 		sample_rate,
-		bit_depth: bits_per_sample as u8,
+		bit_depth: (bytes_per_sample * 8) as u8,
 		channels,
 	})
 }

tests/files/assets/hound/fuzz/oom-48ae4cd061ff8578ad3f23dc87624bd365cf5216.wav

@@ -0,0 +1 @@
+RIFFPIFFWAVEooooRIF±FF

tests/hound.rs

@@ -0,0 +1,30 @@
+use std::{
+	fs::{self, File},
+	path::Path,
+};
+
+use hound::WavReader;
+use lofty::{iff::WavFile, AudioFile};
+
+fn get_properties(path: &Path) -> <lofty::iff::WavFile as AudioFile>::Properties {
+	let mut f = File::open(path).unwrap();
+	let wav_file = WavFile::read_from(&mut f, true).unwrap();
+	*wav_file.properties()
+}
+
+#[test]
+fn hound() {
+	let paths = fs::read_dir("tests/files/assets/hound").unwrap();
+
+	for path in paths {
+		let path = path.unwrap().path();
+		if path.is_file() && path.extension().unwrap() == "wav" {
+			println!("Name: {}", path.display());
+			let wav_reader = WavReader::open(&path).unwrap();
+			let lofty = get_properties(&path);
+			assert_eq!(wav_reader.spec().channels, lofty.channels() as u16);
+			assert_eq!(wav_reader.spec().sample_rate, lofty.sample_rate());
+			assert_eq!(wav_reader.spec().bits_per_sample, lofty.bit_depth() as u16);
+		}
+	}
+}