From 2c6ab9dd1fb214ca0a77a4eb0cb1cb1202ca1176 Mon Sep 17 00:00:00 2001 From: Tomasz Andrzejak Date: Tue, 1 Feb 2022 00:16:20 +0100 Subject: [PATCH] Bump hrtf to version 0.8 hrtfrender tests are now using a fake hrir configuration file which is stripped of actual position coefficients. The generated config does not work anymore. --- audio/audiofx/Cargo.toml | 2 +- audio/audiofx/tests/hrtfrender.rs | 39 ++---------------------------- audio/audiofx/tests/test.hrir | Bin 0 -> 8200 bytes 3 files changed, 3 insertions(+), 38 deletions(-) create mode 100644 audio/audiofx/tests/test.hrir diff --git a/audio/audiofx/Cargo.toml b/audio/audiofx/Cargo.toml index 53712ecea..c0f431502 100644 --- a/audio/audiofx/Cargo.toml +++ b/audio/audiofx/Cargo.toml @@ -17,7 +17,7 @@ byte-slice-cast = "1.0" num-traits = "0.2" once_cell = "1.0" ebur128 = "0.1" -hrtf = "0.7" +hrtf = "0.8" nnnoiseless = { version = "0.3", default-features = false } smallvec = "1" atomic_refcell = "0.1" diff --git a/audio/audiofx/tests/hrtfrender.rs b/audio/audiofx/tests/hrtfrender.rs index b8fbe453a..a84e64be9 100644 --- a/audio/audiofx/tests/hrtfrender.rs +++ b/audio/audiofx/tests/hrtfrender.rs @@ -10,47 +10,12 @@ use gst::glib; use gst::prelude::*; use once_cell::sync::Lazy; -use std::io::{Cursor, Write}; static CONFIG: Lazy = Lazy::new(|| { - let mut buff = Cursor::new(vec![0u8; 1024]); - - write_config(&mut buff).unwrap(); - glib::Bytes::from_owned(buff.get_ref().to_owned()) + let buff = include_bytes!("test.hrir"); + glib::Bytes::from_owned(buff) }); -// Generates a fake config -fn write_config(writer: &mut impl Write) -> std::io::Result<()> { - const SAMPLE_RATE: u32 = 44_100; - const LENGTH: u32 = 2; - const VERTEX_COUNT: u32 = 2; - const INDEX_COUNT: u32 = 2 * 3; - - writer.write_all(b"HRIR")?; - writer.write_all(&SAMPLE_RATE.to_le_bytes())?; - writer.write_all(&LENGTH.to_le_bytes())?; - writer.write_all(&VERTEX_COUNT.to_le_bytes())?; - writer.write_all(&INDEX_COUNT.to_le_bytes())?; - - // Write Indices - for _ in 0..INDEX_COUNT { - writer.write_all(&0u32.to_le_bytes())?; - } - - // Write Vertices - for _ in 0..VERTEX_COUNT { - for _ in 0..3 { - writer.write_all(&0u32.to_le_bytes())?; - } - - for _ in 0..LENGTH * 2 { - writer.write_all(&0f32.to_le_bytes())?; - } - } - - Ok(()) -} - fn init() { use std::sync::Once; static INIT: Once = Once::new(); diff --git a/audio/audiofx/tests/test.hrir b/audio/audiofx/tests/test.hrir new file mode 100644 index 0000000000000000000000000000000000000000..faf424a4d2a21c24cab4eea90d7d3c626bf73e53 GIT binary patch literal 8200 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