diff options
| author | Tom Rondeau <tom@trondeau.com> | 2016-01-25 09:07:16 -0500 |
|---|---|---|
| committer | Tom Rondeau <tom@trondeau.com> | 2016-01-28 06:22:06 -0500 |
| commit | 33f10e2d04a61ca361f412fb66a1a93a5067fe87 (patch) | |
| tree | 75ad2bf244f81767eda46085abb6fdd8ccb38abd | |
| parent | f02fb8b0af27ec26092fd7f174382d286a85b173 (diff) | |
filter: Uses last commit to make a better fix for issue #882.
Since we can get max_noutput_items in start(), we can preallocate the
FFT filter's buffer (d_tmp) in start() and destroy it in stop().
| -rw-r--r-- | gr-filter/lib/pfb_decimator_ccf_impl.cc | 32 | ||||
| -rw-r--r-- | gr-filter/lib/pfb_decimator_ccf_impl.h | 6 |
2 files changed, 29 insertions, 9 deletions
diff --git a/gr-filter/lib/pfb_decimator_ccf_impl.cc b/gr-filter/lib/pfb_decimator_ccf_impl.cc index e282b484fd..9d1d6f6139 100644 --- a/gr-filter/lib/pfb_decimator_ccf_impl.cc +++ b/gr-filter/lib/pfb_decimator_ccf_impl.cc @@ -73,6 +73,26 @@ namespace gr { else { set_history(d_taps_per_filter); } + + d_tmp = NULL; + } + + bool pfb_decimator_ccf_impl::start() + { + if(d_use_fft_filters) { + d_tmp = fft::malloc_complex(max_noutput_items()*d_rate); + } + + return block::start(); + } + + bool pfb_decimator_ccf_impl::stop() + { + if((d_use_fft_filters) && (d_tmp)) { + fft::free(d_tmp); + } + + return block::stop(); } pfb_decimator_ccf_impl::~pfb_decimator_ccf_impl() @@ -198,14 +218,13 @@ namespace gr { gr_complex *out = (gr_complex *)output_items[0]; int i; - gr_complex *tmp = fft::malloc_complex(noutput_items*d_rate); // Filter each input stream by the FFT filters; do all // noutput_items at once to avoid repeated calls to the FFT // setup and operation. for(unsigned int j = 0; j < d_rate; j++) { in = (gr_complex*)input_items[d_rate-j-1]; - d_fft_filters[j]->filter(noutput_items, in, &(tmp[j*noutput_items])); + d_fft_filters[j]->filter(noutput_items, in, &(d_tmp[j*noutput_items])); } // Rotate and add filter outputs (k=channel number; M=number of @@ -214,11 +233,10 @@ namespace gr { for(i = 0; i < noutput_items; i++) { out[i] = 0; for(unsigned int j = 0; j < d_rate; j++) { - out[i] += tmp[j*noutput_items+i]*d_rotator[j]; + out[i] += d_tmp[j*noutput_items+i]*d_rotator[j]; } } - fft::free(tmp); return noutput_items; } @@ -231,18 +249,17 @@ namespace gr { gr_complex *out = (gr_complex *)output_items[0]; int i; - gr_complex *tmp = fft::malloc_complex(noutput_items*d_rate); for(unsigned int j = 0; j < d_rate; j++) { in = (gr_complex*)input_items[d_rate-j-1]; - d_fft_filters[j]->filter(noutput_items, in, &tmp[j*noutput_items]); + d_fft_filters[j]->filter(noutput_items, in, &d_tmp[j*noutput_items]); } // Performs the rotate and add operations by implementing it as // an FFT. for(i = 0; i < noutput_items; i++) { for(unsigned int j = 0; j < d_rate; j++) { - d_fft->get_inbuf()[j] = tmp[j*noutput_items + i]; + d_fft->get_inbuf()[j] = d_tmp[j*noutput_items + i]; } // Perform the FFT to do the complex multiply despinning for all channels @@ -252,7 +269,6 @@ namespace gr { out[i] = d_fft->get_outbuf()[d_chan]; } - fft::free(tmp); return noutput_items; } diff --git a/gr-filter/lib/pfb_decimator_ccf_impl.h b/gr-filter/lib/pfb_decimator_ccf_impl.h index 3397701cf9..5e0b70177d 100644 --- a/gr-filter/lib/pfb_decimator_ccf_impl.h +++ b/gr-filter/lib/pfb_decimator_ccf_impl.h @@ -40,6 +40,7 @@ namespace gr { bool d_use_fft_rotator; bool d_use_fft_filters; gr_complex *d_rotator; + gr_complex *d_tmp; // used for fft filters gr::thread::mutex d_mutex; // mutex to protect set/work access inline int work_fir_exp(int noutput_items, @@ -55,7 +56,6 @@ namespace gr { gr_vector_const_void_star &input_items, gr_vector_void_star &output_items); - public: pfb_decimator_ccf_impl(unsigned int decim, const std::vector<float> &taps, @@ -70,6 +70,10 @@ namespace gr { std::vector<std::vector<float> > taps() const; void set_channel(const unsigned int channel); + // Overload to create/destroy d_tmp based on max_noutput_items. + bool start(); + bool stop(); + int work(int noutput_items, gr_vector_const_void_star &input_items, gr_vector_void_star &output_items); |