ShuriZma
/
Cxbx-Reloaded
mirror of https://github.com/Cxbx-Reloaded/Cxbx-Reloaded.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1549 from RadWolfie/dsound-create-fix 

Minor DSound create fix
This commit is contained in:
PatrickvL 2019-02-15 07:30:20 +01:00 committed by GitHub
parent a67474fa39 72501f8933
commit 8d19de375e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 41 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/core/hle/DSOUND/DirectSound/DirectSoundInline.hpp
View File

@ -211,7 +211,7 @@ inline void GeneratePCMFormat(
if (lpwfxFormat != xbnullptr) { if (lpwfxFormat != xbnullptr) {
//TODO: RadWolfie - Need implement support for WAVEFORMATEXTENSIBLE as stated in CDirectSoundStream_SetFormat function note below //TODO: RadWolfie - Need implement support for WAVEFORMATEXTENSIBLE as stated in CDirectSoundStream_SetFormat function note below
// Do we need to convert it? Or just only do the WAVEFORMATEX only? // Do we need to convert it? Or just do the WAVEFORMATEX only?
// NOTE: pwfxFormat is not always a WAVEFORMATEX structure, it can // NOTE: pwfxFormat is not always a WAVEFORMATEX structure, it can
// be WAVEFORMATEXTENSIBLE if that's what the programmer(s) wanted // be WAVEFORMATEXTENSIBLE if that's what the programmer(s) wanted
@ -222,23 +222,54 @@ inline void GeneratePCMFormat(
// Only allocate extra value for setting extra values later on. WAVEFORMATEXTENSIBLE is the highest size I had seen. // Only allocate extra value for setting extra values later on. WAVEFORMATEXTENSIBLE is the highest size I had seen.
DSBufferDesc.lpwfxFormat = (WAVEFORMATEX*)calloc(1, sizeof(WAVEFORMATEXTENSIBLE)); DSBufferDesc.lpwfxFormat = (WAVEFORMATEX*)calloc(1, sizeof(WAVEFORMATEXTENSIBLE));
} }
WAVEFORMATEX* lpwfxFormatHost = DSBufferDesc.lpwfxFormat;
if (lpwfxFormat->wFormatTag == WAVE_FORMAT_PCM) { if (lpwfxFormat->wFormatTag == WAVE_FORMAT_PCM) {
// Test case: Hulk crash due to cbSize is not a valid size. // Test case: Hulk crash due to cbSize is not a valid size.
memcpy(DSBufferDesc.lpwfxFormat, lpwfxFormat, sizeof(WAVEFORMATEX)); memcpy(lpwfxFormatHost, lpwfxFormat, sizeof(WAVEFORMATEX));
DSBufferDesc.lpwfxFormat->cbSize = 0; // Let's enforce this value to prevent any other exception later on. lpwfxFormatHost->cbSize = 0; // Let's enforce this value to prevent any other exception later on.
} }
else if (lpwfxFormat->wFormatTag == 0 && (DSBufferDesc.dwFlags & DSBCAPS_LOCDEFER) > 0) { else if (lpwfxFormat->wFormatTag == 0 && (DSBufferDesc.dwFlags & DSBCAPS_LOCDEFER) > 0) {
// NOTE: This is currently a hack for ability to create buffer class with DSBCAPS_LOCDEFER flag. // NOTE: This is currently a hack for ability to create buffer class with DSBCAPS_LOCDEFER flag.
DSBufferDesc.lpwfxFormat->wFormatTag = WAVE_FORMAT_PCM; lpwfxFormatHost->wFormatTag = WAVE_FORMAT_PCM;
DSBufferDesc.lpwfxFormat->nChannels = 2; lpwfxFormatHost->nChannels = 2;
DSBufferDesc.lpwfxFormat->nSamplesPerSec = 44100; lpwfxFormatHost->nSamplesPerSec = 44100;
DSBufferDesc.lpwfxFormat->wBitsPerSample = 8; lpwfxFormatHost->wBitsPerSample = 8;
DSBufferDesc.lpwfxFormat->nBlockAlign = (DSBufferDesc.lpwfxFormat->wBitsPerSample / 8 * DSBufferDesc.lpwfxFormat->nChannels); lpwfxFormatHost->nBlockAlign = (lpwfxFormatHost->wBitsPerSample / 8 * lpwfxFormatHost->nChannels);
DSBufferDesc.lpwfxFormat->nAvgBytesPerSec = DSBufferDesc.lpwfxFormat->nSamplesPerSec * DSBufferDesc.lpwfxFormat->nBlockAlign; lpwfxFormatHost->nAvgBytesPerSec = lpwfxFormatHost->nSamplesPerSec * lpwfxFormatHost->nBlockAlign;
} }
else { else {
memcpy(DSBufferDesc.lpwfxFormat, lpwfxFormat, sizeof(WAVEFORMATEX) + lpwfxFormat->cbSize); memcpy(lpwfxFormatHost, lpwfxFormat, sizeof(WAVEFORMATEX) + lpwfxFormat->cbSize);
}
// NOTE: Currently a workaround hack fix until custom management for buffer/stream can allow unallocated buffer.
// Without this fix, some titles wouldn't progress further. Plus no matter what values are set in Xbox's wfxFormat
// are approved. It does need further investigation which require LLE APU stubbed and a HLE verbose plugin.
if (X_BufferSizeRequest == 0 &&
(lpwfxFormatHost->nSamplesPerSec == 0 || lpwfxFormatHost->nAvgBytesPerSec == 0)) {
// NOTE: When X_BufferSizeRequest is 0, creation is allow to be performed until allocated size is given from different API.
// Set dwBufferBytes is not needed as it is handled later on.
// Test case: Hobbit did not input nSamplesPerSec & nAvgBytesPerSec variable, yet isn't a requirement.
if (lpwfxFormatHost->nChannels == 0) {
lpwfxFormatHost->nChannels = 2;
}
if (lpwfxFormatHost->wBitsPerSample == 0) {
lpwfxFormatHost->wBitsPerSample = 8;
}
if (lpwfxFormatHost->nBlockAlign == 0) {
lpwfxFormatHost->nBlockAlign = (lpwfxFormatHost->wBitsPerSample / 8 * lpwfxFormatHost->nChannels);
}
if (lpwfxFormatHost->nSamplesPerSec == 0) {
lpwfxFormatHost->nSamplesPerSec = 44100;
lpwfxFormatHost->nAvgBytesPerSec = lpwfxFormatHost->nSamplesPerSec * lpwfxFormatHost->nBlockAlign;
}
// TODO: I don't think we need WAVEFORMATEXTENSIBLE stub for this fix.
if (lpwfxFormat->wFormatTag == WAVE_FORMAT_EXTENSIBLE) {
EmuLog(LOG_LEVEL::WARNING, "Is WAVE_FORMAT_EXTENSIBLE having problem with creation?");
}
} }
dwEmuFlags = dwEmuFlags & ~DSE_FLAG_AUDIO_CODECS; dwEmuFlags = dwEmuFlags & ~DSE_FLAG_AUDIO_CODECS;