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

C64 more SID work

This commit is contained in:
alyosha-tas 2017-05-31 22:44:45 -04:00 committed by GitHub
parent 52995b657e
commit ebb305997e
2 changed files with 18 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Sid.SoundProvider.cs
View File

@ -44,8 +44,7 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64.MOS
{ {
Flush(true); Flush(true);
nsamp = _outputBufferIndex; _outputBuffer = new short[_outputBufferIndex * 2];
for (int i = 0; i < _outputBufferIndex; i++) for (int i = 0; i < _outputBufferIndex; i++)
{ {
_mixer = _outputBuffer_not_filtered[i] + _outputBuffer_filtered[i]; _mixer = _outputBuffer_not_filtered[i] + _outputBuffer_filtered[i];
@ -53,9 +52,6 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64.MOS
_mixer = (_mixer * _volume) >> 4; _mixer = (_mixer * _volume) >> 4;
_mixer -= _volume << 8; _mixer -= _volume << 8;
//Console.Write(_mixer);
//Console.Write(" ");
if (_mixer > 0x7FFF) if (_mixer > 0x7FFF)
{ {
_mixer = 0x7FFF; _mixer = 0x7FFF;
@ -65,20 +61,15 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64.MOS
{ {
_mixer = -0x8000; _mixer = -0x8000;
} }
/*
if (_mixer < 0) _outputBuffer[i * 2] = unchecked((short)_mixer);
{ _outputBuffer[i * 2 + 1] = unchecked((short)_mixer);
_mixer = 0;
}
*/
_outputBuffer[i * 2] = (short)_mixer;
_outputBuffer[i * 2 + 1] = (short)_mixer;
} }
//Console.WriteLine(" ");
//Console.WriteLine(" ");
samples = _outputBuffer; samples = _outputBuffer;
nsamp = _outputBufferIndex;
last_filtered_value = _outputBuffer_filtered[_outputBufferIndex - 1];
_outputBufferIndex = 0; _outputBufferIndex = 0;
filter_index = 0; filter_index = 0;
} }

38
BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Sid.cs
View File

@ -38,7 +38,7 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64.MOS
private bool _filterSelectLoPass; private bool _filterSelectLoPass;
private bool _filterSelectHiPass; private bool _filterSelectHiPass;
private int _mixer; private int _mixer;
private readonly short[] _outputBuffer; private short[] _outputBuffer;
private int[] _outputBuffer_filtered; private int[] _outputBuffer_filtered;
private int[] _outputBuffer_not_filtered; private int[] _outputBuffer_not_filtered;
private int _outputBufferIndex; private int _outputBufferIndex;
@ -91,7 +91,6 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64.MOS
for (var i = 0; i < 3; i++) for (var i = 0; i < 3; i++)
_filterEnable[i] = false; _filterEnable[i] = false;
_outputBuffer = new short[sampleRate];
_outputBuffer_filtered = new int[sampleRate]; _outputBuffer_filtered = new int[sampleRate];
_outputBuffer_not_filtered = new int[sampleRate]; _outputBuffer_not_filtered = new int[sampleRate];
} }
@ -129,7 +128,6 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64.MOS
public void Flush(bool flushFilter) public void Flush(bool flushFilter)
{ {
while (_cachedCycles > 0) while (_cachedCycles > 0)
{ {
_cachedCycles--; _cachedCycles--;
@ -197,7 +195,6 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64.MOS
} }
} }
//here we need to apply filtering to the samples and add them back to the buffer //here we need to apply filtering to the samples and add them back to the buffer
if (flushFilter) if (flushFilter)
{ {
if (_filterEnable[0] | _filterEnable[1] | _filterEnable[2]) if (_filterEnable[0] | _filterEnable[1] | _filterEnable[2])
@ -218,10 +215,9 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64.MOS
} }
filter_index = _outputBufferIndex; filter_index = _outputBufferIndex;
if (_outputBufferIndex>0) { if (_outputBufferIndex>0)
last_filtered_value = _outputBuffer_filtered[_outputBufferIndex - 1]; last_filtered_value = _outputBuffer_filtered[_outputBufferIndex - 1];
} }
}
// if the filter is off, keep updating the filter index to the most recent Flush // if the filter is off, keep updating the filter index to the most recent Flush
if (!(_filterEnable[0] | _filterEnable[1] | _filterEnable[2])) if (!(_filterEnable[0] | _filterEnable[1] | _filterEnable[2]))
@ -233,7 +229,7 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64.MOS
public void filter_operator() public void filter_operator()
{ {
double loc_filterFrequency = (double)(_filterFrequency << 2) + 500; double loc_filterFrequency = (double)(_filterFrequency << 2) + 750;
double attenuation; double attenuation;
@ -262,24 +258,13 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64.MOS
temp_buffer[(int)i] = _outputBuffer_filtered[(int)Math.Floor((i / (nsamp_2-1) * (nsamp - 1))) + filter_index]; temp_buffer[(int)i] = _outputBuffer_filtered[(int)Math.Floor((i / (nsamp_2-1) * (nsamp - 1))) + filter_index];
} }
/*
for (int i = 0; i< nsamp; i++)
{
Console.Write(_outputBuffer_filtered[(int)i + filter_index]);
Console.Write(" ");
}
Console.WriteLine(" ");
Console.WriteLine("After");
*/
// now we have everything we need to perform the FFT // now we have everything we need to perform the FFT
fft.ComputeForward(temp_buffer); fft.ComputeForward(temp_buffer);
// for each element in the frequency list, attenuate it according to the specs // for each element in the frequency list, attenuate it according to the specs
for (int i = 0; i < nsamp_2; i++) for (int i = 1; i < nsamp_2; i++)
{ {
double freq = (i + 1) * ((double)(880*50)/nsamp); double freq = i * ((double)(880*50)/nsamp);
// add resonance effect // add resonance effect
// let's assume that frequencies near the peak are doubled in strength at max resonance // let's assume that frequencies near the peak are doubled in strength at max resonance
@ -298,10 +283,10 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64.MOS
} }
// High pass filter // High pass filter
if (_filterSelectHiPass && freq < _filterFrequency) if (_filterSelectHiPass && freq < loc_filterFrequency)
{ {
//attenuated at 12db per octave //attenuated at 12db per octave
attenuation = Math.Log(freq / _filterFrequency, 2); attenuation = Math.Log(loc_filterFrequency / freq, 2);
attenuation = 12 * attenuation; attenuation = 12 * attenuation;
temp_buffer[i] = temp_buffer[i] * Math.Pow(2, -attenuation / 10); temp_buffer[i] = temp_buffer[i] * Math.Pow(2, -attenuation / 10);
} }
@ -310,7 +295,7 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64.MOS
if (_filterSelectBandPass) if (_filterSelectBandPass)
{ {
//attenuated at 6db per octave //attenuated at 6db per octave
attenuation = Math.Log(freq / _filterFrequency, 2); attenuation = Math.Log(freq / loc_filterFrequency, 2);
attenuation = 6 * attenuation; attenuation = 6 * attenuation;
temp_buffer[i] = temp_buffer[i] * Math.Pow(2, -Math.Abs(attenuation) / 10); temp_buffer[i] = temp_buffer[i] * Math.Pow(2, -Math.Abs(attenuation) / 10);
} }
@ -337,14 +322,7 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64.MOS
if (i<16) if (i<16)
_outputBuffer_filtered[(int)i + filter_index] = (int)((last_filtered_value * Math.Pow(15 - i,1) + _outputBuffer_filtered[(int)i + filter_index] * Math.Pow(i,1))/ Math.Pow(15,1)); _outputBuffer_filtered[(int)i + filter_index] = (int)((last_filtered_value * Math.Pow(15 - i,1) + _outputBuffer_filtered[(int)i + filter_index] * Math.Pow(i,1))/ Math.Pow(15,1));
//Console.Write(_outputBuffer_filtered[(int)i + filter_index]);
//Console.Write(" ");
} }
//Console.WriteLine(" ");
//Console.WriteLine("Before");
} }
// ---------------------------------- // ----------------------------------