gogs
/
rust-whisper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix so each buffer page isnt stream_step from last BUT stream_step of content

master
Bel LaPointe 2023-12-20 23:43:06 -05:00
parent 6bb29c106f
commit e74a5ac0ca
2 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
rust-whisper-baked-lib/src/lib.rs
View File

@ -1,20 +1,21 @@
use rust_whisper_lib; use rust_whisper_lib;
pub fn wav<F>(
mut flags: rust_whisper_lib::Flags,
handler_fn: F
) where F: FnMut(Result<rust_whisper_lib::Transcribed, String>) + Send + 'static {
flags.model_path = None;
flags.model_buffer = Some(include_bytes!("../../models/ggml-small.en.bin").to_vec());
rust_whisper_lib::wav(flags.clone(), handler_fn, flags.wav.unwrap());
}
pub fn channel<F>( pub fn channel<F>(
mut flags: rust_whisper_lib::Flags, mut flags: rust_whisper_lib::Flags,
handler_fn: F, handler_fn: F,
stream: std::sync::mpsc::Receiver<Vec<f32>>, stream: std::sync::mpsc::Receiver<Vec<f32>>,
) where F: FnMut(Result<rust_whisper_lib::Transcribed, String>) + Send + 'static { ) where F: FnMut(Result<rust_whisper_lib::Transcribed, String>) + Send + 'static {
flags.model_path = None; flags.model_path = None;
flags.model_buffer = Some(include_bytes!("../../models/ggml-tiny.en.bin").to_vec()); flags.model_buffer = Some(include_bytes!("../../models/ggml-small.en.bin").to_vec());
rust_whisper_lib::channel(flags.clone(), handler_fn, stream); rust_whisper_lib::channel(flags.clone(), handler_fn, stream);
} }
pub fn wav<F>(
mut flags: rust_whisper_lib::Flags,
handler_fn: F
) where F: FnMut(Result<rust_whisper_lib::Transcribed, String>) + Send + 'static {
flags.model_path = None;
flags.model_buffer = Some(include_bytes!("../../models/ggml-distil-large-v2.bin").to_vec());
rust_whisper_lib::wav(flags.clone(), handler_fn, flags.wav.unwrap());
}

6
rust-whisper-lib/src/lib.rs
View File

@ -1,5 +1,4 @@
use whisper_rs::{WhisperContext, FullParams, SamplingStrategy, WhisperError}; use whisper_rs::{WhisperContext, FullParams, SamplingStrategy, WhisperError};
use std::time::{Duration, Instant};
use clap::Parser; use clap::Parser;
use std::thread; use std::thread;
use std::fs::File; use std::fs::File;
@ -63,16 +62,14 @@ pub fn channel<F>(flags: Flags, handler_fn: F, stream: std::sync::mpsc::Receiver
handler_fn, handler_fn,
).unwrap(); ).unwrap();
let stream_retain = (flags.stream_retain * 16_000.0) as usize; let stream_retain = (flags.stream_retain * 16_000.0) as usize;
let stream_step = Duration::new(flags.stream_step, 0);
match &flags.debug { match &flags.debug {
true => { File::create("/tmp/page.rawf32audio").unwrap(); }, true => { File::create("/tmp/page.rawf32audio").unwrap(); },
false => {}, false => {},
}; };
let mut buffer = vec![]; let mut buffer = vec![];
let mut last = Instant::now();
for data in stream.iter() { for data in stream.iter() {
data.iter().for_each(|x| buffer.push(*x)); data.iter().for_each(|x| buffer.push(*x));
if Instant::now() - last > stream_step { if buffer.len() >= (flags.stream_step * 16_000) as usize {
w.transcribe_async(&buffer).unwrap(); w.transcribe_async(&buffer).unwrap();
match &flags.debug { match &flags.debug {
@ -93,7 +90,6 @@ pub fn channel<F>(flags: Flags, handler_fn: F, stream: std::sync::mpsc::Receiver
buffer[i] = buffer[buffer.len() - stream_retain + i]; buffer[i] = buffer[buffer.len() - stream_retain + i];
} }
buffer.truncate(stream_retain); buffer.truncate(stream_retain);
last = Instant::now();
} }
} }
} }