Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

make process_buffer take bufsize const generic

Browse source
This commit is contained in:
David Kleingeld 2025-08-26 12:17:17 +02:00
parent 9521f540fd
commit efd9edb5ff
2 changed files with 22 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

11
crates/livekit_client/src/livekit_client/playback.rs
View file

@ -265,6 +265,9 @@ impl AudioStack {
num_channels: u32,
) -> Result<()> {
use crate::livekit_client::playback::source::RodioExt;
const NUM_CHANNELS: usize = 1;
const LIVEKIT_BUFFER_SIZE: usize = (SAMPLE_RATE as usize / 100) * NUM_CHANNELS as usize;
thread::spawn(move || {
let stream = rodio::microphone::MicrophoneBuilder::new()
.default_device()?
@ -276,7 +279,7 @@ impl AudioStack {
NonZero::new(SAMPLE_RATE).expect("constant is not zero"),
)
.limit(LimitSettings::live_performance())
.process_buffer(|buffer| {
.process_buffer::<LIVEKIT_BUFFER_SIZE, _>(|buffer| {
let mut int_buffer: [i16; _] = buffer.map(|s| s.to_sample());
apm.lock()
.process_stream(&mut int_buffer, sample_rate as i32, num_channels as i32)
@ -288,7 +291,11 @@ impl AudioStack {
.automatic_gain_control(1.0, 4.0, 0.0, 5.0);
loop {
let sampled = stream.by_ref().take(1000).map(|s| s.to_sample()).collect();
let sampled = stream
.by_ref()
.take(LIVEKIT_BUFFER_SIZE)
.map(|s| s.to_sample())
.collect();
if frame_tx
.unbounded_send(AudioFrame {

26
crates/livekit_client/src/livekit_client/playback/source.rs
View file

@ -73,40 +73,40 @@ impl Source for LiveKitStream {
}
pub trait RodioExt: Source + Sized {
fn process_buffer<F>(self, callback: F) -> ProcessBuffer<Self, F>
fn process_buffer<const N: usize, F>(self, callback: F) -> ProcessBuffer<N, Self, F>
where
F: FnMut(&mut [rodio::Sample; 200]);
F: FnMut(&mut [rodio::Sample; N]);
}
impl<S: Source> RodioExt for S {
fn process_buffer<F>(self, callback: F) -> ProcessBuffer<Self, F>
fn process_buffer<const N: usize, F>(self, callback: F) -> ProcessBuffer<N, Self, F>
where
F: FnMut(&mut [rodio::Sample; 200]),
F: FnMut(&mut [rodio::Sample; N]),
{
ProcessBuffer {
inner: self,
callback,
buffer: [0.0; 200],
next: 200,
buffer: [0.0; N],
next: N,
}
}
}
pub struct ProcessBuffer<S, F>
pub struct ProcessBuffer<const N: usize, S, F>
where
S: Source + Sized,
F: FnMut(&mut [rodio::Sample; 200]),
F: FnMut(&mut [rodio::Sample; N]),
{
inner: S,
callback: F,
buffer: [rodio::Sample; 200],
buffer: [rodio::Sample; N],
next: usize,
}
impl<S, F> Iterator for ProcessBuffer<S, F>
impl<const N: usize, S, F> Iterator for ProcessBuffer<S, F, N>
where
S: Source + Sized,
F: FnMut(&mut [rodio::Sample; 200]),
F: FnMut(&mut [rodio::Sample; N]),
{
type Item = rodio::Sample;
@ -128,10 +128,10 @@ where
}
// TODO dvdsk this should be a spanless Source
impl<S, F> Source for ProcessBuffer<S, F>
impl<const N: usize, S, F> Source for ProcessBuffer<N, S, F>
where
S: Source + Sized,
F: FnMut(&mut [rodio::Sample; 200]),
F: FnMut(&mut [rodio::Sample; N]),
{
fn current_span_len(&self) -> Option<usize> {
None