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

SPU2-X: Reduce buffer overruns by, um, making the buffer bigger. Apparently I was the first to think of this. (Also force time stretching off when the new sync hack is on) 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2838 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
sudonim1 2010-04-12 17:13:30 +00:00
parent 048c1c7573
commit bb80927cc3
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
plugins/spu2-x/src/SndOut.cpp
View File

@ -127,7 +127,7 @@ bool SndBuffer::CheckUnderrunStatus( int& nSamples, int& quietSampleCount )
quietSampleCount = 0; quietSampleCount = 0;
if( m_underrun_freeze ) if( m_underrun_freeze )
{ {
int toFill = (int)(m_size * ( timeStretchDisabled ? 0.50f : 0.02f ) ); int toFill = m_size / (timeStretchDisabled || asyncMixingEnabled ? 32 : 400);
toFill = GetAlignedBufferSize( toFill ); toFill = GetAlignedBufferSize( toFill );
// toFill is now aligned to a SndOutPacket // toFill is now aligned to a SndOutPacket
@ -149,7 +149,7 @@ bool SndBuffer::CheckUnderrunStatus( int& nSamples, int& quietSampleCount )
quietSampleCount = SndOutPacketSize - m_data; quietSampleCount = SndOutPacketSize - m_data;
m_underrun_freeze = true; m_underrun_freeze = true;
if( !timeStretchDisabled ) if( !timeStretchDisabled && !asyncMixingEnabled )
timeStretchUnderrun(); timeStretchUnderrun();
return nSamples != 0; return nSamples != 0;
@ -192,14 +192,14 @@ void SndBuffer::_WriteSamples(StereoOut32 *bData, int nSamples)
s32 comp; s32 comp;
if( !timeStretchDisabled ) if( !timeStretchDisabled && !asyncMixingEnabled )
{ {
comp = timeStretchOverrun(); comp = timeStretchOverrun();
} }
else else
{ {
// Toss half the buffer plus whatever's being written anew: // Toss half the buffer plus whatever's being written anew:
comp = GetAlignedBufferSize( (m_size + nSamples ) / 2 ); comp = GetAlignedBufferSize( (m_size + nSamples ) / 16 );
if( comp > (m_size-SndOutPacketSize) ) comp = m_size-SndOutPacketSize; if( comp > (m_size-SndOutPacketSize) ) comp = m_size-SndOutPacketSize;
} }
@ -232,8 +232,8 @@ void SndBuffer::_WriteSamples(StereoOut32 *bData, int nSamples)
// Use to monitor buffer levels in real time // Use to monitor buffer levels in real time
/*int drvempty = mods[OutputModule]->GetEmptySampleCount(); /*int drvempty = mods[OutputModule]->GetEmptySampleCount();
float result = (float)(m_data + m_predictData - drvempty) - (m_size/2); float result = (float)(m_data + m_predictData - drvempty) - (m_size/16);
result /= (m_size/2); result /= (m_size/16);
if (result > 0.6 || result < -0.5) if (result > 0.6 || result < -0.5)
printf("buffer: %f\n",result); printf("buffer: %f\n",result);
}*/ }*/
@ -258,7 +258,7 @@ void SndBuffer::Init()
try try
{ {
const float latencyMS = SndOutLatencyMS * (timeStretchDisabled ? 1.5f : 2.0f ); const float latencyMS = SndOutLatencyMS * 16;
m_size = GetAlignedBufferSize( (int)(latencyMS * SampleRate / 1000.0f ) ); m_size = GetAlignedBufferSize( (int)(latencyMS * SampleRate / 1000.0f ) );
m_buffer = new StereoOut32[m_size]; m_buffer = new StereoOut32[m_size];
m_underrun_freeze = false; m_underrun_freeze = false;
@ -350,7 +350,7 @@ void SndBuffer::Write( const StereoOut32& Sample )
{ {
for( int i=0; i<SndOutPacketSize; ++i, ++ei ) { sndTempBuffer[i] = sndTempBuffer16[ei].UpSample(); } for( int i=0; i<SndOutPacketSize; ++i, ++ei ) { sndTempBuffer[i] = sndTempBuffer16[ei].UpSample(); }
if( !timeStretchDisabled ) if( !timeStretchDisabled && !asyncMixingEnabled )
timeStretchWrite(); timeStretchWrite();
else else
_WriteSamples(sndTempBuffer, SndOutPacketSize); _WriteSamples(sndTempBuffer, SndOutPacketSize);
@ -369,7 +369,7 @@ void SndBuffer::Write( const StereoOut32& Sample )
#endif #endif
else else
{ {
if( !timeStretchDisabled ) if( !timeStretchDisabled && !asyncMixingEnabled )
timeStretchWrite(); timeStretchWrite();
else else
_WriteSamples(sndTempBuffer, SndOutPacketSize); _WriteSamples(sndTempBuffer, SndOutPacketSize);

4
plugins/spu2-x/src/Timestretcher.cpp
View File

@ -56,8 +56,8 @@ float SndBuffer::GetStatusPct()
//ConLog( "Data %d >>> driver: %d predict: %d\n", m_data, drvempty, m_predictData ); //ConLog( "Data %d >>> driver: %d predict: %d\n", m_data, drvempty, m_predictData );
float result = (float)(m_data + m_predictData - drvempty) - (m_size/2); float result = (float)(m_data + m_predictData - drvempty) - (m_size/16);
result /= (m_size/2); result /= (m_size/16);
return result; return result;
} }