VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-05-28 21:12:26 -04:00
Code Issues Projects Releases Wiki Activity

WDSP: impulse responses refactoring (3)

Browse Source
This commit is contained in:
f4exb 2024-08-10 02:06:19 +02:00
parent 7319e4cb88
commit 28cfad98ff
4 changed files with 17 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wdsp/fcurve.cpp
View File

@ -149,7 +149,7 @@ void FCurve::fc_impulse (std::vector<float>& impulse, int nc, float f0, float f1
} }
// generate mask for Overlap-Save Filter // generate mask for Overlap-Save Filter
float* FCurve::fc_mults (std::vector<float>& mults, int size, float f0, float f1, float g0, float g1, int curve, float samplerate, float scale, int ctfmode, int wintype) void FCurve::fc_mults (std::vector<float>& mults, int size, float f0, float f1, float g0, float g1, int curve, float samplerate, float scale, int ctfmode, int wintype)
{ {
std::vector<float> impulse(2 * (size + 1)); std::vector<float> impulse(2 * (size + 1));
fc_impulse (impulse, size + 1, f0, f1, g0, g1, curve, samplerate, scale, ctfmode, wintype); fc_impulse (impulse, size + 1, f0, f1, g0, g1, curve, samplerate, scale, ctfmode, wintype);

2
wdsp/fcurve.hpp
View File

@ -38,7 +38,7 @@ class WDSP_API FCurve
{ {
public: public:
static void fc_impulse (std::vector<float>& impulse, int nc, float f0, float f1, float g0, float g1, int curve, float samplerate, float scale, int ctfmode, int wintype); static void fc_impulse (std::vector<float>& impulse, int nc, float f0, float f1, float g0, float g1, int curve, float samplerate, float scale, int ctfmode, int wintype);
static float* fc_mults (std::vector<float>& mults, int size, float f0, float f1, float g0, float g1, int curve, float samplerate, float scale, int ctfmode, int wintype); static void fc_mults (std::vector<float>& mults, int size, float f0, float f1, float g0, float g1, int curve, float samplerate, float scale, int ctfmode, int wintype);
}; };
} // namespace WDSP } // namespace WDSP

28
wdsp/fir.cpp
View File

@ -53,11 +53,11 @@ void FIR::fftcv_mults (std::vector<float>& mults, int NM, float* c_impulse)
fftwf_destroy_plan (ptmp); fftwf_destroy_plan (ptmp);
} }
float* FIR::get_fsamp_window(int N, int wintype) void FIR::get_fsamp_window(std::vector<float>& window, int N, int wintype)
{ {
double arg0; double arg0;
double arg1; double arg1;
auto window = new float[N]; window.resize(N);
switch (wintype) switch (wintype)
{ {
case 0: case 0:
@ -91,7 +91,6 @@ float* FIR::get_fsamp_window(int N, int wintype)
for (int i = 0; i < N; i++) for (int i = 0; i < N; i++)
window[i] = 1.0; window[i] = 1.0;
} }
return window;
} }
void FIR::fir_fsamp_odd (std::vector<float>& c_impulse, int N, const float* A, int rtype, double scale, int wintype) void FIR::fir_fsamp_odd (std::vector<float>& c_impulse, int N, const float* A, int rtype, double scale, int wintype)
@ -122,7 +121,8 @@ void FIR::fir_fsamp_odd (std::vector<float>& c_impulse, int N, const float* A, i
} }
fftwf_execute (ptmp); fftwf_execute (ptmp);
fftwf_destroy_plan (ptmp); fftwf_destroy_plan (ptmp);
float* window = get_fsamp_window(N, wintype); std::vector<float> window;
get_fsamp_window(window, N, wintype);
switch (rtype) switch (rtype)
{ {
case 0: case 0:
@ -139,7 +139,6 @@ void FIR::fir_fsamp_odd (std::vector<float>& c_impulse, int N, const float* A, i
default: default:
break; break;
} }
delete[] window;
} }
void FIR::fir_fsamp (std::vector<float>& c_impulse, int N, const float* A, int rtype, double scale, int wintype) void FIR::fir_fsamp (std::vector<float>& c_impulse, int N, const float* A, int rtype, double scale, int wintype)
@ -180,7 +179,8 @@ void FIR::fir_fsamp (std::vector<float>& c_impulse, int N, const float* A, int r
c_impulse[2 * n + 1] = 0.0; c_impulse[2 * n + 1] = 0.0;
} }
} }
float* window = get_fsamp_window (N, wintype); std::vector<float> window;
get_fsamp_window (window, N, wintype);
switch (rtype) switch (rtype)
{ {
case 0: case 0:
@ -197,7 +197,6 @@ void FIR::fir_fsamp (std::vector<float>& c_impulse, int N, const float* A, int r
default: default:
break; break;
} }
delete[] window;
} }
float* FIR::fir_bandpass (int N, double f_low, double f_high, double samplerate, int wintype, int rtype, double scale) float* FIR::fir_bandpass (int N, double f_low, double f_high, double samplerate, int wintype, int rtype, double scale)
@ -277,7 +276,7 @@ float* FIR::fir_bandpass (int N, double f_low, double f_high, double samplerate,
return c_impulse; return c_impulse;
} }
float *FIR::fir_read (int N, const char *filename, int rtype, float scale) void FIR::fir_read (std::vector<float>& c_impulse, int N, const char *filename, int rtype, float scale)
// N = number of real or complex coefficients (see rtype) // N = number of real or complex coefficients (see rtype)
// *filename = filename // *filename = filename
// rtype = 0: real coefficients // rtype = 0: real coefficients
@ -289,12 +288,12 @@ float *FIR::fir_read (int N, const char *filename, int rtype, float scale)
FILE *file; FILE *file;
float I; float I;
float Q; float Q;
auto c_impulse = new float[N * 2]; c_impulse.resize(N * 2);
std::fill(c_impulse, c_impulse + N*2, 0); std::fill(c_impulse.begin(), c_impulse.end(), 0);
file = fopen (filename, "r"); file = fopen (filename, "r");
if (!file) { if (!file) {
return c_impulse; return;
} }
for (int i = 0; i < N; i++) for (int i = 0; i < N; i++)
@ -325,7 +324,6 @@ float *FIR::fir_read (int N, const char *filename, int rtype, float scale)
} }
} }
fclose (file); fclose (file);
return c_impulse;
} }
void FIR::analytic (int N, float* in, float* out) void FIR::analytic (int N, float* in, float* out)
@ -430,7 +428,7 @@ void FIR::mp_imp (int N, std::vector<float>& fir, std::vector<float>& mpfir, int
// impulse response of a zero frequency filter comprising a cascade of two resonators, // impulse response of a zero frequency filter comprising a cascade of two resonators,
// each followed by a detrending filter // each followed by a detrending filter
float* FIR::zff_impulse(int nc, float scale) void FIR::zff_impulse(std::vector<float>& c_dresdet, int nc, float scale)
{ {
// nc = number of coefficients (power of two) // nc = number of coefficients (power of two)
int n_resdet = nc / 2 - 1; // size of single zero-frequency resonator with detrender int n_resdet = nc / 2 - 1; // size of single zero-frequency resonator with detrender
@ -444,7 +442,7 @@ float* FIR::zff_impulse(int nc, float scale)
// allocate the float and complex versions and make the values // allocate the float and complex versions and make the values
std::vector<float> dresdet(n_dresdet); std::vector<float> dresdet(n_dresdet);
auto div = (float) ((nc / 2 + 1) * (nc / 2 + 1)); // calculate divisor auto div = (float) ((nc / 2 + 1) * (nc / 2 + 1)); // calculate divisor
auto c_dresdet = new float[nc * 2]; c_dresdet.resize(nc * 2);
for (int n = 0; n < n_dresdet; n++) // convolve to make the cascade for (int n = 0; n < n_dresdet; n++) // convolve to make the cascade
{ {
for (int k = 0; k < n_resdet; k++) for (int k = 0; k < n_resdet; k++)
@ -454,8 +452,6 @@ float* FIR::zff_impulse(int nc, float scale)
c_dresdet[2 * n + 0] = dresdet[n] * scale; c_dresdet[2 * n + 0] = dresdet[n] * scale;
c_dresdet[2 * n + 1] = 0.0; c_dresdet[2 * n + 1] = 0.0;
} }
return c_dresdet;
} }
} // namespace WDSP } // namespace WDSP

6
wdsp/fir.hpp
View File

@ -44,9 +44,9 @@ public:
private: private:
static void analytic (int N, float* in, float* out); static void analytic (int N, float* in, float* out);
static float* get_fsamp_window(int N, int wintype); static void get_fsamp_window(std::vector<float>& window, int N, int wintype);
static float *fir_read (int N, const char *filename, int rtype, float scale); static void fir_read (std::vector<float>& impulse, int N, const char *filename, int rtype, float scale);
static float* zff_impulse(int nc, float scale); static void zff_impulse(std::vector<float>& impulse, int nc, float scale);
}; };
#endif #endif