dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Win32: Increase buffer size and count in wave out sound driver

Browse Source 
Ensure that wave structs are zero-inited and buffers are freed
This commit is contained in:
Jonathan G Rennison
2024-04-22 17:24:44 +01:00
parent 3136f08b86
commit 69e7c1697e
1 changed files with 26 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/sound/win32_s.cpp
View File

@@ -26,18 +26,26 @@
static FSoundDriver_Win32 iFSoundDriver_Win32; static FSoundDriver_Win32 iFSoundDriver_Win32;
static HWAVEOUT _waveout; static HWAVEOUT _waveout;
static WAVEHDR _wave_hdr[2]; static std::array<WAVEHDR, 3> _wave_hdr{};
static int _bufsize; static int _bufsize;
static HANDLE _thread; static HANDLE _thread;
static DWORD _threadId; static DWORD _threadId;
static HANDLE _event; static HANDLE _event;
static void PrepareHeader(WAVEHDR *hdr) static void PrepareHeader(HWAVEOUT waveout, WAVEHDR &hdr)
{ {
hdr->dwBufferLength = _bufsize * 4; hdr = {};
hdr->dwFlags = 0; hdr.dwBufferLength = _bufsize * 4;
hdr->lpData = MallocT<char>(_bufsize * 4); hdr.dwFlags = 0;
if (waveOutPrepareHeader(_waveout, hdr, sizeof(WAVEHDR)) != MMSYSERR_NOERROR) throw "waveOutPrepareHeader failed"; hdr.lpData = MallocT<char>(_bufsize * 4);
if (waveOutPrepareHeader(waveout, &hdr, sizeof(WAVEHDR)) != MMSYSERR_NOERROR) throw "waveOutPrepareHeader failed";
}
static void UnPrepareHeader(HWAVEOUT waveout, WAVEHDR &hdr)
{
waveOutUnprepareHeader(waveout, &hdr, sizeof(WAVEHDR));
free(hdr.lpData);
hdr.lpData = nullptr;
} }
static DWORD WINAPI SoundThread(LPVOID) static DWORD WINAPI SoundThread(LPVOID)
@@ -45,10 +53,10 @@ static DWORD WINAPI SoundThread(LPVOID)
SetCurrentThreadName("ottd:win-sound"); SetCurrentThreadName("ottd:win-sound");
do { do {
for (WAVEHDR *hdr = _wave_hdr; hdr != endof(_wave_hdr); hdr++) { for (WAVEHDR &hdr : _wave_hdr) {
if ((hdr->dwFlags & WHDR_INQUEUE) != 0) continue; if ((hdr.dwFlags & WHDR_INQUEUE) != 0) continue;
MxMixSamples(hdr->lpData, hdr->dwBufferLength / 4); MxMixSamples(hdr.lpData, hdr.dwBufferLength / 4);
if (waveOutWrite(_waveout, hdr, sizeof(WAVEHDR)) != MMSYSERR_NOERROR) { if (waveOutWrite(_waveout, &hdr, sizeof(WAVEHDR)) != MMSYSERR_NOERROR) {
MessageBox(nullptr, L"Sounds are disabled until restart.", L"waveOutWrite failed", MB_ICONINFORMATION); MessageBox(nullptr, L"Sounds are disabled until restart.", L"waveOutWrite failed", MB_ICONINFORMATION);
return 0; return 0;
} }
@@ -61,7 +69,7 @@ static DWORD WINAPI SoundThread(LPVOID)
const char *SoundDriver_Win32::Start(const StringList &parm) const char *SoundDriver_Win32::Start(const StringList &parm)
{ {
WAVEFORMATEX wfex; WAVEFORMATEX wfex{};
wfex.wFormatTag = WAVE_FORMAT_PCM; wfex.wFormatTag = WAVE_FORMAT_PCM;
wfex.nChannels = 2; wfex.nChannels = 2;
wfex.wBitsPerSample = 16; wfex.wBitsPerSample = 16;
@@ -70,7 +78,7 @@ const char *SoundDriver_Win32::Start(const StringList &parm)
wfex.nAvgBytesPerSec = wfex.nSamplesPerSec * wfex.nBlockAlign; wfex.nAvgBytesPerSec = wfex.nSamplesPerSec * wfex.nBlockAlign;
/* Limit buffer size to prevent overflows. */ /* Limit buffer size to prevent overflows. */
_bufsize = GetDriverParamInt(parm, "samples", 2048); _bufsize = GetDriverParamInt(parm, "samples", 4096);
_bufsize = std::min<int>(_bufsize, UINT16_MAX); _bufsize = std::min<int>(_bufsize, UINT16_MAX);
try { try {
@@ -80,8 +88,9 @@ const char *SoundDriver_Win32::Start(const StringList &parm)
MxInitialize(wfex.nSamplesPerSec); MxInitialize(wfex.nSamplesPerSec);
PrepareHeader(&_wave_hdr[0]); for (WAVEHDR &hdr : _wave_hdr) {
PrepareHeader(&_wave_hdr[1]); PrepareHeader(_waveout, hdr);
}
if (nullptr == (_thread = CreateThread(nullptr, 8192, SoundThread, 0, 0, &_threadId))) throw "Failed to create thread"; if (nullptr == (_thread = CreateThread(nullptr, 8192, SoundThread, 0, 0, &_threadId))) throw "Failed to create thread";
} catch (const char *error) { } catch (const char *error) {
@@ -102,8 +111,9 @@ void SoundDriver_Win32::Stop()
/* Close the sound device. */ /* Close the sound device. */
waveOutReset(waveout); waveOutReset(waveout);
waveOutUnprepareHeader(waveout, &_wave_hdr[0], sizeof(WAVEHDR)); for (WAVEHDR &hdr : _wave_hdr) {
waveOutUnprepareHeader(waveout, &_wave_hdr[1], sizeof(WAVEHDR)); UnPrepareHeader(waveout, hdr);
}
waveOutClose(waveout); waveOutClose(waveout);
CloseHandle(_thread); CloseHandle(_thread);