Changeset 8329

Timestamp:

05/08/08 19:44:41

Author:

jcorgan

Message:

Applied relevant portion of changeset r8244 on trunk to release branch. Refactors FFT blocks, no user visible changes.

Files:

• gnuradio/branches/releases/3.1/gnuradio-core/src/lib/general/Makefile.am (modified) (2 diffs)
• gnuradio/branches/releases/3.1/gnuradio-core/src/lib/general/gr_fft_vcc.cc (modified) (4 diffs)
• gnuradio/branches/releases/3.1/gnuradio-core/src/lib/general/gr_fft_vcc.h (modified) (2 diffs)
• gnuradio/branches/releases/3.1/gnuradio-core/src/lib/general/gr_fft_vcc.i (modified) (2 diffs)
• gnuradio/branches/releases/3.1/gnuradio-core/src/lib/general/gr_fft_vcc_fftw.cc (copied) (copied from gnuradio/trunk/gnuradio-core/src/lib/general/gr_fft_vcc_fftw.cc)
• gnuradio/branches/releases/3.1/gnuradio-core/src/lib/general/gr_fft_vcc_fftw.h (copied) (copied from gnuradio/trunk/gnuradio-core/src/lib/general/gr_fft_vcc_fftw.h)
• gnuradio/branches/releases/3.1/gnuradio-core/src/lib/general/gr_math.h (modified) (1 diff)
• gnuradio/branches/releases/3.1/gnuradio-core/src/python/gnuradio/gr/Makefile.am (modified) (1 diff)
• gnuradio/branches/releases/3.1/gnuradio-core/src/python/gnuradio/gr/qa_fft.py (copied) (copied from gnuradio/trunk/gnuradio-core/src/python/gnuradio/gr/qa_fft.py)

gnuradio/branches/releases/3.1/gnuradio-core/src/lib/general/Makefile.am

@@ -71 +71 @@
-        gr_feval.cc                     \
-        gr_fft_vcc.cc                   \
+        gr_fft_vcc_fftw.cc              \
-        gr_fft_vfc.cc                   \
-        gr_firdes.cc                    \
@@ -202 +203 @@
-        gr_feval.h                      \
-        gr_fft_vcc.h                    \
+        gr_fft_vcc_fftw.h               \
-        gr_fft_vfc.h                    \
-        gr_firdes.h                     \

gnuradio/branches/releases/3.1/gnuradio-core/src/lib/general/gr_fft_vcc.cc

@@ -1 +1 @@
-/* -*- c++ -*- */
-/*
-
+,2008
- * 
- * This file is part of GNU Radio
@@ -25 +25 @@
-#endif
-
-
+
+
-#include <gr_io_signature.h>
-#include <gri_fft.h>
@@ -31 +32 @@
-
-gr_fft_vcc_sptr
-
+&
-{
-fft_vcc_sptr (new gr_fft_vcc (fft_size, forward, window, shift)
+make_fft_vcc_fftw(fft_size, forward, window, shift
-}
-
-
-
+
+
+
+
-                   gr_make_io_signature (1, 1, fft_size * sizeof (gr_complex)),
-                   gr_make_io_signature (1, 1, fft_size * sizeof (gr_complex))),
-    d_fft_size(fft_size), d_forward(forward), d_shift(shift)
-{
-  d_fft = new gri_fft_complex (d_fft_size, forward);
-
-  set_window(window);
-
-}
-
-gr_fft_vcc::~gr_fft_vcc ()
-{
-  delete d_fft;
-}
-
-int
-gr_fft_vcc::work (int noutput_items,
-                  gr_vector_const_void_star &input_items,
-                  gr_vector_void_star &output_items)
-{
-  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();
-      for (unsigned int i = 0; i < d_fft_size; i++)             // apply window
-        dst[i] = in[i] * d_window[i];
-    }
-    else {
-      if(!d_forward && d_shift) {  // apply an ifft shift on the data
-        gr_complex *dst = d_fft->get_inbuf();
-        unsigned int len = (unsigned int)(floor(d_fft_size/2.0)); // half length of complex array
-        memcpy(&dst[0], &in[len], sizeof(gr_complex)*(d_fft_size - len));
-        memcpy(&dst[d_fft_size - len], &in[0], sizeof(gr_complex)*len);
-      }
-      else {
-        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));
-      memcpy(&out[0], &d_fft->get_outbuf()[len], sizeof(gr_complex)*(d_fft_size - len));
-      memcpy(&out[d_fft_size - len], &d_fft->get_outbuf()[0], sizeof(gr_complex)*len);
-    }
-    else {
-      memcpy (out, d_fft->get_outbuf (), output_data_size);
-    }
-    
-    in  += d_fft_size;
-    out += d_fft_size;
-  }
-  
-  return noutput_items;
-}
-
-bool 
-
+&
-{
-  if(window.size()==0 || window.size()==d_fft_size) {
@@ -117 +62 @@
-    return false;
-}
-
-/*
-fftshift
-
-  for(i=0; i < ceil(d_occupied_carriers/2.0); i++) {
-    unsigned int k=ceil(d_occupied_carriers/2.0);
-    out[i] = gr_complex(-1+2*in[i+k],0);
-  }
-  for(; i < d_vlen - ceil(d_occupied_carriers/2.0); i++) {
-    out[i]=gr_complex(0,0);
-  }
-  for(unsigned int j=0;i<d_vlen;i++,j++) {
-    out[i]= gr_complex((-1+2*in[j]),0);
-  }
-*/

gnuradio/branches/releases/3.1/gnuradio-core/src/lib/general/gr_fft_vcc.h

@@ -1 +1 @@
-/* -*- c++ -*- */
-/*
-
+,2008
- * 
- * This file is part of GNU Radio
@@ -26 +26 @@
-#include <gr_sync_block.h>
-
-class gri_fft_complex;
-
-class gr_fft_vcc;
-typedef boost::shared_ptr<gr_fft_vcc> gr_fft_vcc_sptr;
-
-gr_fft_vcc_sptr
-
+&
-
-/*!
- * \brief Compute forward or reverse FFT.  complex vector in / complex vector out.
- * \ingroup dft
+ *
+ * Abstract base class
- */
-
-class gr_fft_vcc : public gr_sync_block
-{
+protected:
-  friend gr_fft_vcc_sptr
-
+&
-
-
+    
-  std::vector<float>   d_window;
-  gri_fft_complex *d_fft;
-  bool d_forward;
-  bool d_shift;
-
-
+
+
-
- public:
-  ~gr_fft_vcc ();
-
-
-
-
-
+
-};
-
-
-#endif /* INCLUDED_GR_FFT_VCC_H */

gnuradio/branches/releases/3.1/gnuradio-core/src/lib/general/gr_fft_vcc.i

@@ -1 +1 @@
-/* -*- c++ -*- */
-/*
-
+,2008
- * 
- * This file is part of GNU Radio
@@ -29 +29 @@
-{
- protected:
-
+&
-
- public:
-
+&
-};

gnuradio/branches/releases/3.1/gnuradio-core/src/lib/general/gr_math.h

@@ -29 +29 @@
-
-#include <gr_complex.h>
+
+static inline bool
+gr_is_power_of_2(long x)
+{
+  return x != 0 && (x & (x-1)) == 0;
+}
-
-long gr_gcd (long m, long n);

gnuradio/branches/releases/3.1/gnuradio-core/src/python/gnuradio/gr/Makefile.am

@@ -62 +62 @@
-        qa_diff_phasor_cc.py            \
-        qa_feval.py                     \
+        qa_fft.py                       \
-        qa_fft_filter.py                \
-        qa_filter_delay_fc.py           \