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

spu2-x:xaudio2: Comment stuff to investigate

This commit is contained in:
Jonathan Li 2017-04-14 12:41:08 +01:00 committed by Gregory Hainaut
parent adb92ce349
commit ffcac1bc3b
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/spu2-x/src/Windows/SndOut_XAudio2.inl
View File

@ -174,12 +174,18 @@ private:
virtual ~StreamingVoice() virtual ~StreamingVoice()
{ {
IXAudio2SourceVoice *killMe = pSourceVoice; IXAudio2SourceVoice *killMe = pSourceVoice;
// XXX: Potentially leads to a race condition that causes a nullptr
// dereference when SubmitSourceBuffer is called in OnBufferEnd?
pSourceVoice = nullptr; pSourceVoice = nullptr;
if (killMe != nullptr) { if (killMe != nullptr) {
killMe->FlushSourceBuffers(); killMe->FlushSourceBuffers();
killMe->DestroyVoice(); killMe->DestroyVoice();
} }
// XXX: Not sure we even need a critical section - DestroyVoice is
// blocking, and the documentation states no callbacks are called
// or audio data is read after it returns, so it's safe to free up
// resources.
EnterCriticalSection(&cs); EnterCriticalSection(&cs);
m_buffer = nullptr; m_buffer = nullptr;
LeaveCriticalSection(&cs); LeaveCriticalSection(&cs);
@ -221,6 +227,8 @@ private:
EnterCriticalSection(&cs); EnterCriticalSection(&cs);
// All of these checks are necessary because XAudio2 is wonky shizat. // All of these checks are necessary because XAudio2 is wonky shizat.
// XXX: The pSourceVoice nullptr check seems a bit self-inflicted
// due to the destructor logic.
if (pSourceVoice == nullptr || context == nullptr) { if (pSourceVoice == nullptr || context == nullptr) {
LeaveCriticalSection(&cs); LeaveCriticalSection(&cs);
return; return;