summaryrefslogtreecommitdiff
path: root/gr-fft/lib
diff options
context:
space:
mode:
authorTom Rondeau <tom@trondeau.com>2014-07-07 12:18:00 -0400
committerTom Rondeau <tom@trondeau.com>2014-07-07 12:18:00 -0400
commit597b93798a804cde1783d6d2ab53b348d57c44cd (patch)
treeb65e73bb0de634ff5d209b15971ebdabf369a45c /gr-fft/lib
parent1151e5502ccd440ebd89599cf7e4be4fb5ed8334 (diff)
Removing trailing/extra whitespaces before release.
We should be more careful about letting these into the code in the future. In emacs, we can use (add-hook 'before-save-hook 'delete-trailing-whitespace).
Diffstat (limited to 'gr-fft/lib')
-rw-r--r--gr-fft/lib/ctrlport_probe_psd_impl.cc10
-rw-r--r--gr-fft/lib/fft.cc14
-rw-r--r--gr-fft/lib/fft_vcc_fftw.cc20
-rw-r--r--gr-fft/lib/fft_vcc_fftw.h8
-rw-r--r--gr-fft/lib/fft_vfc_fftw.cc24
-rw-r--r--gr-fft/lib/fft_vfc_fftw.h10
-rw-r--r--gr-fft/lib/goertzel.cc10
-rw-r--r--gr-fft/lib/goertzel_fc_impl.cc12
-rw-r--r--gr-fft/lib/goertzel_fc_impl.h6
-rw-r--r--gr-fft/lib/window.cc6
10 files changed, 60 insertions, 60 deletions
diff --git a/gr-fft/lib/ctrlport_probe_psd_impl.cc b/gr-fft/lib/ctrlport_probe_psd_impl.cc
index b517fa3ac4..a12341e931 100644
--- a/gr-fft/lib/ctrlport_probe_psd_impl.cc
+++ b/gr-fft/lib/ctrlport_probe_psd_impl.cc
@@ -62,7 +62,7 @@ namespace gr {
for(unsigned i = 0; i < ninputs; i++)
ninput_items_required[i] = d_len;
}
-
+
// boost::shared_mutex mutex_buffer;
// mutable boost::mutex mutex_notify;
// boost::condition_variable condition_buffer_ready;
@@ -84,7 +84,7 @@ namespace gr {
std::vector<gr_complex> buf_copy;
buf_copy.resize(d_len);
-
+
gr_complex* out = d_fft.get_outbuf();
for(size_t i=0; i<d_len; i++){
size_t idx = (i + d_len/2)%d_len;
@@ -131,14 +131,14 @@ namespace gr {
for(int i = 0; i < num_copy; i++) {
d_buffer.push_back(in[i]);
}
-
+
// notify the waiting get() if we fill up the buffer
if(d_buffer.size() == d_len) {
condition_buffer_ready.notify_one();
}
}
mutex_buffer.unlock();
-
+
return noutput_items;
}
@@ -152,7 +152,7 @@ namespace gr {
alias(), d_id.c_str(), &ctrlport_probe_psd::get,
pmt::make_c32vector(0,-2),
pmt::make_c32vector(0,2),
- pmt::make_c32vector(0,0),
+ pmt::make_c32vector(0,0),
"dB", d_desc.c_str(), RPC_PRIVLVL_MIN,
DISPXY | DISPOPTSCATTER)));
diff --git a/gr-fft/lib/fft.cc b/gr-fft/lib/fft.cc
index abcda7d30e..18e54f065f 100644
--- a/gr-fft/lib/fft.cc
+++ b/gr-fft/lib/fft.cc
@@ -151,17 +151,17 @@ namespace gr {
d_inbuf = (gr_complex *) fftwf_malloc (sizeof (gr_complex) * inbuf_length ());
if (d_inbuf == 0)
throw std::runtime_error ("fftwf_malloc");
-
+
d_outbuf = (gr_complex *) fftwf_malloc (sizeof (gr_complex) * outbuf_length ());
if (d_outbuf == 0){
fftwf_free (d_inbuf);
throw std::runtime_error ("fftwf_malloc");
}
-
+
d_nthreads = nthreads;
config_threading(nthreads);
import_wisdom(); // load prior wisdom from disk
-
+
d_plan = fftwf_plan_dft_1d (fft_size,
reinterpret_cast<fftwf_complex *>(d_inbuf),
reinterpret_cast<fftwf_complex *>(d_outbuf),
@@ -246,7 +246,7 @@ namespace gr {
{
// Hold global mutex during plan construction and destruction.
planner::scoped_lock lock(planner::mutex());
-
+
fftwf_destroy_plan ((fftwf_plan) d_plan);
fftwf_free (d_inbuf);
fftwf_free (d_outbuf);
@@ -278,7 +278,7 @@ namespace gr {
planner::scoped_lock lock(planner::mutex());
assert (sizeof (fftwf_complex) == sizeof (gr_complex));
-
+
if (fft_size <= 0)
throw std::out_of_range ("gr::fft::fft_real_rev: invalid fft_size");
@@ -316,7 +316,7 @@ namespace gr {
{
// Hold global mutex during plan construction and destruction.
planner::scoped_lock lock(planner::mutex());
-
+
fftwf_destroy_plan ((fftwf_plan) d_plan);
fftwf_free (d_inbuf);
fftwf_free (d_outbuf);
@@ -328,7 +328,7 @@ namespace gr {
if (n <= 0)
throw std::out_of_range ("gr::fft::fft_real_rev::set_nthreads: invalid number of threads");
d_nthreads = n;
-
+
#ifdef FFTW3F_THREADS
fftwf_plan_with_nthreads(d_nthreads);
#endif
diff --git a/gr-fft/lib/fft_vcc_fftw.cc b/gr-fft/lib/fft_vcc_fftw.cc
index 6873e74f45..778042ebf0 100644
--- a/gr-fft/lib/fft_vcc_fftw.cc
+++ b/gr-fft/lib/fft_vcc_fftw.cc
@@ -31,7 +31,7 @@
namespace gr {
namespace fft {
-
+
fft_vcc::sptr fft_vcc::make(int fft_size, bool forward,
const std::vector<float> &window,
bool shift, int nthreads)
@@ -89,14 +89,14 @@ namespace gr {
{
const gr_complex *in = (const gr_complex *) input_items[0];
gr_complex *out = (gr_complex *) output_items[0];
-
+
unsigned int input_data_size = input_signature()->sizeof_stream_item (0);
unsigned int output_data_size = output_signature()->sizeof_stream_item (0);
-
+
int count = 0;
-
+
while(count++ < noutput_items) {
-
+
// copy input into optimally aligned buffer
if(d_window.size()) {
gr_complex *dst = d_fft->get_inbuf();
@@ -107,7 +107,7 @@ namespace gr {
dst[i+fft_m_offset] = in[i] * d_window[i];
for(unsigned int i = offset; i < d_fft_size; i++) // apply window
dst[i-offset] = in[i] * d_window[i];
- }
+ }
else {
for(unsigned int i = 0; i < d_fft_size; i++) // apply window
dst[i] = in[i] * d_window[i];
@@ -124,10 +124,10 @@ namespace gr {
memcpy(d_fft->get_inbuf(), in, input_data_size);
}
}
-
+
// compute the fft
d_fft->execute();
-
+
// copy result to our output
if(d_forward && d_shift) { // apply a fft shift on the data
unsigned int len = (unsigned int)(ceil(d_fft_size/2.0));
@@ -137,11 +137,11 @@ namespace gr {
else {
memcpy (out, d_fft->get_outbuf (), output_data_size);
}
-
+
in += d_fft_size;
out += d_fft_size;
}
-
+
return noutput_items;
}
diff --git a/gr-fft/lib/fft_vcc_fftw.h b/gr-fft/lib/fft_vcc_fftw.h
index 2aa2056f5b..951602031c 100644
--- a/gr-fft/lib/fft_vcc_fftw.h
+++ b/gr-fft/lib/fft_vcc_fftw.h
@@ -28,7 +28,7 @@
namespace gr {
namespace fft {
-
+
class FFT_API fft_vcc_fftw : public fft_vcc
{
private:
@@ -42,13 +42,13 @@ namespace gr {
fft_vcc_fftw(int fft_size, bool forward,
const std::vector<float> &window,
bool shift, int nthreads=1);
-
+
~fft_vcc_fftw();
-
+
void set_nthreads(int n);
int nthreads() const;
bool set_window(const std::vector<float> &window);
-
+
int work(int noutput_items,
gr_vector_const_void_star &input_items,
gr_vector_void_star &output_items);
diff --git a/gr-fft/lib/fft_vfc_fftw.cc b/gr-fft/lib/fft_vfc_fftw.cc
index cb8d223d95..7e327ea916 100644
--- a/gr-fft/lib/fft_vfc_fftw.cc
+++ b/gr-fft/lib/fft_vfc_fftw.cc
@@ -31,7 +31,7 @@
namespace gr {
namespace fft {
-
+
fft_vfc::sptr fft_vfc::make(int fft_size, bool forward,
const std::vector<float> &window,
int nthreads)
@@ -40,7 +40,7 @@ namespace gr {
(fft_size, forward, window,
nthreads));
}
-
+
fft_vfc_fftw::fft_vfc_fftw(int fft_size, bool forward,
const std::vector<float> &window,
int nthreads)
@@ -70,7 +70,7 @@ namespace gr {
{
return d_fft->nthreads();
}
-
+
bool
fft_vfc_fftw::set_window(const std::vector<float> &window)
{
@@ -81,7 +81,7 @@ namespace gr {
else
return false;
}
-
+
int
fft_vfc_fftw::work(int noutput_items,
gr_vector_const_void_star &input_items,
@@ -89,13 +89,13 @@ namespace gr {
{
const float *in = (const float *)input_items[0];
gr_complex *out = (gr_complex *)output_items[0];
-
+
unsigned int output_data_size = output_signature()->sizeof_stream_item (0);
-
+
int count = 0;
-
+
while(count++ < noutput_items) {
-
+
// copy input into optimally aligned buffer
if(d_window.size()) {
gr_complex *dst = d_fft->get_inbuf();
@@ -107,17 +107,17 @@ namespace gr {
for(unsigned int i = 0; i < d_fft_size; i++) // float to complex conversion
dst[i] = in[i];
}
-
+
// compute the fft
d_fft->execute();
-
+
// copy result to output stream
memcpy(out, d_fft->get_outbuf(), output_data_size);
-
+
in += d_fft_size;
out += d_fft_size;
}
-
+
return noutput_items;
}
diff --git a/gr-fft/lib/fft_vfc_fftw.h b/gr-fft/lib/fft_vfc_fftw.h
index 2fe292f8ca..f500129e2e 100644
--- a/gr-fft/lib/fft_vfc_fftw.h
+++ b/gr-fft/lib/fft_vfc_fftw.h
@@ -28,7 +28,7 @@
namespace gr {
namespace fft {
-
+
class FFT_API fft_vfc_fftw : public fft_vfc
{
private:
@@ -36,18 +36,18 @@ namespace gr {
unsigned int d_fft_size;
std::vector<float> d_window;
bool d_forward;
-
+
public:
fft_vfc_fftw(int fft_size, bool forward,
const std::vector<float> &window,
int nthreads=1);
-
+
~fft_vfc_fftw();
-
+
void set_nthreads(int n);
int nthreads() const;
bool set_window(const std::vector<float> &window);
-
+
int work(int noutput_items,
gr_vector_const_void_star &input_items,
gr_vector_void_star &output_items);
diff --git a/gr-fft/lib/goertzel.cc b/gr-fft/lib/goertzel.cc
index ddb086c531..14098180b5 100644
--- a/gr-fft/lib/goertzel.cc
+++ b/gr-fft/lib/goertzel.cc
@@ -34,29 +34,29 @@ namespace gr {
{
set_params(rate, len, freq);
}
-
+
void
goertzel::set_params(int rate, int len, float freq)
{
d_d1 = 0.0;
d_d2 = 0.0;
-
+
float w = 2.0*M_PI*freq/rate;
d_wr = 2.0*std::cos(w);
d_wi = std::sin(w);
d_len = len;
d_processed = 0;
}
-
+
gr_complex
goertzel::batch(float *in)
{
d_d1 = 0.0;
d_d2 = 0.0;
-
+
for(int i = 0; i < d_len; i++)
input(in[i]);
-
+
return output();
}
diff --git a/gr-fft/lib/goertzel_fc_impl.cc b/gr-fft/lib/goertzel_fc_impl.cc
index fd3755eeaa..ba26df0ca3 100644
--- a/gr-fft/lib/goertzel_fc_impl.cc
+++ b/gr-fft/lib/goertzel_fc_impl.cc
@@ -29,12 +29,12 @@
namespace gr {
namespace fft {
-
+
goertzel_fc::sptr goertzel_fc::make(int rate, int len, float freq)
{
return gnuradio::get_initial_sptr(new goertzel_fc_impl(rate, len, freq));
}
-
+
goertzel_fc_impl::goertzel_fc_impl(int rate, int len, float freq)
: sync_decimator("goertzel_fc",
io_signature::make (1, 1, sizeof(float)),
@@ -46,7 +46,7 @@ namespace gr {
d_rate = rate;
d_freq = freq;
}
-
+
goertzel_fc_impl::~goertzel_fc_impl()
{
}
@@ -64,7 +64,7 @@ namespace gr {
d_rate = rate;
d_goertzel.set_params(d_rate, d_len, d_freq);
}
-
+
int
goertzel_fc_impl::work(int noutput_items,
gr_vector_const_void_star &input_items,
@@ -72,12 +72,12 @@ namespace gr {
{
float *in = (float *)input_items[0];
gr_complex *out = (gr_complex *)output_items[0];
-
+
for(int i = 0; i < noutput_items; i++) {
*out++ = d_goertzel.batch(in);
in += d_len;
}
-
+
return noutput_items;
}
diff --git a/gr-fft/lib/goertzel_fc_impl.h b/gr-fft/lib/goertzel_fc_impl.h
index 79b24f15c4..e007bcfb73 100644
--- a/gr-fft/lib/goertzel_fc_impl.h
+++ b/gr-fft/lib/goertzel_fc_impl.h
@@ -28,7 +28,7 @@
namespace gr {
namespace fft {
-
+
class FFT_API goertzel_fc_impl : public goertzel_fc
{
private:
@@ -39,9 +39,9 @@ namespace gr {
public:
goertzel_fc_impl(int rate, int len, float freq);
-
+
~goertzel_fc_impl();
-
+
void set_freq(float freq);
void set_rate(int rate);
diff --git a/gr-fft/lib/window.cc b/gr-fft/lib/window.cc
index 015e2d9943..965b11bf46 100644
--- a/gr-fft/lib/window.cc
+++ b/gr-fft/lib/window.cc
@@ -31,12 +31,12 @@ namespace gr {
namespace fft {
#define IzeroEPSILON 1E-21 /* Max error acceptable in Izero */
-
+
static double Izero(double x)
{
double sum, u, halfx, temp;
int n;
-
+
sum = u = n = 1;
halfx = x/2.0;
do {
@@ -180,7 +180,7 @@ namespace gr {
{
return coswindow(ntaps, 0.21747, 0.45325, 0.28256, 0.04672);
}
-
+
std::vector<float>
window::blackman4(int ntaps)
{
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-26 21:41:51 +0000