paoda
/
gb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix(snd): increase accuracy of when to sample from APU

This commit is contained in:
Rekai Nyangadzayi Musuka 2021-07-10 22:35:54 -05:00
parent 7ab6e120f9
commit 3dbf026d33
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/sound.rs
View File

@ -6,7 +6,8 @@ use crate::emu::SM83_CLOCK_SPEED;
use crate::Cycle; use crate::Cycle;
const WAVE_PATTERN_RAM_LEN: usize = 0x10; const WAVE_PATTERN_RAM_LEN: usize = 0x10;
const SAMPLE_RATE: u32 = 4800; // Hz const SAMPLE_RATE: u32 = 48000; // Hz
const SAMPLE_INCREMENT: u64 = SAMPLE_RATE as u64;
const SAMPLE_RATE_IN_CYCLES: Cycle = Cycle::new((SM83_CLOCK_SPEED / SAMPLE_RATE as u64) as u32); const SAMPLE_RATE_IN_CYCLES: Cycle = Cycle::new((SM83_CLOCK_SPEED / SAMPLE_RATE as u64) as u32);
#[derive(Debug, Clone, Default)] #[derive(Debug, Clone, Default)]
@ -26,13 +27,13 @@ pub(crate) struct Sound {
div_prev: Option<u8>, div_prev: Option<u8>,
sender: Option<SampleSender>, sender: Option<SampleSender>,
cycle: Cycle, sample_counter: u64,
} }
impl Sound { impl Sound {
pub(crate) fn clock(&mut self, div: u16) { pub(crate) fn clock(&mut self, div: u16) {
use FrameSequencerState::*; use FrameSequencerState::*;
self.cycle += 1; self.sample_counter += SAMPLE_INCREMENT;
// the 5th bit of the high byte // the 5th bit of the high byte
let bit_5 = (div >> 13 & 0x01) as u8; let bit_5 = (div >> 13 & 0x01) as u8;
@ -64,10 +65,9 @@ impl Sound {
self.div_prev = Some(bit_5); self.div_prev = Some(bit_5);
// TODO: Should the FrameSequencer be run first? if self.sample_counter >= SM83_CLOCK_SPEED {
if self.cycle > SAMPLE_RATE_IN_CYCLES {
// Sample the APU // Sample the APU
self.cycle %= SAMPLE_RATE_IN_CYCLES; self.sample_counter %= SM83_CLOCK_SPEED;
let ch1_amplitude = self.ch1.amplitude(); let ch1_amplitude = self.ch1.amplitude();
let ch1_left = self.ctrl.output.ch1_left() as u8 as f32 * ch1_amplitude; let ch1_left = self.ctrl.output.ch1_left() as u8 as f32 * ch1_amplitude;