comicsansg/CubicSDR
comicsansg/CubicSDR
1
0
Fork 0
mirror of https://github.com/cjcliffe/CubicSDR.git synced 2024-11-04 16:31:15 -05:00
Code Issues Projects Releases Wiki Activity

Proper demodulator resamp and filter reinit

Browse Source
This commit is contained in:
Charles J. Cliffe 2014-11-26 22:29:23 -05:00
parent ddbc08a4ff
commit 65a5dbb24d
2 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/demod/DemodulatorThread.cpp
View File

@ -3,7 +3,11 @@
#include <vector> #include <vector>
DemodulatorThread::DemodulatorThread(DemodulatorThreadInputQueue* pQueue) : DemodulatorThread::DemodulatorThread(DemodulatorThreadInputQueue* pQueue) :
inputQueue(pQueue), visOutQueue(NULL), terminated(false), initialized(false), audio_resampler(NULL), audio_resample_ratio(1) { inputQueue(pQueue), visOutQueue(NULL), terminated(false), initialized(false), audio_resampler(NULL), resample_ratio(1), audio_resample_ratio(1), resampler(NULL), commandQueue(NULL), fir_filter(NULL) {
float kf = 0.75; // modulation factor
fdem = freqdem_create(kf);
// freqdem_print(fdem);
} }
@ -32,23 +36,30 @@ void DemodulatorThread::initialize() {
float h[h_len]; float h[h_len];
liquid_firdes_kaiser(h_len, fc, As, mu, h); liquid_firdes_kaiser(h_len, fc, As, mu, h);
if (fir_filter) {
firfilt_crcf_recreate(fir_filter, h, h_len);
} else {
fir_filter = firfilt_crcf_create(h, h_len); fir_filter = firfilt_crcf_create(h, h_len);
}
// create multi-stage arbitrary resampler object // create multi-stage arbitrary resampler object
if (resampler) {
msresamp_crcf_destroy(resampler);
}
resampler = msresamp_crcf_create(resample_ratio, As); resampler = msresamp_crcf_create(resample_ratio, As);
// msresamp_crcf_print(resampler); // msresamp_crcf_print(resampler);
if (audio_resampler) {
msresamp_crcf_destroy(audio_resampler);
}
audio_resampler = msresamp_crcf_create(audio_resample_ratio, As); audio_resampler = msresamp_crcf_create(audio_resample_ratio, As);
// msresamp_crcf_print(audio_resampler); // msresamp_crcf_print(audio_resampler);
float kf = 0.75; // modulation factor
fdem = freqdem_create(kf);
// freqdem_print(fdem);
initialized = true; initialized = true;
std::cout << "inputResampleRate " << params.bandwidth << std::endl; // std::cout << "inputResampleRate " << params.bandwidth << std::endl;
last_params = params;
} }
DemodulatorThread::~DemodulatorThread() { DemodulatorThread::~DemodulatorThread() {

2
src/demod/DemodulatorThread.h
View File

@ -146,6 +146,8 @@ protected:
float audio_resample_ratio; float audio_resample_ratio;
DemodulatorThreadParameters params; DemodulatorThreadParameters params;
DemodulatorThreadParameters last_params;
freqdem fdem; freqdem fdem;
std::atomic<bool> terminated; std::atomic<bool> terminated;