asaril/ledstick-rs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix fft window init

Browse source
This commit is contained in:
Patrick Moessler 2025-03-20 22:05:08 +01:00
parent 385bd830ad
commit c7e0640401
1 changed files with 3 additions and 4 deletions

7
src/audio.rs
View file

@ -11,7 +11,6 @@ pub type AudioBuffer = [i32; AUDIO_SAMPLES_PER_BUF];
pub type DspBuffer = [f32; AUDIO_SAMPLES_PER_BUF]; pub type DspBuffer = [f32; AUDIO_SAMPLES_PER_BUF];
static FFT_WINDOW_CELL: StaticCell<DspBuffer> = StaticCell::new(); static FFT_WINDOW_CELL: StaticCell<DspBuffer> = StaticCell::new();
static FFT_WINDOW: Option<&DspBuffer> = None;
#[derive(Clone, Copy, Default)] #[derive(Clone, Copy, Default)]
pub struct AudioStats { pub struct AudioStats {
@ -22,6 +21,7 @@ pub struct AudioStats {
pub struct AudioProcessor { pub struct AudioProcessor {
pub stats: AudioStats, pub stats: AudioStats,
window: &'static DspBuffer,
} }
impl Default for AudioProcessor { impl Default for AudioProcessor {
@ -32,14 +32,13 @@ impl Default for AudioProcessor {
esp_dsp::dsps_wind_hann_f32(buf.as_mut_ptr(), AUDIO_SAMPLES_PER_BUF as i32); esp_dsp::dsps_wind_hann_f32(buf.as_mut_ptr(), AUDIO_SAMPLES_PER_BUF as i32);
} }
FFT_WINDOW_CELL.init(buf);
AudioProcessor { AudioProcessor {
stats: AudioStats { stats: AudioStats {
floating_max: 0i32, floating_max: 0i32,
current_powers: [0f32; AUDIO_BANDS], current_powers: [0f32; AUDIO_BANDS],
avg_powers: [0f32; AUDIO_BANDS], avg_powers: [0f32; AUDIO_BANDS],
}, },
window: FFT_WINDOW_CELL.init(buf),
} }
} }
} }
@ -76,7 +75,7 @@ impl AudioProcessor {
unsafe { unsafe {
esp_nofail!(esp_dsp::dsps_mul_f32_ae32( esp_nofail!(esp_dsp::dsps_mul_f32_ae32(
fft.as_ptr(), fft.as_ptr(),
FFT_WINDOW.expect("windows not initialized!").as_ptr(), self.window.as_ptr(),
fft.as_mut_ptr(), fft.as_mut_ptr(),
AUDIO_SAMPLES_PER_BUF as i32, AUDIO_SAMPLES_PER_BUF as i32,
1, 1,