diff --git a/src/oscillator/wavetable.rs b/src/oscillator/wavetable.rs index 5c3590d..4afa136 100644 --- a/src/oscillator/wavetable.rs +++ b/src/oscillator/wavetable.rs @@ -46,8 +46,9 @@ fn tables(wave: Waveform) -> &'static [Table] { /// 周波数・波形変更時に選ぶ読出し設定。OscillatorStateがユニゾンごとに保持する。 #[derive(Clone, Copy)] pub(super) struct Selection { - /// 高域側の倍音を多く含むテーブルの番号。 - index: usize, + /// 周波数変更時に選ぶ倍音の多い帯域と、その隣の帯域。 + hi: &'static Table, + lo: &'static Table, /// 直前の帯域(倍音の少ないテーブル)への混合率。 mix: f64, /// Nyquist直前で基音を0へ下げる倍率。他の帯域は1。 @@ -56,7 +57,8 @@ pub(super) struct Selection { impl Selection { pub const EMPTY: Self = Self { - index: 0, + hi: &data::SAW[0], + lo: &data::SAW[0], mix: 0.0, gain: 0.0, }; @@ -78,7 +80,12 @@ impl Selection { let mix = ((increment * rich.harmonic * 2.0 - 0.9) * 10.0).clamp(0.0, 1.0); let gain = if index == 0 { 1.0 - mix } else { 1.0 }; let mix = if index == 0 { 0.0 } else { mix }; - Self { index, mix, gain } + Self { + hi: rich, + lo: &tables[index.saturating_sub(1)], + mix, + gain, + } } /// phaseは発振器の保持位相または変調後の、有限の[0,1]。 @@ -90,10 +97,9 @@ impl Selection { } else { 0.25 - (half - 0.25).abs() }; - let tables = tables(wave); - let mut value = tables[self.index].read_sample(folded); + let mut value = self.hi.read_sample(folded); if self.mix != 0.0 { - value += (tables[self.index - 1].read_sample(folded) - value) * self.mix; + value += (self.lo.read_sample(folded) - value) * self.mix; } value * (self.gain.copysign(0.5 - phase)) } @@ -111,9 +117,8 @@ mod tests { let reference = tables(wave) .partition_point(|t| t.harmonic * increment < 0.5) .saturating_sub(1); - assert_eq!( - Selection::new(wave, increment).index, - reference, + assert!( + std::ptr::eq(Selection::new(wave, increment).hi, &tables(wave)[reference]), "increment={increment:?}" ); }; diff --git a/src/oscillator.rs b/src/oscillator.rs index 17ae160..ac7f1ba 100644 --- a/src/oscillator.rs +++ b/src/oscillator.rs @@ -225,11 +225,44 @@ impl Oscillator { /// 現在の入力・状態でサンプルを生成し、その後で次のサンプルに向けて状態を更新する。 /// sample_rateは処理環境のサンプルレート(Hz)。不正な入力・レートでは無音を返し、状態を保持する。 + #[allow(dead_code)] // 単体ベンチマークが使う、入力検証付きの入口。 #[inline] pub fn generate_sample( &mut self, input: &OscillatorInput, sample_rate: f64, + ) -> OscillatorSample { + self.generate_optional_sample::(input, sample_rate) + } + + /// 音声・変調のどちらにも使わないサンプルの状態だけを更新する。 + #[cfg(test)] + #[inline] + pub fn advance_sample(&mut self, input: &OscillatorInput, sample_rate: f64) { + self.generate_optional_sample::(input, sample_rate); + } + + /// 位相変調なしの定常入力を、出力を作らず指定サンプル数だけ進める。 + /// 位相とNoiseは従来どおり1サンプルずつ同じ順序で更新する。 + pub(super) fn advance_samples(&mut self, input: &OscillatorInput, rate: f64, count: usize) { + debug_assert!(!input.phase_modulated); + let mut input = *input; + input.active = count != 0; + let first = self.generate_optional_sample::(&input, rate); + if first.count == 0 { return; } + for _ in 1..count { + if input.waveform == Waveform::Noise { + for _ in 0..first.count { self.state.noise.next_f64(); } + } + self.update_sample(&input); + } + } + + #[inline] + fn generate_optional_sample( + &mut self, + input: &OscillatorInput, + sample_rate: f64, ) -> OscillatorSample { if !(input.is_valid() & (sample_rate <= f64::MAX) & (sample_rate > 0.0)) { return OscillatorSample { @@ -237,6 +270,23 @@ impl Oscillator { count: 0, }; } + // SAFETY: 上の検証で入力とレートの全条件を満たすことを確認した。 + unsafe { self.generate_validated_sample::(input, sample_rate) } + } + + /// Voice内で検証済みの定常入力とレートから、生成と状態更新を行う。 + /// OUTPUT=falseは状態だけを更新する。 + /// + /// # Safety + /// input.is_valid()がtrue、sample_rateが有限の正数であること。 + /// 後段の高速整数変換と固定長配列の処理はこの範囲を前提とする。 + #[inline] + pub(super) unsafe fn generate_validated_sample( + &mut self, + input: &OscillatorInput, + sample_rate: f64, + ) -> OscillatorSample { + debug_assert!(input.is_valid() && sample_rate.is_finite() && sample_rate > 0.0); // ノート境界と位相モードを反映して生成した後、次サンプルへ進める。 // キャッシュを含むState全体のサンプルごとのコピーは行わない。 if input.note_generation != self.state.note_generation && input.active { @@ -261,14 +311,17 @@ impl Oscillator { }; } self.refresh_frequency(input, sample_rate); - let sample = self.generate_waveform_sample(input); + let sample = self.generate_waveform_sample::(input); self.update_sample(input); sample } /// 位相変調は読出し位置だけへ適用する。Noiseはユニゾンごとに乱数を一つ進める。 #[inline] - fn generate_waveform_sample(&mut self, input: &OscillatorInput) -> OscillatorSample { + fn generate_waveform_sample( + &mut self, + input: &OscillatorInput, + ) -> OscillatorSample { match input.waveform { Waveform::Noise => { self.state.valid = false; @@ -279,29 +332,35 @@ impl Oscillator { } OscillatorSample { values, count } } - Waveform::Sine => self.generate_periodic_sample::(input), - _ => self.generate_bandlimited_sample(input), + Waveform::Sine => self.generate_periodic_sample::(input), + _ => self.generate_bandlimited_sample::(input), } } // 帯域別のループを分離してSine/Noiseを小さく保ち、ユニゾンごとの関数呼出しを省く。 #[inline(never)] - fn generate_bandlimited_sample(&mut self, input: &OscillatorInput) -> OscillatorSample { - self.generate_periodic_sample::(input) + fn generate_bandlimited_sample( + &mut self, + input: &OscillatorInput, + ) -> OscillatorSample { + self.generate_periodic_sample::(input) } /// 波形別に展開する周期波の読出し。位相変調の処理は両経路で共通にする。 #[inline(always)] - fn generate_periodic_sample( + fn generate_periodic_sample( &mut self, input: &OscillatorInput, ) -> OscillatorSample { let count = input.rendered_voices(); let mut values = [0.0; 7]; if input.phase_modulated { - return self.generate_antialiased_sample(input); + return self.generate_antialiased_sample::(input); } self.state.valid = false; + if !OUTPUT { + return OscillatorSample { values, count }; + } // 整数周期を先に除き、±1/±2回転では元の位相を厳密に保持する。 // SAFETY: generate_sampleで位相変調が有限のi32範囲であることを検証済み。 let cycles = unsafe { input.phase_modulation.to_int_unchecked::() }; @@ -338,7 +397,10 @@ impl Oscillator { } #[inline(never)] - fn generate_antialiased_sample(&mut self, input: &OscillatorInput) -> OscillatorSample { + fn generate_antialiased_sample( + &mut self, + input: &OscillatorInput, + ) -> OscillatorSample { let count = input.rendered_voices(); let mut values = [0.; 7]; if self.state.history_count != count { @@ -354,7 +416,9 @@ impl Oscillator { } else { [q - inc, q - 2. * inc] }; - *value = self.state.bank[k].generate_sample(q, b, c); + if OUTPUT { + *value = self.state.bank[k].generate_sample(q, b, c); + } // 次サンプルで保持位相が巻き戻る量を履歴にも適用する。 // 変調量は折り返さず、周期を跨ぐ差商の距離を保持する。 let wrap = f64::from((phase + inc >= 1.) as u8); @@ -1086,6 +1150,44 @@ mod tests { oscillator } + #[test] + fn advancing_without_output_preserves_phase_noise_and_adaa_history() { + let mut full = Oscillator::new(); + let mut skipped = Oscillator { state: full.state }; + let waves = [ + Waveform::Sine, + Waveform::Triangle, + Waveform::Square, + Waveform::Sawtooth, + Waveform::Noise, + ]; + for n in 0..5000 { + let mut input = test_input(); + input.waveform = waves[n / 61 % waves.len()]; + input.unison_voices = (n / 79 % 7 + 1) as u32; + input.detune_cents = if n % 11 == 0 { 0.0 } else { 25.0 }; + input.phase_mode = [PhaseMode::Keep, PhaseMode::Zero, PhaseMode::Random][n / 127 % 3]; + input.note_generation = (n / 127) as u64; + input.active = n % 43 != 0; + input.phase_modulation = (n as f64 * 0.17).sin() * 2.0; + input.phase_modulated = n % 17 != 0; + input.frequency_hz = 40.0 + (n % 300) as f64 * 17.0; + let expected = full.generate_sample(&input, 48000.0); + if n % 19 == 0 { + let actual = skipped.generate_sample(&input, 48000.0); + assert_eq!(actual.count, expected.count); + assert_eq!(actual.values, expected.values); + } else { + skipped.advance_sample(&input, 48000.0); + } + assert_eq!(skipped.state.phases, full.state.phases); + assert_eq!(skipped.state.history, full.state.history); + assert_eq!(skipped.state.valid, full.state.valid); + assert_eq!(skipped.state.random, full.state.random); + assert_eq!(skipped.state.noise, full.state.noise); + } + } + #[test] fn inactive_samples_preserve_phase_and_silent_active_samples_advance() { let mut oscillator = Oscillator::new(); diff --git a/src/plugin.rs b/src/plugin.rs index a6bda3f..2410a87 100644 --- a/src/plugin.rs +++ b/src/plugin.rs @@ -1020,8 +1020,13 @@ fn generate_output_samples( nonzero |= write(offset as usize, synth.generate_sample()); } } else { - for offset in range { - nonzero |= write(offset as usize, synth.generate_sample()); + let mut samples = [[0.0; 2]; 32]; + for start in (range.start..range.end).step_by(samples.len()) { + let count = (range.end - start).min(samples.len() as i32) as usize; + synth.generate_samples(&mut samples[..count]); + for (offset, &sample) in samples[..count].iter().enumerate() { + nonzero |= write(start as usize + offset, sample); + } } } nonzero diff --git a/src/synth.rs b/src/synth.rs index dac189e..ce579cc 100644 --- a/src/synth.rs +++ b/src/synth.rs @@ -15,6 +15,8 @@ pub struct SynthesizerState { next_oscillator_id: usize, /// 現在使用する枠数(1..=32)。範囲外の枠は停止し、位相だけ保持する。 polyphony: usize, + /// 停止後に一度でもNote Onを割り当てた枠の上端。未使用枠のサンプル処理を省く。 + used_voices: usize, /// 全オシレータに共通のサンプルレート(Hz)。 sample_rate: f64, /// 適用済みの正規化値。変更時だけ実単位へ換算する。 @@ -51,6 +53,7 @@ impl Synthesizer { voices: std::array::from_fn(|_| Voice::new()), next_oscillator_id: 0, polyphony: 1, + used_voices: 0, sample_rate: 44100.0, parameters: parameters::defaults(), master_gain: 1.0, @@ -97,6 +100,7 @@ impl Synthesizer { voice.stop(); } self.state.polyphony = count; + self.state.used_voices = self.state.used_voices.min(count); self.state.next_oscillator_id %= count; } // 変更のないグループの時間換算(pow)なども省く。 @@ -196,13 +200,17 @@ impl Synthesizer { if !self.state.voices[self.state.next_oscillator_id].note_on(note, tuning, velocity) { return false; } + self.state.used_voices = self + .state + .used_voices + .max(self.state.next_oscillator_id + 1); self.state.next_oscillator_id = (self.state.next_oscillator_id + 1) % self.state.polyphony; true } pub fn note_off(&mut self, note: Note) { // 同じID、またはID未提供の同チャンネル・同音高が複数あれば全一致をreleaseする。 - for voice in &mut self.state.voices[..self.state.polyphony] { + for voice in &mut self.state.voices[..self.state.used_voices] { voice.note_off(note); } } @@ -216,6 +224,7 @@ impl Synthesizer { pub fn stop(&mut self) { self.state.previous_dry = [0.0; 2]; self.state.started = false; + self.state.used_voices = 0; self.state.transition = 0; self.state.processing = self.state.requested_processing; for voice in &mut self.state.voices { @@ -225,12 +234,56 @@ impl Synthesizer { /// 表示用の同時発音数。ブロック末尾で読み、ユニゾンや発振器数は加算しない。 pub fn active_voice_count(&self) -> u32 { - self.state.voices[..self.state.polyphony] + self.state.voices[..self.state.used_voices] .iter() .filter(|voice| voice.is_active()) .count() as u32 } + /// パラメーターとノートが一定の区間を、Voiceごとのサンプル系列で加算する。 + pub fn generate_samples(&mut self, output: &mut [[f64; 2]]) { + if output.is_empty() { return; } + if self.state.transition != 0 || self.state.processing != self.state.requested_processing { + for out in output { *out = self.generate_sample(); } + return; + } + self.state.started = true; + let clipper = self.state.processing; + let gain = self.state.master_gain; + output.fill([0.0; 2]); + if clipper == ClipperType::None { + for chunk in output.chunks_mut(32) { + let mut voice_output = [[0.0; 2]; 32]; + for voice in &mut self.state.voices[..self.state.used_voices] { + voice.generate_samples(self.state.sample_rate, &self.state.panning_gains, &self.state.mono_gains, &mut voice_output[..chunk.len()]); + for (out, value) in chunk.iter_mut().zip(voice_output) { + out[0] += value[0]; out[1] += value[1]; + } + } + } + for out in output { + let current = out.map(|v| v * gain); + *out = std::mem::replace(&mut self.state.previous_dry, current); + } + } else { + for chunk in output.chunks_mut(32) { + let mut dry = [[0.0; 2]; 32]; + let mut distortion = self.state.distortion; + distortion.clipper = clipper; + for voice in &mut self.state.voices[..self.state.used_voices] { + for (out, dry) in chunk.iter_mut().zip(&mut dry) { + let (input, wet) = voice.generate_distorted_sample(self.state.sample_rate, &self.state.panning_gains, &self.state.mono_gains, &distortion); + for ch in 0..2 { dry[ch] += input[ch]; out[ch] += wet[ch]; } + } + } + for (out, dry) in chunk.iter_mut().zip(dry) { + let dry = std::mem::replace(&mut self.state.previous_dry, dry.map(|v| v * gain)); + *out = std::array::from_fn(|ch| dry[ch] * (1.0 - distortion.mix) + (out[ch] * gain) * distortion.mix); + } + } + } + } + pub fn generate_sample(&mut self) -> [f64; 2] { self.state.started = true; if self.state.transition == 0 && self.state.processing != self.state.requested_processing { @@ -248,7 +301,7 @@ impl Synthesizer { } else { let mut distortion = self.state.distortion; distortion.clipper = clipper; - for voice in &mut self.state.voices[..self.state.polyphony] { + for voice in &mut self.state.voices[..self.state.used_voices] { let (input, output) = voice.generate_distorted_sample( self.state.sample_rate, &self.state.panning_gains, @@ -284,7 +337,7 @@ impl Synthesizer { /// フィルタまでのVoice出力を加算しMasterを適用する。 fn mix_sample(&mut self) -> [f64; 2] { let mut sum = [0.0; 2]; - for voice in &mut self.state.voices[..self.state.polyphony] { + for voice in &mut self.state.voices[..self.state.used_voices] { let sample = voice.generate_sample( self.state.sample_rate, &self.state.panning_gains, diff --git a/src/voice.rs b/src/voice.rs index 66ee3fb..ff15a09 100644 --- a/src/voice.rs +++ b/src/voice.rs @@ -247,11 +247,42 @@ impl Voice { } /// Voiceの3発振器・音量AHDSR・SVFまでをホストレートで処理する。 + #[inline] pub fn generate_sample( - &mut self, - sample_rate: f64, - gains: &PanningGains, - mono_gains: &[f64; 2], + &mut self, sample_rate: f64, gains: &PanningGains, mono_gains: &[f64; 2], + ) -> [f64; 2] { + self.generate_one_sample::(sample_rate, gains, mono_gains) + } + + /// 消音・無変調の補助発振器は、定常入力の確認を系列で共用する。 + pub fn generate_samples( + &mut self, sample_rate: f64, gains: &PanningGains, mono_gains: &[f64; 2], + output: &mut [[f64; 2]], + ) { + if output.is_empty() { return; } + if self.state.oscillator_gains[1..] == [0.0; 2] + && self.state.phase_depths == [0.0; 2] + { + let mut active = 0; + for value in output { + *value = self.generate_one_sample::(sample_rate, gains, mono_gains); + active += usize::from(self.state.oscillator_inputs[0].active); + } + let last_active = self.state.oscillator_inputs[0].active; + for i in 1..3 { + let input = &mut self.state.oscillator_inputs[i]; + input.active = last_active; + input.phase_modulation = 0.0; + input.phase_modulated = false; + self.state.oscillators[i].advance_samples(input, sample_rate, active); + } + } else { + for value in output { *value = self.generate_sample(sample_rate, gains, mono_gains); } + } + } + + fn generate_one_sample( + &mut self, sample_rate: f64, gains: &PanningGains, mono_gains: &[f64; 2], ) -> [f64; 2] { if !(sample_rate.is_finite() & (sample_rate > 0.0)) { return [0.0; 2]; @@ -285,12 +316,25 @@ impl Voice { let depths = [0.0, self.state.phase_depths[0], self.state.phase_depths[1]]; let mut modulation = 0.0; // 同じサンプル時刻の生波形をOsc3→Osc2→Osc1へ渡す。 - for i in (0..3).rev() { + for i in (0..if AUX { 3 } else { 1 }).rev() { self.state.oscillator_inputs[i].active = active; let input = &mut self.state.oscillator_inputs[i]; input.phase_modulation = modulation; input.phase_modulated = i < 2 && self.state.phase_depths[i] != 0.0; - let current = self.state.oscillators[i].generate_sample(input, sample_rate); + if self.state.oscillator_gains[i] == 0.0 && depths[i] == 0.0 { + // SAFETY: 定常設定は親、ノート周波数とレートはVoiceで検証済み。 + // 変調入力は有限の波形と0〜2周期の深度から生成し、i32範囲内に収まる。 + unsafe { + self.state.oscillators[i] + .generate_validated_sample::(input, sample_rate); + } + modulation = 0.0; + continue; + } + // SAFETY: 上記と同じ検証済みの定常設定・周波数・レート・変調入力を使う。 + let current = unsafe { + self.state.oscillators[i].generate_validated_sample::(input, sample_rate) + }; modulation = current.values[0] * depths[i]; if self.state.oscillator_gains[i] != 0.0 { // 無音の変調源はrawだけを使い、音声用の定位・加算を省く。