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

Changed SDL audio locks to not be called as often. Gives slight performance increase.

This commit is contained in:
mjbudd77 2021-08-08 14:28:10 -04:00
parent 52b5ee51f4
commit f834069180
1 changed files with 40 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
src/drivers/Qt/sdl-sound.cpp
View File

@ -284,7 +284,7 @@ WriteSound(int32 *buf,
if ( s_BufferIn >= s_BufferSize50 ) if ( s_BufferIn >= s_BufferSize50 )
{ {
ovrFlowSkip += 1000; ovrFlowSkip += 100;
} }
} }
else else
@ -312,17 +312,23 @@ WriteSound(int32 *buf,
if ( uflowMode ) if ( uflowMode )
{ // Underflow mode { // Underflow mode
SDL_LockAudio();
while (Count) while (Count)
{ {
while (s_BufferIn == s_BufferSize) if ( s_BufferIn == s_BufferSize )
{ {
SDL_Delay(1); waitCount++; SDL_UnlockAudio();
while (s_BufferIn == s_BufferSize)
if ( waitCount > 1000 )
{ {
printf("Error: Sound sink is not draining... Breaking out of audio loop to prevent lockup.\n"); SDL_Delay(1); waitCount++;
return;
if ( waitCount > 1000 )
{
printf("Error: Sound sink is not draining... Breaking out of audio loop to prevent lockup.\n");
return;
}
} }
SDL_LockAudio();
} }
for (int i=0; i<udrFlowDup; i++) for (int i=0; i<udrFlowDup; i++)
@ -330,14 +336,13 @@ WriteSound(int32 *buf,
s_Buffer[s_BufferWrite] = *buf; s_Buffer[s_BufferWrite] = *buf;
s_BufferWrite = (s_BufferWrite + 1) % s_BufferSize; s_BufferWrite = (s_BufferWrite + 1) % s_BufferSize;
SDL_LockAudio();
s_BufferIn++; s_BufferIn++;
SDL_UnlockAudio();
} }
Count--; Count--;
buf++; buf++;
} }
SDL_UnlockAudio();
} }
else else
{ {
@ -345,43 +350,53 @@ WriteSound(int32 *buf,
{ // Perfect one to one realtime { // Perfect one to one realtime
skipCounter = 0; skipCounter = 0;
SDL_LockAudio();
while (Count) while (Count)
{ {
while (s_BufferIn == s_BufferSize) if (s_BufferIn == s_BufferSize)
{ {
SDL_Delay(1); waitCount++; SDL_UnlockAudio();
while (s_BufferIn == s_BufferSize)
if ( waitCount > 1000 )
{ {
printf("Error: Sound sink is not draining... Breaking out of audio loop to prevent lockup.\n"); SDL_Delay(1); waitCount++;
return;
if ( waitCount > 1000 )
{
printf("Error: Sound sink is not draining... Breaking out of audio loop to prevent lockup.\n");
return;
}
} }
SDL_LockAudio();
} }
s_Buffer[s_BufferWrite] = *buf; s_Buffer[s_BufferWrite] = *buf;
Count--; Count--;
s_BufferWrite = (s_BufferWrite + 1) % s_BufferSize; s_BufferWrite = (s_BufferWrite + 1) % s_BufferSize;
SDL_LockAudio();
s_BufferIn++; s_BufferIn++;
SDL_UnlockAudio();
buf++; buf++;
} }
SDL_UnlockAudio();
} }
else else
{ // Overflow mode { // Overflow mode
SDL_LockAudio();
while (Count) while (Count)
{ {
while (s_BufferIn == s_BufferSize) if (s_BufferIn == s_BufferSize)
{ {
SDL_Delay(1); waitCount++; SDL_UnlockAudio();
while (s_BufferIn == s_BufferSize)
if ( waitCount > 1000 )
{ {
printf("Error: Sound sink is not draining... Breaking out of audio loop to prevent lockup.\n"); SDL_Delay(1); waitCount++;
return;
if ( waitCount > 1000 )
{
printf("Error: Sound sink is not draining... Breaking out of audio loop to prevent lockup.\n");
return;
}
} }
SDL_LockAudio();
} }
if ( skipCounter >= ovrFlowSkip ) if ( skipCounter >= ovrFlowSkip )
@ -389,9 +404,7 @@ WriteSound(int32 *buf,
s_Buffer[s_BufferWrite] = *buf; s_Buffer[s_BufferWrite] = *buf;
s_BufferWrite = (s_BufferWrite + 1) % s_BufferSize; s_BufferWrite = (s_BufferWrite + 1) % s_BufferSize;
SDL_LockAudio();
s_BufferIn++; s_BufferIn++;
SDL_UnlockAudio();
skipCounter -= ovrFlowSkip; skipCounter -= ovrFlowSkip;
} }
@ -400,7 +413,7 @@ WriteSound(int32 *buf,
Count--; Count--;
buf++; buf++;
} }
SDL_UnlockAudio();
} }
} }