Skip to content

Reuse output buffer for directaudio, instead of reallocating each iteration #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
oliped wants to merge 2 commits into from
Closed

Reuse output buffer for directaudio, instead of reallocating each iteration #15

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8343d34
reuse buffers for directaudio
oliped Jan 14, 2025
3839645
reset buffer to zero
oliped Jan 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 19 additions & 18 deletions src/directsound.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,9 +218,9 @@ impl AudioOutputDevice for DirectSoundDevice {
DataSender {
buffer,
notify_points,
data_buffer: vec![0.0; channel_sample_count * channels_count]
.into_boxed_slice(),
data_callback,
channels_count,
channel_sample_count,
is_running: is_running.clone(),
}
.run_in_thread(),
Expand Down Expand Up @@ -257,9 +257,8 @@ impl Drop for DirectSoundDevice {
struct DataSender<C> {
buffer: *mut IDirectSoundBuffer,
notify_points: [*mut c_void; 2],
data_buffer: Box<[f32]>,
data_callback: C,
channels_count: usize,
channel_sample_count: usize,
is_running: Arc<AtomicBool>,
}

Expand All @@ -278,27 +277,26 @@ where
}

unsafe fn run_send_loop(&mut self) {
let mut data_buffer = vec![0.0; self.channel_sample_count * self.channels_count];
let device_buffer_half_len_bytes = (data_buffer.len() * size_of::<DeviceSample>()) as DWORD;
let device_buffer_half_len_bytes =
(self.data_buffer.len() * size_of::<DeviceSample>()) as DWORD;

while self.is_running.load(Ordering::SeqCst) {
(self.data_callback)(&mut data_buffer);
self.data_buffer.fill(0.0);
(self.data_callback)(&mut self.data_buffer);

// Wait and send.
const WAIT_OBJECT_1: u32 = WAIT_OBJECT_0 + 1;
match WaitForMultipleObjects(2, self.notify_points.as_ptr(), 0, INFINITE) {
WAIT_OBJECT_0 => self.write(
device_buffer_half_len_bytes,
device_buffer_half_len_bytes,
&data_buffer,
),
WAIT_OBJECT_1 => self.write(0, device_buffer_half_len_bytes, &data_buffer),
WAIT_OBJECT_0 => {
self.write(device_buffer_half_len_bytes, device_buffer_half_len_bytes)
}
WAIT_OBJECT_1 => self.write(0, device_buffer_half_len_bytes),
_ => panic!("Unknown buffer point!"),
}
}
}

unsafe fn write(&self, offset_bytes: DWORD, len_bytes: DWORD, data_buffer: &[f32]) {
unsafe fn write(&self, offset_bytes: DWORD, len_bytes: DWORD) {
let mut size = 0;
let mut device_buffer = null_mut();
check(
Expand All @@ -317,12 +315,15 @@ where

let device_buffer_slice = std::slice::from_raw_parts_mut::<DeviceSample>(
device_buffer as *mut _,
data_buffer.len(),
self.data_buffer.len(),
);

debug_assert_eq!(size as usize, data_buffer.len() * size_of::<DeviceSample>());
debug_assert_eq!(device_buffer_slice.len(), data_buffer.len());
for (in_sample, out_sample) in data_buffer.iter().zip(device_buffer_slice) {
debug_assert_eq!(
size as usize,
self.data_buffer.len() * size_of::<DeviceSample>()
);
debug_assert_eq!(device_buffer_slice.len(), self.data_buffer.len());
for (in_sample, out_sample) in self.data_buffer.iter().zip(device_buffer_slice) {
*out_sample = (in_sample * DeviceSample::MAX as f32) as DeviceSample;
}

Expand Down