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

sysaudio: fix clicking by tracking frame_offset

Browse source 
The offset into the planar_buffer was not being stored, so any time
multiple iterations occured the beginning of the wave was copied again,
instead of correctly copying the next part of the planar_buffer.
This commit is contained in:
Louis Pearson 2022-09-09 20:13:45 -06:00 • committed by Stephen Gutekanst
parent b282641300
commit f29c3aac08
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
libs/sysaudio/src/soundio.zig
View file

@ -80,10 +80,11 @@ pub const Device = struct {
const addr = @ptrToInt(&device.planar_buffer); const addr = @ptrToInt(&device.planar_buffer);
const aligned_addr = std.mem.alignForward(addr, @alignOf(f32)); const aligned_addr = std.mem.alignForward(addr, @alignOf(f32));
const padding = aligned_addr - addr; const padding = aligned_addr - addr;
const planar_buffer = device.planar_buffer[padding..buffer_size]; const planar_buffer = device.planar_buffer[padding..padding + buffer_size];
device.data_callback.?(device, device.user_data.?, planar_buffer); device.data_callback.?(device, device.user_data.?, planar_buffer);
var frames_left = total_frame_count; var frames_left = total_frame_count;
var frame_offset: usize = 0;
while (frames_left > 0) { while (frames_left > 0) {
var frame_count: i32 = @intCast(i32, frames_left); var frame_count: i32 = @intCast(i32, frames_left);
@ -101,7 +102,7 @@ pub const Device = struct {
const channel_ptr = areas[channel].ptr; const channel_ptr = areas[channel].ptr;
var frame: c_int = 0; var frame: c_int = 0;
while (frame < frame_count) : (frame += 1) { while (frame < frame_count) : (frame += 1) {
const sample_start = (channel * total_frame_count * @sizeOf(f32)) + (@intCast(usize, frame) * @sizeOf(f32)); const sample_start = (channel * total_frame_count * @sizeOf(f32)) + ((frame_offset + @intCast(usize, frame)) * @sizeOf(f32));
const src = @ptrCast(*f32, @alignCast(@alignOf(f32), &planar_buffer[sample_start])); const src = @ptrCast(*f32, @alignCast(@alignOf(f32), &planar_buffer[sample_start]));
const dst = &channel_ptr[@intCast(usize, areas[channel].step * frame)]; const dst = &channel_ptr[@intCast(usize, areas[channel].step * frame)];
@ptrCast(*f32, @alignCast(@alignOf(f32), dst)).* = src.*; @ptrCast(*f32, @alignCast(@alignOf(f32), dst)).* = src.*;
@ -110,6 +111,7 @@ pub const Device = struct {
// TODO(sysaudio): improve error handling // TODO(sysaudio): improve error handling
outstream.endWrite() catch |err| std.debug.panic("end write failed: {s}", .{@errorName(err)}); outstream.endWrite() catch |err| std.debug.panic("end write failed: {s}", .{@errorName(err)});
frames_left -= @intCast(usize, frame_count); frames_left -= @intCast(usize, frame_count);
frame_offset += @intCast(usize, frame_count);
} }
} }
}).cCallback); }).cCallback);