phantop/doukutsu-rs
1
0
Fork 0
mirror of https://github.com/doukutsu-rs/doukutsu-rs synced 2024-11-22 21:52:46 +00:00
Code Issues Releases Wiki Activity

44100hz drums fix

Browse source
This commit is contained in:
Alula 2022-01-08 01:55:43 +01:00
parent d15fd43c84
commit 94514d3b68
No known key found for this signature in database
GPG key ID: 3E00485503A1D8BA
1 changed files with 37 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

72
src/sound/org_playback.rs
View file

@ -1,3 +1,4 @@
use std::cmp::min;
use std::hint::unreachable_unchecked; use std::hint::unreachable_unchecked;
use std::mem::MaybeUninit; use std::mem::MaybeUninit;
@ -352,67 +353,67 @@ impl OrgPlaybackEngine {
let vol = buf.vol_cent; let vol = buf.vol_cent;
let (pan_l, pan_r) = buf.pan_cent; let (pan_l, pan_r) = buf.pan_cent;
fn clamp<T: Ord>(v: T, limit: T) -> T {
if v > limit {
limit
} else {
v
}
}
if self.interpolation == InterpolationMode::Polyphase { if self.interpolation == InterpolationMode::Polyphase {
let fir_step = (FIR_STEP * advance as f32).floor(); let fir_step = (FIR_STEP * advance as f32).floor();
let fir_step = if fir_step == 0.0 { FIR_STEP } else { fir_step }; let fir_step = if fir_step == 0.0 { FIR_STEP } else { fir_step };
let fir_gain = fir_step / FIR_STEP; let fir_gain = fir_step / FIR_STEP;
let cache_ptr = buf.fir.cache.as_mut_ptr(); let cache_ptr = buf.fir.cache.as_mut_ptr();
let sample_data_ptr = buf.sample.data.as_ptr();
let pos = buf.position as usize + buf.base_pos; let pos = buf.position as usize + buf.base_pos;
let cl = buf.fir.cache.len() / 2; let cl = buf.fir.cache.len() / 2;
let i = buf.fir.pos % cl; let i = buf.fir.pos % cl;
let (sl1, sr1, sl2, sr2) = match (is_16bit, is_stereo) { let (sl1, sr1, sl2, sr2) = match (is_16bit, is_stereo) {
(true, true) => { (true, true) => unsafe {
let sl1 = i16::from_le_bytes([buf.sample.data[pos << 2], buf.sample.data[pos << 2 + 1]]) let ps = pos << 2;
let sl1 = (*sample_data_ptr.add(ps) as u16
| (*sample_data_ptr.add(ps + 1) as u16) << 8)
as f32 as f32
/ 32768.0; / 32768.0;
let sr1 = let sr1 =
i16::from_le_bytes([buf.sample.data[pos << 2 + 2], buf.sample.data[pos << 2 + 3]]) (*sample_data_ptr.add(ps + 2) as u16
| (*sample_data_ptr.add(ps + 3) as u16) << 8)
as f32 as f32
/ 32768.0; / 32768.0;
let pos = clamp(pos + 1, buf.base_pos + buf.len - 1); let ps = min(pos + 1, buf.base_pos + buf.len - 1) << 2;
let sl2 = i16::from_le_bytes([buf.sample.data[pos << 2], buf.sample.data[pos << 2 + 1]]) let sl2 = (*sample_data_ptr.add(ps) as u16
| (*sample_data_ptr.add(ps + 1) as u16) << 8)
as f32 as f32
/ 32768.0; / 32768.0;
let sr2 = let sr2 =
i16::from_le_bytes([buf.sample.data[pos << 2 + 2], buf.sample.data[pos << 2 + 3]]) (*sample_data_ptr.add(ps + 2) as u16
| (*sample_data_ptr.add(ps + 3) as u16) << 8)
as f32 as f32
/ 32768.0; / 32768.0;
(sl1, sr1, sl2, sr2) (sl1, sr1, sl2, sr2)
} }
(false, true) => { (false, true) => unsafe {
let sl1 = (buf.sample.data[pos << 1] as f32 - 128.0) / 128.0; let ps = pos << 1;
let sr1 = (buf.sample.data[(pos << 1) + 1] as f32 - 128.0) / 128.0; let sl1 = (*sample_data_ptr.add(ps) as f32 - 128.0) / 128.0;
let pos = clamp(pos + 1, buf.base_pos + buf.len - 1); let sr1 = (*sample_data_ptr.add(ps + 1) as f32 - 128.0) / 128.0;
let sl2 = (buf.sample.data[pos << 1] as f32 - 128.0) / 128.0; let ps = min(pos + 1, buf.base_pos + buf.len - 1) << 1;
let sr2 = (buf.sample.data[(pos << 1) + 1] as f32 - 128.0) / 128.0; let sl2 = (*sample_data_ptr.add(ps) as f32 - 128.0) / 128.0;
let sr2 = (*sample_data_ptr.add(ps + 1) as f32 - 128.0) / 128.0;
(sl1, sr1, sl2, sr2) (sl1, sr1, sl2, sr2)
} }
(true, false) => { (true, false) => unsafe {
let s1 = (buf.sample.data[pos << 1] as u16 let ps = pos << 1;
| (buf.sample.data[pos << 1 + 1] as u16) << 8) let s1 = (*sample_data_ptr.add(ps) as u16
| (*sample_data_ptr.add(ps + 1) as u16) << 8)
as f32 as f32
/ 32768.0; / 32768.0;
let pos = clamp(pos + 1, buf.base_pos + buf.len - 1); let ps = min(pos + 1, buf.base_pos + buf.len - 1) << 1;
let s2 = (buf.sample.data[pos << 1] as u16 let s2 = (*sample_data_ptr.add(ps) as u16
| (buf.sample.data[pos << 1 + 1] as u16) << 8) | (*sample_data_ptr.add(ps + 1) as u16) << 8)
as f32 as f32
/ 32768.0; / 32768.0;
(s1, s1, s2, s2) (s1, s1, s2, s2)
} }
(false, false) => { (false, false) => unsafe {
let s1 = (buf.sample.data[pos] as f32 - 128.0) / 128.0; let s1 = (*sample_data_ptr.add(pos) as f32 - 128.0) / 128.0;
let pos = clamp(pos + 1, buf.base_pos + buf.len - 1); let pos = min(pos + 1, buf.base_pos + buf.len - 1);
let s2 = (buf.sample.data[pos] as f32 - 128.0) / 128.0; let s2 = (*sample_data_ptr.add(pos) as f32 - 128.0) / 128.0;
(s1, s1, s2, s2) (s1, s1, s2, s2)
} }
}; };
@ -504,7 +505,7 @@ impl OrgPlaybackEngine {
InterpolationMode::Nearest => get_sample(buf, pos), InterpolationMode::Nearest => get_sample(buf, pos),
InterpolationMode::Linear => { InterpolationMode::Linear => {
let (sl1, sr1) = get_sample(buf, pos); let (sl1, sr1) = get_sample(buf, pos);
let (sl2, sr2) = get_sample(buf, clamp(pos + 1, buf.base_pos + buf.len - 1)); let (sl2, sr2) = get_sample(buf, min(pos + 1, buf.base_pos + buf.len - 1));
let r1 = buf.position.fract() as f32; let r1 = buf.position.fract() as f32;
let sl = sl1 + (sl2 - sl1) * r1; let sl = sl1 + (sl2 - sl1) * r1;
@ -516,7 +517,7 @@ impl OrgPlaybackEngine {
use std::f32::consts::PI; use std::f32::consts::PI;
let (sl1, sr1) = get_sample(buf, pos); let (sl1, sr1) = get_sample(buf, pos);
let (sl2, sr2) = get_sample(buf, clamp(pos + 1, buf.base_pos + buf.len - 1)); let (sl2, sr2) = get_sample(buf, min(pos + 1, buf.base_pos + buf.len - 1));
let r1 = buf.position.fract() as f32; let r1 = buf.position.fract() as f32;
let r2 = (1.0 - f32::cos(r1 * PI)) / 2.0; let r2 = (1.0 - f32::cos(r1 * PI)) / 2.0;
@ -528,8 +529,8 @@ impl OrgPlaybackEngine {
} }
InterpolationMode::Cubic => { InterpolationMode::Cubic => {
let (sl1, sr1) = get_sample(buf, pos); let (sl1, sr1) = get_sample(buf, pos);
let (sl2, sr2) = get_sample(buf, clamp(pos + 1, buf.base_pos + buf.len - 1)); let (sl2, sr2) = get_sample(buf, min(pos + 1, buf.base_pos + buf.len - 1));
let (sl3, sr3) = get_sample(buf, clamp(pos + 2, buf.base_pos + buf.len - 1)); let (sl3, sr3) = get_sample(buf, min(pos + 2, buf.base_pos + buf.len - 1));
let (sl4, sr4) = get_sample(buf, pos.saturating_sub(1)); let (sl4, sr4) = get_sample(buf, pos.saturating_sub(1));
let r1 = buf.position.fract() as f32; let r1 = buf.position.fract() as f32;
@ -692,7 +693,8 @@ impl RenderBuffer {
pub fn set_frequency(&mut self, frequency: u32) { pub fn set_frequency(&mut self, frequency: u32) {
//assert!(frequency >= 100 && frequency <= 100000); //assert!(frequency >= 100 && frequency <= 100000);
//dbg!(frequency); //dbg!(frequency);
self.frequency = frequency; let rate_mod = self.sample.format.sample_rate as f32 / 22050.0;
self.frequency = (frequency as f32 * rate_mod) as u32;
} }
#[inline] #[inline]