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

audio: handle possible invalidated pointer after buffer growth

Browse source 
Signed-off-by: Stephen Gutekanst <stephen@hexops.com>
This commit is contained in:
Stephen Gutekanst 2024-04-17 11:28:37 -07:00
parent d045b34f70
commit 7011ad4848
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/Audio.zig
View file

@ -107,7 +107,7 @@ fn audioTick(audio: *Mod) !void {
// How many audio samples we will render ahead by // How many audio samples we will render ahead by
const samples_per_ms = @as(f32, @floatFromInt(player.sampleRate())) / 1000.0; const samples_per_ms = @as(f32, @floatFromInt(player.sampleRate())) / 1000.0;
const render_ahead: u32 = @as(u32, @intFromFloat(@trunc(audio.state().ms_render_ahead * samples_per_ms))) * @as(u32, @truncate(player.channels().len)); const render_ahead: u32 = @as(u32, @intFromFloat(@trunc(audio.state().ms_render_ahead * samples_per_ms))) * @as(u32, @intCast(player.channels().len));
// Our goal is to ensure that we always have pre-rendered the number of samples the driver last // Our goal is to ensure that we always have pre-rendered the number of samples the driver last
// expected, expects, plus the play ahead amount. // expected, expects, plus the play ahead amount.
@ -122,10 +122,10 @@ fn audioTick(audio: *Mod) !void {
// Ensure our f32 mixing buffer has enough space for the samples we will render right now. // Ensure our f32 mixing buffer has enough space for the samples we will render right now.
// This will allocate to grow but never shrink. // This will allocate to grow but never shrink.
var mixing_buffer = if (audio.state().mixing_buffer) |b| b else blk: { var mixing_buffer = if (audio.state().mixing_buffer) |*b| b else blk: {
const b = try std.ArrayListUnmanaged(f32).initCapacity(allocator, render_num_samples); const b = try std.ArrayListUnmanaged(f32).initCapacity(allocator, render_num_samples);
audio.state().mixing_buffer = b; audio.state().mixing_buffer = b;
break :blk b; break :blk &audio.state().mixing_buffer.?;
}; };
try mixing_buffer.resize(allocator, render_num_samples); // grows, but never shrinks try mixing_buffer.resize(allocator, render_num_samples); // grows, but never shrinks