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

n64: audio stuff, but all commented out for now

This commit is contained in:
goyuken 2013-05-01 22:26:08 +00:00
parent 365d1f159c
commit 6b350e58c9
2 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
BizHawk.Emulation/Consoles/Nintendo/N64/N64.cs
View File

@ -39,6 +39,8 @@ namespace BizHawk.Emulation.Consoles.Nintendo.N64
Sound.Utilities.SpeexResampler resampler; Sound.Utilities.SpeexResampler resampler;
uint m64pSamplingRate;
short[] m64pAudioBuffer = new short[2]; short[] m64pAudioBuffer = new short[2];
public ISoundProvider SoundProvider { get { return null; } } public ISoundProvider SoundProvider { get { return null; } }
public ISyncSoundProvider SyncSoundProvider { get { return resampler; } } public ISyncSoundProvider SyncSoundProvider { get { return resampler; } }
@ -285,10 +287,19 @@ namespace BizHawk.Emulation.Consoles.Nintendo.N64
VICallback m64pVICallback; VICallback m64pVICallback;
public void FrameComplete() public void FrameComplete()
{ {
int m64pAudioBufferSize = AudGetBufferSize(); /*
uint s = (uint)AudGetAudioRate();
if (s != m64pSamplingRate)
{
m64pSamplingRate = s;
resampler.ChangeRate(s, 44100, s, 44100);
Console.WriteLine("N64 ARate Change {0}", s);
}*/
int m64pAudioBufferSize = AudGetBufferSize();
if (m64pAudioBuffer.Length < m64pAudioBufferSize) if (m64pAudioBuffer.Length < m64pAudioBufferSize)
m64pAudioBuffer = new short[m64pAudioBufferSize]; m64pAudioBuffer = new short[m64pAudioBufferSize];
if (m64pAudioBufferSize > 0) if (m64pAudioBufferSize > 0)
{ {
AudReadAudioBuffer(m64pAudioBuffer); AudReadAudioBuffer(m64pAudioBuffer);
@ -382,6 +393,11 @@ namespace BizHawk.Emulation.Consoles.Nintendo.N64
m64pCoreDoCommandRefInt(m64p_command.M64CMD_CORE_STATE_QUERY, 1, ref state); m64pCoreDoCommandRefInt(m64p_command.M64CMD_CORE_STATE_QUERY, 1, ref state);
} while (state != (int)m64p_emu_state.M64EMU_PAUSED); } while (state != (int)m64p_emu_state.M64EMU_PAUSED);
/*
m64pSamplingRate = (uint)AudGetAudioRate();
resampler = new Sound.Utilities.SpeexResampler(6, m64pSamplingRate, 44100, m64pSamplingRate, 44100, null, null);
Console.WriteLine("N64 Initial ARate {0}", m64pSamplingRate);
*/
resampler = new Sound.Utilities.SpeexResampler(6, 32000, 44100, 32000, 44100, null, null); resampler = new Sound.Utilities.SpeexResampler(6, 32000, 44100, 32000, 44100, null, null);
AttachedCore = this; AttachedCore = this;
} }

10
BizHawk.Emulation/Sound/Utilities/SpeexResampler.cs
View File

@ -334,6 +334,16 @@ namespace BizHawk.Emulation.Sound.Utilities
outbuf = new short[inbuf.Length * ratioden / rationum / 2 * 2 + 128]; outbuf = new short[inbuf.Length * ratioden / rationum / 2 * 2 + 128];
} }
/// <summary>change sampling rate on the fly</summary>
/// <param name="rationum">numerator of srate change ratio (inrate / outrate)</param>
/// <param name="ratioden">demonenator of srate change ratio (inrate / outrate)</param>
/// <param name="sratein">sampling rate in, rounded to nearest hz</param>
/// <param name="srateout">sampling rate out, rounded to nearest hz</param>
public void ChangeRate(uint rationum, uint ratioden, uint sratein, uint srateout)
{
CheckError(LibSpeexDSP.speex_resampler_set_rate_frac(st, rationum, ratioden, sratein, srateout));
}
/// <summary> /// <summary>
/// add a sample to the queue /// add a sample to the queue
/// </summary> /// </summary>