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

SPU2ghz: Added sanity checks to the XAudio2 driver, might be more stable now. 

If this doesn't fix the crashing problems then I'll have to look into making a special instance of spu2ghz.dll that dumps XAudio2 log data, and hope to solve it from that.

git-svn-id: http://pcsx2-playground.googlecode.com/svn/trunk@249 a6443dda-0b58-4228-96e9-037be469359c
This commit is contained in:
Jake.Stine 2008-10-31 00:18:52 +00:00 committed by Gregory Hainaut
parent 949a8b870f
commit ba9ab8f6e0
1 changed files with 28 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
plugins/spu2ghz/xaudio2out.cpp
View File

@ -37,8 +37,6 @@ private:
s16* qbuffer;
s32 out_num;
SndBuffer *buff;
#define MAX_BUFFER_COUNT 3
//--------------------------------------------------------------------------------------
@ -58,6 +56,7 @@ private:
STDMETHOD_(void, OnBufferStart) ( void* ) {}
STDMETHOD_(void, OnBufferEnd) ( void* context )
{
if( context == NULL || sndout == NULL ) return;
s16* qb = (s16*)context;
for(int p=0; p<PacketsPerBuffer; p++, qb+=SndOutPacketSize )
@ -87,9 +86,6 @@ public:
{
HRESULT hr;
buff=sb;
voiceContext.sndout = buff;
//
// Initialize XAudio2
//
@ -126,15 +122,27 @@ public:
wfx.nAvgBytesPerSec = SampleRate * wfx.nBlockAlign;
wfx.cbSize=0;
// Egh.. not sure if the initializer for these values should be before
// or after CreateSourceVoice. Some drivers could do evil things to
// our structure whn we create the voice.
voiceContext.sndout = sb;
voiceContext.pSourceVoice = pSourceVoice;
//
// Create an XAudio2 voice to stream this wave
//
if( FAILED(hr = pXAudio2->CreateSourceVoice( &pSourceVoice, &wfx, 0, 1.0f, &voiceContext ) ) )
if( FAILED(hr = pXAudio2->CreateSourceVoice( &pSourceVoice, &wfx,
XAUDIO2_VOICE_NOSRC, 1.0f, &voiceContext ) ) )
{
SysMessage( "Error %#X creating source voice\n", hr );
SAFE_RELEASE( pXAudio2 );
return -1;
}
// See comment above. Leave this redundant code in to protect against
// potentially stupid drivers.
voiceContext.sndout = sb;
voiceContext.pSourceVoice = pSourceVoice;
pSourceVoice->Start( 0, 0 );
@ -145,16 +153,21 @@ public:
// Frankly two buffers is all we should ever need since the buffer fill code
// is tied directly to the XAudio2 engine.
XAUDIO2_BUFFER buf = {0};
buf.AudioBytes = BufferSizeBytes;
buf.pContext=qbuffer;
buf.pAudioData=(BYTE*)buf.pContext;
pSourceVoice->SubmitSourceBuffer( &buf );
buf.pContext=&qbuffer[BufferSize];
buf.pAudioData=(BYTE*)buf.pContext;
pSourceVoice->SubmitSourceBuffer( &buf );
{
XAUDIO2_BUFFER buf = {0};
buf.AudioBytes = BufferSizeBytes;
buf.pContext=qbuffer;
buf.pAudioData=(BYTE*)buf.pContext;
pSourceVoice->SubmitSourceBuffer( &buf );
}
{
XAUDIO2_BUFFER buf = {0};
buf.AudioBytes = BufferSizeBytes;
buf.pContext=&qbuffer[BufferSize];
buf.pAudioData=(BYTE*)buf.pContext;
pSourceVoice->SubmitSourceBuffer( &buf );
}
return 0;
}
@ -202,8 +215,6 @@ public:
int GetEmptySampleCount() const
{
// I think this code works.
// It's kind of hard to know for sure.
XAUDIO2_VOICE_STATE state;
pSourceVoice->GetState( &state );
return state.SamplesPlayed & (BufferSize-1);