SYNC

firmware/baseband/proc_wfm_audio.hpp

@@ -24,32 +24,47 @@
 
 #include "baseband_processor.hpp"
 
-#include "channel_decimator.hpp"
 #include "dsp_decimate.hpp"
 #include "dsp_demodulate.hpp"
-#include "dsp_fir_taps.hpp"
-#include "dsp_iir.hpp"
-#include "dsp_iir_config.hpp"
+
+#include "audio_output.hpp"
+#include "spectrum_collector.hpp"
 
 class WidebandFMAudio : public BasebandProcessor {
 public:
-	WidebandFMAudio() {
-		decimator.set_decimation_factor(ChannelDecimator::DecimationFactor::By4);
-	}
+	void execute(const buffer_c8_t& buffer) override;
 
-	void execute(buffer_c8_t buffer) override;
+	void on_message(const Message* const message) override;
 
 private:
-	ChannelDecimator decimator;
+	std::array<complex16_t, 512> dst;
+	const buffer_c16_t dst_buffer {
+		dst.data(),
+		dst.size()
+	};
+	const buffer_s16_t work_audio_buffer {
+		(int16_t*)dst.data(),
+		sizeof(dst) / sizeof(int16_t)
+	};
 
-	dsp::demodulate::FM demod { 768000, 75000 };
+	dsp::decimate::FIRC8xR16x24FS4Decim4 decim_0;
+	dsp::decimate::FIRC16xR16x16Decim2 decim_1;
+	uint32_t channel_filter_pass_f = 0;
+	uint32_t channel_filter_stop_f = 0;
+
+	dsp::demodulate::FM demod;
 	dsp::decimate::DecimateBy2CIC4Real audio_dec_1;
 	dsp::decimate::DecimateBy2CIC4Real audio_dec_2;
-	dsp::decimate::DecimateBy2CIC4Real audio_dec_3;
-	const fir_taps_real<64>& audio_filter_taps = taps_64_lp_156_198;
-	dsp::decimate::FIR64AndDecimateBy2Real audio_filter { audio_filter_taps.taps };
+	dsp::decimate::FIR64AndDecimateBy2Real audio_filter;
 
-	IIRBiquadFilter audio_hpf { audio_hpf_config };
+	AudioOutput audio_output;
+
+	SpectrumCollector channel_spectrum;
+	size_t spectrum_interval_samples = 0;
+	size_t spectrum_samples = 0;
+
+	bool configured { false };
+	void configure(const WFMConfigureMessage& message);
 };
 
 #endif/*__PROC_WFM_AUDIO_H__*/