fix(audio): preserve full sample boundaries for one-shot playback
This commit is contained in:
@@ -426,8 +426,8 @@ impl AudioMixer {
|
||||
voice.sample = None;
|
||||
continue;
|
||||
}
|
||||
let (loop_start, end) = match (sample.loop_start, sample.loop_end) {
|
||||
(Some(start), Some(end)) if start < end && end as usize <= len => {
|
||||
let (loop_start, end) = match (voice.loop_mode, sample.loop_start, sample.loop_end) {
|
||||
(LoopMode::On, Some(start), Some(end)) if start < end && end as usize <= len => {
|
||||
(start as f64, end as f64)
|
||||
}
|
||||
_ => (0.0, len as f64),
|
||||
@@ -512,6 +512,168 @@ mod control_tests {
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn one_shot_ignores_markers_and_loop_preserves_intro() {
|
||||
for looping in [false, true] {
|
||||
let (mut audio, mut mixer) = pair();
|
||||
let sample =
|
||||
Sample::new(48_000, vec![1024, 2048, 4096, 8192, 12288, 16384, 20480, 24576])
|
||||
.with_loop(2, 4);
|
||||
play(&mut audio, Arc::new(sample), 1.0, looping);
|
||||
audio.finish_frame();
|
||||
apply(&audio, &mut mixer);
|
||||
let mut pcm = [0.0; 20];
|
||||
mixer.fill_buffer(&mut pcm);
|
||||
let expected = if looping {
|
||||
[1024, 2048, 4096, 8192, 4096, 8192, 4096, 8192, 4096, 8192]
|
||||
} else {
|
||||
[1024, 2048, 4096, 8192, 12288, 16384, 20480, 24576, 0, 0]
|
||||
};
|
||||
for (frame, value) in pcm.as_chunks::<2>().0.iter().zip(expected) {
|
||||
assert_eq!(*frame, [value as f32 / 32768.0, 0.0]);
|
||||
}
|
||||
assert_eq!(mixer.voices[0].active, looping);
|
||||
assert_eq!(mixer.voices[0].sample.is_some(), looping);
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn absent_partial_and_invalid_markers_fall_back_to_full_sample() {
|
||||
for (start, end) in [
|
||||
(None, None),
|
||||
(Some(1), None),
|
||||
(None, Some(2)),
|
||||
(Some(2), Some(2)),
|
||||
(Some(3), Some(1)),
|
||||
(Some(0), Some(5)),
|
||||
(Some(u32::MAX), Some(u32::MAX)),
|
||||
(Some(0), Some(0)),
|
||||
] {
|
||||
for looping in [false, true] {
|
||||
let (mut audio, mut mixer) = pair();
|
||||
let mut sample = Sample::new(48_000, vec![4096, 8192, 12288, 16384]);
|
||||
sample.loop_start = start;
|
||||
sample.loop_end = end;
|
||||
play(&mut audio, Arc::new(sample), 1.0, looping);
|
||||
audio.finish_frame();
|
||||
apply(&audio, &mut mixer);
|
||||
let mut pcm = [0.0; 16];
|
||||
mixer.fill_buffer(&mut pcm);
|
||||
for (i, frame) in pcm.as_chunks::<2>().0.iter().enumerate() {
|
||||
let value = if looping || i < 4 { (i % 4 + 1) as f32 / 8.0 } else { 0.0 };
|
||||
assert_eq!(*frame, [value, 0.0], "markers {start:?}/{end:?}, loop {looping}");
|
||||
}
|
||||
assert_eq!(mixer.voices[0].active, looping);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn fractional_interpolation_uses_loop_seam_or_actual_tail() {
|
||||
// Both rate conversion and fractional pitch produce a half-frame step.
|
||||
for (rate, pitch) in [(48_000, 0.5), (24_000, 1.0), (96_000, 0.25)] {
|
||||
for looping in [false, true] {
|
||||
let (mut audio, mut mixer) = pair();
|
||||
play(
|
||||
&mut audio,
|
||||
Arc::new(Sample::new(rate, vec![4096, 8192, 16384, 24576]).with_loop(1, 3)),
|
||||
pitch,
|
||||
looping,
|
||||
);
|
||||
audio.finish_frame();
|
||||
apply(&audio, &mut mixer);
|
||||
let mut pcm = [0.0; 18];
|
||||
mixer.fill_buffer(&mut pcm);
|
||||
let expected = if looping {
|
||||
[0.125, 0.1875, 0.25, 0.375, 0.5, 0.375, 0.25, 0.375, 0.5]
|
||||
} else {
|
||||
[0.125, 0.1875, 0.25, 0.375, 0.5, 0.625, 0.75, 0.375, 0.0]
|
||||
};
|
||||
for (frame, value) in pcm.as_chunks::<2>().0.iter().zip(expected) {
|
||||
assert!((frame[0] - value).abs() <= 1e-6);
|
||||
assert_eq!(frame[1], 0.0);
|
||||
}
|
||||
assert_eq!(mixer.voices[0].active, looping);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn empty_samples_terminate_without_indexing() {
|
||||
for looping in [false, true] {
|
||||
for marked in [false, true] {
|
||||
let (mut audio, mut mixer) = pair();
|
||||
let sample = Sample::new(48_000, vec![]);
|
||||
let sample = if marked { sample.with_loop(0, 1) } else { sample };
|
||||
play(&mut audio, Arc::new(sample), f64::MAX, looping);
|
||||
audio.finish_frame();
|
||||
apply(&audio, &mut mixer);
|
||||
let mut pcm = [1.0; 8];
|
||||
mixer.fill_buffer(&mut pcm);
|
||||
assert_eq!(pcm, [0.0; 8]);
|
||||
assert!(!mixer.voices[0].active);
|
||||
assert!(mixer.voices[0].sample.is_none());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn multiple_wrap_pitch_preserves_selected_interval_and_signal() {
|
||||
for (rate, pitch) in [(48_000, 5.0), (96_000, 2.5)] {
|
||||
let (mut audio, mut mixer) = pair();
|
||||
play(
|
||||
&mut audio,
|
||||
Arc::new(Sample::new(rate, vec![4096, 8192, 16384, 24576]).with_loop(1, 3)),
|
||||
pitch,
|
||||
true,
|
||||
);
|
||||
audio.finish_frame();
|
||||
apply(&audio, &mut mixer);
|
||||
let mut pcm = [0.0; 10];
|
||||
mixer.fill_buffer(&mut pcm);
|
||||
assert_eq!(pcm, [0.125, 0.0, 0.25, 0.0, 0.5, 0.0, 0.25, 0.0, 0.5, 0.0]);
|
||||
assert_eq!(mixer.voices[0].pos, 1.0);
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn extreme_pitch_and_source_rates_keep_positions_finite() {
|
||||
for rate in [0, 1, 44_100, 48_000, 96_000, u32::MAX] {
|
||||
for looping in [false, true] {
|
||||
let (mut audio, mut mixer) = pair();
|
||||
play(
|
||||
&mut audio,
|
||||
Arc::new(Sample::new(rate, vec![4096, 8192, 16384, 24576]).with_loop(1, 3)),
|
||||
f64::MAX,
|
||||
looping,
|
||||
);
|
||||
audio.finish_frame();
|
||||
apply(&audio, &mut mixer);
|
||||
let mut pcm = [0.0; 128];
|
||||
mixer.fill_buffer(&mut pcm);
|
||||
assert!(pcm.iter().all(|value| value.is_finite()));
|
||||
assert!(mixer.voices[0].pos.is_finite());
|
||||
if rate == 0 {
|
||||
assert_eq!(mixer.voices[0].pos, 0.0);
|
||||
assert!(pcm.as_chunks::<2>().0.iter().all(|frame| *frame == [0.125, 0.0]));
|
||||
} else if looping {
|
||||
assert!((1.0..3.0).contains(&mixer.voices[0].pos));
|
||||
assert!(
|
||||
pcm.as_chunks::<2>()
|
||||
.0
|
||||
.iter()
|
||||
.skip(1)
|
||||
.all(|frame| (0.25..=0.5).contains(&frame[0]))
|
||||
);
|
||||
} else {
|
||||
assert_eq!(&pcm[..2], &[0.125, 0.0]);
|
||||
assert!(pcm[2..].iter().all(|value| *value == 0.0));
|
||||
}
|
||||
assert_eq!(mixer.voices[0].active, looping || rate == 0);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn pcm_controls_preserve_position_and_stop_is_idempotent() {
|
||||
let (mut audio, mut mixer) = pair();
|
||||
@@ -632,7 +794,7 @@ mod control_tests {
|
||||
let mut pcm = [0.0; 128];
|
||||
mixer.fill_buffer(&mut pcm);
|
||||
assert!(pcm.iter().all(|v| v.is_finite()));
|
||||
assert!(pcm.chunks_exact(2).all(|frame| frame == [0.5, 0.0]));
|
||||
assert!(pcm.as_chunks::<2>().0.iter().all(|frame| *frame == [0.5, 0.0]));
|
||||
assert!(mixer.voices[0].active);
|
||||
assert!(mixer.voices[0].pos >= 1.0 && mixer.voices[0].pos < 3.0);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user