From 8f8b98a250c8454891f16d82a5b20f67bf93a103 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20=C3=81lvarez=20D=C3=ADez?= Date: Sat, 14 May 2022 12:40:59 +0200 Subject: [PATCH] rustpotter 0.8.1; support multi-channel samples --- Cargo.lock | 6 +++--- Cargo.toml | 4 ++-- src/cli/devices.rs | 2 +- src/cli/test_model.rs | 3 +-- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0ed477e..6eee663 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -462,9 +462,9 @@ dependencies = [ [[package]] name = "rustpotter" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "807f70504938f27c0f5198b206eea5596fa8d533701056d78f4d9c0da6fd3173" +checksum = "cc7e9058bb91e5e3ef03cae0183d96a7ccb3e963b0b736eb85de2cc445a02707" dependencies = [ "hound", "log", @@ -479,7 +479,7 @@ dependencies = [ [[package]] name = "rustpotter-cli" -version = "0.8.0" +version = "0.8.1" dependencies = [ "clap", "ctrlc", diff --git a/Cargo.toml b/Cargo.toml index 21f1578..650112f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "rustpotter-cli" -version = "0.8.0" +version = "0.8.1" edition = "2021" license = "Apache-2.0" description = "CLI for Rustpotter, a free and open source wake word spotter forged in rust" @@ -8,7 +8,7 @@ description = "CLI for Rustpotter, a free and open source wake word spotter forg # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -rustpotter = "0.8.0" +rustpotter = "0.8.1" log = "0.4.6" pv_recorder = "1.0.2" ctrlc = "3.2.2" diff --git a/src/cli/devices.rs b/src/cli/devices.rs index 5c82a40..c642f88 100644 --- a/src/cli/devices.rs +++ b/src/cli/devices.rs @@ -1,6 +1,6 @@ use clap::Args; use pv_recorder::RecorderBuilder; -// #[cfg(not(debug_assertions))] +#[cfg(not(debug_assertions))] use crate::pv_recorder_utils::_get_pv_recorder_lib; #[derive(Args, Debug)] /// Record audio sample diff --git a/src/cli/test_model.rs b/src/cli/test_model.rs index e6ab1ae..f7f406a 100644 --- a/src/cli/test_model.rs +++ b/src/cli/test_model.rs @@ -38,14 +38,13 @@ pub fn test(command: TestModelCommand) -> Result<(), String> { BufReader::new(File::open(command.sample_path).or_else(|err| Err(err.to_string()))?); let mut wav_reader = WavReader::new(reader).or_else(|err| Err(err.to_string()))?; let wav_specs = wav_reader.spec(); - // multi-channel still not supported - assert!(wav_specs.channels == 1); let mut word_detector = detector_builder .set_averaged_threshold(command.averaged_threshold) .set_threshold(command.threshold) .set_sample_rate(wav_specs.sample_rate as usize) .set_bits_per_sample(wav_specs.bits_per_sample) .set_sample_format(wav_specs.sample_format) + .set_channels(wav_specs.channels) .build(); let add_wakeword_result = word_detector.add_wakeword_from_model_file(command.model_path, true); if add_wakeword_result.is_err() {