VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-11-16 05:11:49 -05:00
Code Issues Projects Releases Wiki Activity

FFT filter: removed useless code and some fixes

Browse Source
This commit is contained in:
f4exb 2022-12-13 21:46:34 +01:00
parent 66d4c665c8
commit e070b73104
1 changed files with 8 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
sdrbase/dsp/fftfilt.cpp
View File

@ -159,46 +159,6 @@ void fftfilt::create_filter(float f1, float f2, FFTWindow::Function wf)
} }
} }
void fftfilt::create_filter(const std::vector<std::pair<float, float>>& limits, bool pass)
{
// initialize the filter canvas
std::vector<int> canvas(flen, pass ? 0 : 1);
fftfilt::cmplx* xfilter = new fftfilt::cmplx[flen];
for (const auto& fs : limits)
{
const float& f1 = fs.first + 0.5;
const float& w = fs.second > 0.0 ? fs.second : 0.0;
const float& f2 = f1 + w;
for (int i = 0; i < flen; i++)
{
if (pass) // pass
{
if ((i >= f1*flen) && (i <= f2*flen)) {
canvas[i] = 1;
}
}
else // reject
{
if ((i >= f1*flen) && (i <= f2*flen)) {
canvas[i] = 0;
}
}
}
}
for (int i = 0; i < flen; i++) {
xfilter[i] = cmplx(canvas[i], 0);
}
// Rearrange
std::copy(&xfilter[flen2], &xfilter[flen-1], filter);
std::copy(&xfilter[0], &xfilter[flen2-1], &filter[flen2]);
delete[] xfilter;
}
void fftfilt::create_filter(const std::vector<std::pair<float, float>>& limits, bool pass, FFTWindow::Function wf) void fftfilt::create_filter(const std::vector<std::pair<float, float>>& limits, bool pass, FFTWindow::Function wf)
{ {
std::vector<int> canvasNeg(flen2, pass ? 0 : 1); // initialize the negative frequencies filter canvas std::vector<int> canvasNeg(flen2, pass ? 0 : 1); // initialize the negative frequencies filter canvas
@ -281,6 +241,10 @@ void fftfilt::create_filter(const std::vector<std::pair<float, float>>& limits,
filter[i] -= fsinc(f1, i, flen2); filter[i] -= fsinc(f1, i, flen2);
} }
} }
if (f2 == 0 && f1 != 0) {
filter[flen2 / 2] += 1;
}
} }
for (const auto& indexes : indexesNegList) for (const auto& indexes : indexesNegList)
@ -297,6 +261,10 @@ void fftfilt::create_filter(const std::vector<std::pair<float, float>>& limits,
filterOpp[i] -= fsinc(f1, i, flen2); filterOpp[i] -= fsinc(f1, i, flen2);
} }
} }
if (f2 == 0 && f1 != 0) {
filterOpp[flen2 / 2] += 1;
}
} }
FFTWindow fwin; FFTWindow fwin;