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

SoundOutputProvider tweak.

This commit is contained in:
jdpurcell 2015-01-25 05:03:21 +00:00
parent 96e91e7093
commit b66dc6ba1b
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BizHawk.Client.EmuHawk/Sound.cs
View File

@ -131,7 +131,7 @@ namespace BizHawk.Client.EmuHawk
_lastWriteCursor = 0;
_outputProvider = new SoundOutputProvider();
_outputProvider.HardCorrectionThresholdSamples = BufferSizeSamples - MinBufferFullnessSamples;
_outputProvider.MaxSamplesDeficit = BufferSizeSamples - MinBufferFullnessSamples;
_outputProvider.BaseSoundProvider = _syncSoundProvider;
//LogUnderruns = true;

12
BizHawk.Client.EmuHawk/SoundOutputProvider.cs
View File

@ -22,6 +22,11 @@ namespace BizHawk.Client.EmuHawk
private const int ChannelCount = 2;
private const int SoftCorrectionThresholdSamples = 5 * SampleRate / 1000;
private const int StartupHardCorrectionThresholdSamples = 10 * SampleRate / 1000;
// Can't go more than 50 ms or so even if there's enough buffered up in the device
// because the clock throttle loses its "rubber band" effect and won't replenish
// our buffer. At that point it's better to hard correct than to let the soft
// correction cause a major pitch shift.
private const int NormalHardCorrectionThresholdSamples = 50 * SampleRate / 1000;
private const int UsableHistoryLength = 20;
private const int MaxHistoryLength = 60;
private const int SoftCorrectionLength = 240;
@ -45,7 +50,7 @@ namespace BizHawk.Client.EmuHawk
{
}
public int HardCorrectionThresholdSamples { get; set; }
public int MaxSamplesDeficit { get; set; }
public ISyncSoundProvider BaseSoundProvider { get; set; }
@ -91,8 +96,9 @@ namespace BizHawk.Client.EmuHawk
int bufferSampleCount = _buffer.Count / ChannelCount;
int extraSampleCount = bufferSampleCount - idealSampleCount;
int hardCorrectionThresholdSamples = _extraCountHistory.Count >= UsableHistoryLength ? HardCorrectionThresholdSamples :
Math.Min(StartupHardCorrectionThresholdSamples, HardCorrectionThresholdSamples);
int hardCorrectionThresholdSamples = _extraCountHistory.Count >= UsableHistoryLength ?
Math.Min(NormalHardCorrectionThresholdSamples, MaxSamplesDeficit) :
Math.Min(StartupHardCorrectionThresholdSamples, MaxSamplesDeficit);
bool hardCorrected = false;
if (extraSampleCount < -hardCorrectionThresholdSamples)