filter: fixed FIR filter taps and added complex FFT filter.

5 files changed, 268 insertions, 1 deletions

diff --git a/gr-filter/include/filter/CMakeLists.txt b/gr-filter/include/filter/CMakeLists.txt
index 4889312da..f96128805 100644
--- a/gr-filter/include/filter/CMakeLists.txt
+++ b/gr-filter/include/filter/CMakeLists.txt
@@ -76,7 +76,9 @@ add_custom_target(filter_generated_includes DEPENDS
 install(FILES
     api.h
     fir_filter.h
+    fft_filter.h
     ${generated_includes}
+    fft_filter_ccc.h
     DESTINATION ${GR_INCLUDE_DIR}/gnuradio/filter
     COMPONENT "fft_devel"
 )
diff --git a/gr-filter/include/filter/fft_filter.h b/gr-filter/include/filter/fft_filter.h
new file mode 100644
index 000000000..fccea595f
--- /dev/null
+++ b/gr-filter/include/filter/fft_filter.h
@@ -0,0 +1,105 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2010,2012 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_FILTER_FFT_FILTER_H
+#define INCLUDED_FILTER_FFT_FILTER_H
+
+#include <filter/api.h>
+#include <vector>
+#include <gr_complex.h>
+#include <fft/fft.h>
+
+namespace gr {
+  namespace filter {
+    namespace kernel {
+    
+      /*!
+       * \brief Fast FFT filter with gr_complex input, gr_complex output and gr_complex taps
+       * \ingroup filter_blk
+       */
+      class FILTER_API fft_filter_ccc
+      {
+      private:
+	int			 d_ntaps;
+	int			 d_nsamples;
+	int			 d_fftsize;         // fftsize = ntaps + nsamples - 1
+	int                      d_decimation;
+	fft::fft_complex        *d_fwdfft;	    // forward "plan"
+	fft::fft_complex        *d_invfft;          // inverse "plan"
+	int                      d_nthreads;        // number of FFTW threads to use
+	std::vector<gr_complex>  d_tail;	    // state carried between blocks for overlap-add
+	std::vector<gr_complex>  d_new_taps;
+	gr_complex              *d_xformed_taps;    // Fourier xformed taps
+	
+	void compute_sizes(int ntaps);
+	int tailsize() const { return d_ntaps - 1; }
+
+      public:
+	/*!
+	 * \brief Construct an FFT filter for complex vectors with the given taps and decimation rate.
+	 *
+	 * This is the basic implementation for performing FFT filter for fast convolution
+	 * in other blocks for complex vectors (such as gr_fft_filter_ccc).
+	 *
+	 * \param decimation The decimation rate of the filter (int)
+	 * \param taps       The filter taps (complex)
+	 * \param nthreads   The number of threads for the FFT to use (int)
+	 */
+	fft_filter_ccc(int decimation,
+		       const std::vector<gr_complex> &taps,
+		       int nthreads=1);
+
+	~fft_filter_ccc();
+
+	/*!
+	 * \brief Set new taps for the filter.
+	 *
+	 * Sets new taps and resets the class properties to handle different sizes
+	 * \param taps       The filter taps (complex)
+	 */
+	int set_taps(const std::vector<gr_complex> &taps);
+	
+	/*!
+	 * \brief Set number of threads to use.
+	 */
+	void set_nthreads(int n);
+	
+	/*!
+	 * \brief Get number of threads being used.
+	 */
+	int nthreads() const;
+	
+	/*!
+	 * \brief Perform the filter operation
+	 *
+	 * \param nitems  The number of items to produce
+	 * \param input   The input vector to be filtered
+	 * \param output  The result of the filter operation
+	 */
+	int filter(int nitems, const gr_complex *input, gr_complex *output);
+      };
+
+    } /* namespace impl */
+  } /* namespace filter */
+} /* namespace gr */
+
+#endif /* INCLUDED_FILTER_FFT_FILTER_H */
diff --git a/gr-filter/include/filter/fft_filter_ccc.h b/gr-filter/include/filter/fft_filter_ccc.h
new file mode 100644
index 000000000..a309ffc22
--- /dev/null
+++ b/gr-filter/include/filter/fft_filter_ccc.h
@@ -0,0 +1,67 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2005,2012 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_FILTER_FFT_FILTER_CCC_H
+#define INCLUDED_FILTER_FFT_FILTER_CCC_H
+
+#include <filter/api.h>
+#include <gr_sync_decimator.h>
+
+namespace gr {
+  namespace filter {
+
+    class FILTER_API fft_filter_ccc : virtual public gr_sync_decimator
+    {
+    public:
+      // gr::filter::fft_filter::sptr
+      typedef boost::shared_ptr<fft_filter_ccc> sptr;
+
+      /*!
+       * \brief Fast FFT filter with gr_complex input, gr_complex output and gr_complex taps
+       * \ingroup filter_blk
+       *
+       * \param decimation  >= 1
+       * \param taps        complex filter taps
+       * \param nthreads    number of threads for the FFT to use
+       */
+      static FILTER_API sptr make(int decimation,
+				  const std::vector<gr_complex> &taps,
+				  int nthreads=1);
+
+      virtual void set_taps(const std::vector<gr_complex> &taps) = 0;
+      virtual std::vector<gr_complex> taps() const = 0;
+
+      /*!
+       * \brief Set number of threads to use.
+       */
+      virtual void set_nthreads(int n) = 0;
+
+      /*!
+       * \brief Get number of threads being used.
+       */
+      virtual int nthreads() const = 0;
+    };
+
+  } /* namespace filter */
+} /* namespace gr */
+
+#endif /* INCLUDED_FILTER_FFT_FILTER_CCC_H */
diff --git a/gr-filter/include/filter/fft_filter_fff.h b/gr-filter/include/filter/fft_filter_fff.h
new file mode 100644
index 000000000..309a55135
--- /dev/null
+++ b/gr-filter/include/filter/fft_filter_fff.h
@@ -0,0 +1,88 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2005 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+#ifndef INCLUDED_GR_FFT_FILTER_FFF_H
+#define INCLUDED_GR_FFT_FILTER_FFF_H
+
+#include <gr_core_api.h>
+#include <gr_sync_decimator.h>
+
+class gr_fft_filter_fff;
+typedef boost::shared_ptr<gr_fft_filter_fff> gr_fft_filter_fff_sptr;
+GR_CORE_API gr_fft_filter_fff_sptr
+gr_make_fft_filter_fff (int decimation, const std::vector<float> &taps,
+			int nthreads=1);
+
+class gri_fft_filter_fff_generic;
+//class gri_fft_filter_fff_sse;
+
+/*!
+ * \brief Fast FFT filter with float input, float output and float taps
+ * \ingroup filter_blk
+ */
+class GR_CORE_API gr_fft_filter_fff : public gr_sync_decimator
+{
+ private:
+  friend GR_CORE_API gr_fft_filter_fff_sptr
+    gr_make_fft_filter_fff (int decimation, const std::vector<float> &taps,
+			    int nthreads);
+
+  int			   d_nsamples;
+  bool			   d_updated;
+#if 1 // don't enable the sse version until handling it is worked out
+  gri_fft_filter_fff_generic  *d_filter;
+#else
+  gri_fft_filter_fff_sse  *d_filter;
+#endif
+  std::vector<float>	   d_new_taps;
+
+  /*!
+   * Construct a FFT filter with the given taps
+   *
+   * \param decimation	>= 1
+   * \param taps        float filter taps
+   * \param nthreads    number of threads for the FFT to use
+   */
+  gr_fft_filter_fff (int decimation, const std::vector<float> &taps,
+		     int nthreads=1);
+
+ public:
+  ~gr_fft_filter_fff ();
+
+  void set_taps (const std::vector<float> &taps);
+  std::vector<float> taps () const;
+
+  /*!
+   * \brief Set number of threads to use.
+   */
+  void set_nthreads(int n);
+
+  /*!
+   * \brief Get number of threads being used.
+   */
+  int nthreads() const;
+
+  int work (int noutput_items,
+	    gr_vector_const_void_star &input_items,
+	    gr_vector_void_star &output_items);
+};
+
+#endif /* INCLUDED_GR_FFT_FILTER_FFF_H */
diff --git a/gr-filter/include/filter/fir_filter.h b/gr-filter/include/filter/fir_filter.h
index c307fea46..525532fe6 100644
--- a/gr-filter/include/filter/fir_filter.h
+++ b/gr-filter/include/filter/fir_filter.h
@@ -20,13 +20,16 @@
  * Boston, MA 02110-1301, USA.
  */
 
+#ifndef INCLUDED_FILTER_FIR_FILTER_H
+#define INCLUDED_FILTER_FIR_FILTER_H
+
 #include <filter/api.h>
 #include <vector>
 #include <gr_complex.h>
 
 namespace gr {
   namespace filter {
-    namespace impl {
+    namespace kernel {
     
       class FILTER_API fir_filter_fff
       {
@@ -110,3 +113,5 @@ namespace gr {
     } /* namespace impl */
   } /* namespace filter */
 } /* namespace gr */
+
+#endif /* INCLUDED_FILTER_FIR_FILTER_H */