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

n64: rework audio a bit. best listened to in audio throttle mode. the problem seems to be that different games use different audio out sampling rates, and i don't know how to detect the right one. current selection (32khz) seems to be right for merio and falcon punch

This commit is contained in:
goyuken 2013-05-01 14:38:47 +00:00
parent 8b029d9eb1
commit 0a1e942dfe
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,7 +9,7 @@ using System.Threading;
namespace BizHawk.Emulation.Consoles.Nintendo.N64 namespace BizHawk.Emulation.Consoles.Nintendo.N64
{ {
public class N64 : IEmulator, IVideoProvider, ISoundProvider public class N64 : IEmulator, IVideoProvider
{ {
public string SystemId { get { return "N64"; } } public string SystemId { get { return "N64"; } }
@ -36,23 +36,12 @@ namespace BizHawk.Emulation.Consoles.Nintendo.N64
public int BufferHeight { get { return 480; } } public int BufferHeight { get { return 480; } }
public int BackgroundColor { get { return 0; } } public int BackgroundColor { get { return 0; } }
short[] m64pAudioBuffer; Sound.Utilities.SpeexResampler resampler;
public ISoundProvider SoundProvider { get { return this; } }
public void GetSamples(short[] samples) short[] m64pAudioBuffer = new short[2];
{ public ISoundProvider SoundProvider { get { return null; } }
if (m64pAudioBuffer.Length > 0) public ISyncSoundProvider SyncSoundProvider { get { return resampler; } }
{ public bool StartAsyncSound() { return false; }
for (int i = 0; i < samples.Length / 2; i++)
{
samples[i * 2] = m64pAudioBuffer[(int)((((double)m64pAudioBuffer.Length / 2) / (double)(samples.Length / 2)) * i) * 2];
samples[i * 2 + 1] = m64pAudioBuffer[(int)((((double)m64pAudioBuffer.Length / 2) / (double)(samples.Length / 2)) * i) * 2 + 1]; ;
}
}
}
public void DiscardSamples() { }
public int MaxVolume { get; set; }
public ISyncSoundProvider SyncSoundProvider { get { return null; } }
public bool StartAsyncSound() { return true; }
public void EndAsyncSound() { } public void EndAsyncSound() { }
public ControllerDefinition ControllerDefinition { get { return N64ControllerDefinition; } } public ControllerDefinition ControllerDefinition { get { return N64ControllerDefinition; } }
@ -107,7 +96,11 @@ namespace BizHawk.Emulation.Consoles.Nintendo.N64
public IList<MemoryDomain> MemoryDomains { get { return null; } } public IList<MemoryDomain> MemoryDomains { get { return null; } }
public MemoryDomain MainMemory { get { return null; } } public MemoryDomain MainMemory { get { return null; } }
public void Dispose() { } public void Dispose()
{
resampler.Dispose();
resampler = null;
}
[DllImport("kernel32.dll")] [DllImport("kernel32.dll")]
public static extern IntPtr LoadLibrary(string dllToLoad); public static extern IntPtr LoadLibrary(string dllToLoad);
@ -249,10 +242,13 @@ namespace BizHawk.Emulation.Consoles.Nintendo.N64
public void FrameComplete() public void FrameComplete()
{ {
int m64pAudioBufferSize = AudGetBufferSize(); int m64pAudioBufferSize = AudGetBufferSize();
m64pAudioBuffer = new short[m64pAudioBufferSize];
if (m64pAudioBuffer.Length < m64pAudioBufferSize)
m64pAudioBuffer = new short[m64pAudioBufferSize];
if (m64pAudioBufferSize > 0) if (m64pAudioBufferSize > 0)
{ {
AudReadAudioBuffer(m64pAudioBuffer); AudReadAudioBuffer(m64pAudioBuffer);
resampler.EnqueueSamples(m64pAudioBuffer, m64pAudioBufferSize / 2);
} }
m64pFrameComplete = true; m64pFrameComplete = true;
} }
@ -330,11 +326,15 @@ 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);
resampler = new Sound.Utilities.SpeexResampler(6, 32000, 44100, 32000, 44100, null, null);
} }
public void ExecuteEmulator() public void ExecuteEmulator()
{ {
m64pCoreDoCommandPtr(m64p_command.M64CMD_EXECUTE, 0, IntPtr.Zero); m64pCoreDoCommandPtr(m64p_command.M64CMD_EXECUTE, 0, IntPtr.Zero);
} }
} }
} }