audio: fix time stretching regression

Megamouse · Megamouse · commit 44585b98cc12 · 2023-11-30T00:34:32.000+01:00
diff --git a/rpcs3/Emu/Audio/audio_resampler.cpp b/rpcs3/Emu/Audio/audio_resampler.cpp
@@ -33,7 +33,10 @@ void audio_resampler::put_samples(const f32* buf, u32 sample_cnt)
 
 std::pair<f32* /* buffer */, u32 /* samples */> audio_resampler::get_samples(u32 sample_cnt)
 {
-	return std::make_pair(resampler.bufBegin(), resampler.receiveSamples(sample_cnt));
+	// NOTE: Make sure to get the buffer first because receiveSamples advances its position internally
+	//       and std::make_pair evaluates the second parameter first...
+	f32 *const buf = resampler.bufBegin();
+	return std::make_pair(buf, resampler.receiveSamples(sample_cnt));
 }
 
 u32 audio_resampler::samples_available() const

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,10 @@ void audio_resampler::put_samples(const f32* buf, u32 sample_cnt)`
`33`	`33`
`34`	`34`	`std::pair<f32* /* buffer /, u32 / samples */> audio_resampler::get_samples(u32 sample_cnt)`
`35`	`35`	`{`
`36`		`- return std::make_pair(resampler.bufBegin(), resampler.receiveSamples(sample_cnt));`
	`36`	`+ // NOTE: Make sure to get the buffer first because receiveSamples advances its position internally`
	`37`	`+ // and std::make_pair evaluates the second parameter first...`
	`38`	`+ f32 *const buf = resampler.bufBegin();`
	`39`	`+ return std::make_pair(buf, resampler.receiveSamples(sample_cnt));`
`37`	`40`	`}`
`38`	`41`
`39`	`42`	`u32 audio_resampler::samples_available() const`