zig/mach
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sysaudio: fix wasapi wave format selection

Browse source
This commit is contained in:
Andrew Gutekanst 2024-05-11 04:49:08 -04:00 • committed by Stephen Gutekanst
parent 92086d8d66
commit f080a1c31e
1 changed files with 23 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

59
src/sysaudio/wasapi.zig
View file

@ -250,10 +250,11 @@ pub const Context = struct {
var fmt_arr = std.ArrayList(main.Format).init(ctx.allocator); var fmt_arr = std.ArrayList(main.Format).init(ctx.allocator);
var closest_match: ?*win32.WAVEFORMATEX = null; var closest_match: ?*win32.WAVEFORMATEX = null;
for (std.meta.tags(main.Format)) |format| { for (std.meta.tags(main.Format)) |format| {
setWaveFormatFormat(wf, format); const wave_format = makeWaveFormatExtensible(format, channels, @intCast(wf.Format.nSamplesPerSec));
if (audio_client.?.IsFormatSupported( if (audio_client.?.IsFormatSupported(
.SHARED, .SHARED,
@as(?*const win32.WAVEFORMATEX, @ptrCast(@alignCast(wf))), @as(?*const win32.WAVEFORMATEX, @ptrCast(@alignCast(&wave_format))),
&closest_match, &closest_match,
) == win32.S_OK) { ) == win32.S_OK) {
try fmt_arr.append(format); try fmt_arr.append(format);
@ -381,24 +382,6 @@ pub const Context = struct {
}; };
} }
fn setWaveFormatFormat(wf: *win32.WAVEFORMATEXTENSIBLE, format: main.Format) void {
switch (format) {
.u8,
.i16,
// TODO(i24)
// .i24,
.i32,
=> {
wf.SubFormat = win32.CLSID_KSDATAFORMAT_SUBTYPE_PCM.*;
},
.f32 => {
wf.SubFormat = win32.CLSID_KSDATAFORMAT_SUBTYPE_IEEE_FLOAT.*;
},
}
wf.Format.wBitsPerSample = format.sizeBits();
wf.Samples.wValidBitsPerSample = format.validSizeBits();
}
fn getDefaultAudioEndpoint(ctx: *Context, mode: main.Device.Mode) !?[:0]u8 { fn getDefaultAudioEndpoint(ctx: *Context, mode: main.Device.Mode) !?[:0]u8 {
var default_playback_device: ?*win32.IMMDevice = null; var default_playback_device: ?*win32.IMMDevice = null;
var hr = ctx.enumerator.?.GetDefaultAudioEndpoint( var hr = ctx.enumerator.?.GetDefaultAudioEndpoint(
@ -477,22 +460,7 @@ pub const Context = struct {
} }
} }
const wave_format = win32.WAVEFORMATEXTENSIBLE{ const wave_format = makeWaveFormatExtensible(format, device.channels, sample_rate);
.Format = .{
.wFormatTag = win32.WAVE_FORMAT_EXTENSIBLE,
.nChannels = @as(u16, @intCast(device.channels.len)),
.nSamplesPerSec = sample_rate,
.nAvgBytesPerSec = sample_rate * format.frameSize(@intCast(device.channels.len)),
.nBlockAlign = format.frameSize(@intCast(device.channels.len)),
.wBitsPerSample = format.sizeBits(),
.cbSize = 0x16,
},
.Samples = .{
.wValidBitsPerSample = format.validSizeBits(),
},
.dwChannelMask = toChannelMask(device.channels),
.SubFormat = toSubFormat(format),
};
if (!ctx.is_wine and audio_client3.* != null) { if (!ctx.is_wine and audio_client3.* != null) {
hr = audio_client3.*.?.InitializeSharedAudioStream( hr = audio_client3.*.?.InitializeSharedAudioStream(
@ -686,6 +654,25 @@ pub const Context = struct {
return .{ .wasapi = recorder }; return .{ .wasapi = recorder };
} }
fn makeWaveFormatExtensible(format: main.Format, channels: []const main.ChannelPosition, sample_rate: u24) win32.WAVEFORMATEXTENSIBLE {
return win32.WAVEFORMATEXTENSIBLE{
.Format = .{
.wFormatTag = win32.WAVE_FORMAT_EXTENSIBLE,
.nChannels = @as(u16, @intCast(channels.len)),
.nSamplesPerSec = sample_rate,
.nAvgBytesPerSec = sample_rate * format.frameSize(@intCast(channels.len)),
.nBlockAlign = format.frameSize(@intCast(channels.len)),
.wBitsPerSample = format.sizeBits(),
.cbSize = 0x16,
},
.Samples = .{
.wValidBitsPerSample = format.validSizeBits(),
},
.dwChannelMask = toChannelMask(channels),
.SubFormat = toSubFormat(format),
};
}
fn toSubFormat(format: main.Format) win32.Guid { fn toSubFormat(format: main.Format) win32.Guid {
return switch (format) { return switch (format) {
.u8, .u8,