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 #2234 from jackchentwkh/DSoundBufferResizeSetSize_fix 

Implement ImageDesc, fix vector iterator in DSStream packet, this fixs Otogi1, PGR2.
This commit is contained in:
Luke Usher 2021-06-08 07:16:37 +01:00 committed by GitHub
parent 8b9b26b56e fa1f4d4c50
commit ba9ee5fd2f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/hle/DSOUND/DirectSound/DSStream_PacketManager.cpp
View File

@ -308,6 +308,8 @@ bool DSStream_Packet_Process(
}
return 0;
}
//the iterator might be invalidated, so we update it again.
packetCurrent = pThis->Host_BufferPacketArray.begin();
#if 0 // Extend debug verification
EmuLog(LOG_LEVEL::DEBUG, "nextBuffer: %08X; packetCurrent->bufPlayed: %08X; bufPlayed: %08X;\n",
packetCurrent._Ptr,

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

@ -371,11 +371,18 @@ static inline void DSoundGenericUnlock(
static inline HRESULT DSoundBufferCreate(LPDSBUFFERDESC pDSBufferDesc, LPDIRECTSOUNDBUFFER8 &pDSBuffer)
{
LPDIRECTSOUNDBUFFER pTempBuffer;
//Todo:shall we check the pDSBufferDesc->dwBufferBytes with legal ranges between DSBSIZE_MIN and DSBSIZE_MAX again?
HRESULT hRetDS = g_pDSound8->CreateSoundBuffer(pDSBufferDesc, &pTempBuffer, nullptr);
if (hRetDS == DS_OK) {
hRetDS = pTempBuffer->QueryInterface(IID_IDirectSoundBuffer8, (LPVOID*)&(pDSBuffer));
pTempBuffer->Release();
if (pDSBuffer == nullptr) {
EmuLog(LOG_LEVEL::WARNING, "CreateSoundBuffer:QueryInterface Failed!");
}
}
else {
EmuLog(LOG_LEVEL::WARNING, "CreateSoundBuffer Failed!");
}
return hRetDS;
}
@ -426,9 +433,9 @@ static inline void DSoundBufferTransferSettings(
LONG lVolume, lPan;
DS3DBUFFER ds3dBuffer;
if (pDSBufferOld == nullptr) {
return;
}
if (pDSBufferOld == nullptr) {
return;
}
// if sync current frequency used (then use pitch only).
uint32_t freq = converter_pitch2freq(Xb_Voice->GetPitch());
@ -456,13 +463,17 @@ static inline void DSoundBufferReCreate(
xbox::CDirectSoundVoice* Xb_Voice) {
DSoundBufferCreate(&DSBufferDesc, pDSBufferNew);
if (pDS3DBuffer != nullptr) {
HRESULT hretDS = DSoundBufferCreate(&DSBufferDesc, pDSBufferNew);
//create new DS3DBuffer from the new DSBuffer if the new DSBuffer is created successfully.
if (pDSBufferNew != nullptr) {
DSound3DBufferCreate(pDSBufferNew, pDS3DBufferNew);
DSoundBufferTransferSettings(pDSBuffer, pDSBufferNew, pDS3DBuffer, pDS3DBufferNew, Xb_Voice);//Sanity checks inside.
}
else {
EmuLog(LOG_LEVEL::WARNING, "DSoundBufferReCreate Failed!");
}
DSoundBufferTransferSettings(pDSBuffer, pDSBufferNew, pDS3DBuffer, pDS3DBufferNew, Xb_Voice);
}
static inline void DSoundBufferRelease(
@ -503,8 +514,12 @@ static inline void DSoundBufferResizeSetSize(
return;
}
pThis->EmuBufferDesc.dwBufferBytes = Host_dwByteLength;
if (Host_dwByteLength< DSBSIZE_MIN) { //the min. buffer bytes must be equal or greater then DSBSIZE_MIN
pThis->EmuBufferDesc.dwBufferBytes = DSBSIZE_MIN;
}
else {
pThis->EmuBufferDesc.dwBufferBytes = Host_dwByteLength;
}
// NOTE: Test case JSRF, if we allow to re-alloc without checking allocated buffer size.
// Then it is somehow binded to IDirectSound_SetPosition control for any allocated audio afterward.