Skip to content

wasapi: Enable resampling and rate adjustment #1097

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

Merged
roderickvd merged 5 commits into from
Jan 29, 2026
Merged

wasapi: Enable resampling and rate adjustment #1097

Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
95cc3bd
wasapi: Enable resampling and rate adjustment
yeah-its-gloria Jan 23, 2026
961323e
wasapi: Fix formatting
yeah-its-gloria Jan 23, 2026
c3ea12a
wasapi: Remove format check
yeah-its-gloria Jan 23, 2026
5af12c5
wasapi: Remove unused format checks and flags
yeah-its-gloria Jan 25, 2026
774f8f4
wasapi: Add Changelog entry
yeah-its-gloria Jan 25, 2026
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
23 changes: 16 additions & 7 deletions src/host/wasapi/device.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ use super::{windows_err_to_cpal_err, windows_err_to_cpal_err_message};
use windows::core::Interface;
use windows::core::GUID;
use windows::Win32::Devices::Properties;
use windows::Win32::Foundation;
//use windows::Win32::Foundation;
use windows::Win32::Foundation::PROPERTYKEY;
use windows::Win32::Media::Audio::IAudioRenderClient;
use windows::Win32::Media::{Audio, KernelStreaming, Multimedia};
Expand Down Expand Up @@ -61,6 +61,11 @@ const PKEY_AUDIOENDPOINT_JACKSUBTYPE: PROPERTYKEY = PROPERTYKEY {
pid: 8,
};

const DEFAULT_FLAGS: u32 = Audio::AUDCLNT_STREAMFLAGS_EVENTCALLBACK
| Audio::AUDCLNT_STREAMFLAGS_RATEADJUST
Comment thread
yeah-its-gloria marked this conversation as resolved.
Outdated
| Audio::AUDCLNT_STREAMFLAGS_SRC_DEFAULT_QUALITY
| Audio::AUDCLNT_STREAMFLAGS_AUTOCONVERTPCM;

/// Wrapper because of that stupid decision to remove `Send` and `Sync` from raw pointers.
#[derive(Clone)]
struct IAudioClientWrapper(Audio::IAudioClient);
Expand Down Expand Up @@ -187,10 +192,12 @@ unsafe fn data_flow_from_immendpoint(endpoint: &Audio::IMMEndpoint) -> Audio::ED

// Given the audio client and format, returns whether or not the format is supported.
pub unsafe fn is_format_supported(
client: &Audio::IAudioClient,
waveformatex_ptr: *const Audio::WAVEFORMATEX,
_client: &Audio::IAudioClient,
_waveformatex_ptr: *const Audio::WAVEFORMATEX,
) -> Result<bool, SupportedStreamConfigsError> {
// Check if the given format is supported.
// Checking formats is not needed for shared mode with auto-conversion, therefore this check has been removed until someone implements WASAPI exclusive mode support
Comment thread
yeah-its-gloria marked this conversation as resolved.
// I used an NAudio issue as reference: https://github.com/naudio/NAudio/issues/819
/* // Check if the given format is supported.
let mut closest_waveformatex_ptr: *mut Audio::WAVEFORMATEX = ptr::null_mut();

let result = client.IsFormatSupported(
Expand All @@ -210,7 +217,9 @@ pub unsafe fn is_format_supported(
r if r.is_err() => Ok(false),
Foundation::S_FALSE => Ok(false),
_ => Ok(true),
}
}*/

Ok(true)
}

// Get a cpal Format from a WAVEFORMATEX.
Expand Down Expand Up @@ -696,7 +705,7 @@ impl Device {
// will return `AUDCLNT_E_BUFFER_SIZE_ERROR` if the buffer size is not supported.
let buffer_duration = buffer_size_to_duration(&config.buffer_size, config.sample_rate);

let mut stream_flags = Audio::AUDCLNT_STREAMFLAGS_EVENTCALLBACK;
let mut stream_flags = DEFAULT_FLAGS;
Comment thread
yeah-its-gloria marked this conversation as resolved.

if self.data_flow() == Audio::eRender {
stream_flags |= Audio::AUDCLNT_STREAMFLAGS_LOOPBACK;
Expand Down Expand Up @@ -829,7 +838,7 @@ impl Device {
audio_client
.Initialize(
share_mode,
Audio::AUDCLNT_STREAMFLAGS_EVENTCALLBACK,
DEFAULT_FLAGS,
buffer_duration,
0,
&format_attempt.Format,
Expand Down