Opening up channelizer to have different sampling rates out. This first pass produces...

[debian/gnuradio] / gnuradio-core / src / lib / filter / gr_pfb_channelizer_ccf.cc

diff --git a/gnuradio-core/src/lib/filter/gr_pfb_channelizer_ccf.cc b/gnuradio-core/src/lib/filter/gr_pfb_channelizer_ccf.cc
index 7e34551c8ed4ce8e62ed4f85f4d33ddb28dad349..4ba073efd2b01950129eac3c2d7c2853daf035d7 100644 (file)
--- a/gnuradio-core/src/lib/filter/gr_pfb_channelizer_ccf.cc
+++ b/gnuradio-core/src/lib/filter/gr_pfb_channelizer_ccf.cc
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2009 Free Software Foundation, Inc.
+ * Copyright 2009,2010 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -33,18 +33,21 @@
 #include <cstring>
 
 gr_pfb_channelizer_ccf_sptr gr_make_pfb_channelizer_ccf (unsigned int numchans, 
-                                                        const std::vector<float> &taps)
+                                                        const std::vector<float> &taps,
+                                                        float oversample_rate)
 {
-  return gr_pfb_channelizer_ccf_sptr (new gr_pfb_channelizer_ccf (numchans, taps));
+  return gr_pfb_channelizer_ccf_sptr (new gr_pfb_channelizer_ccf (numchans, taps,
+                                                                 oversample_rate));
 }
 
 
 gr_pfb_channelizer_ccf::gr_pfb_channelizer_ccf (unsigned int numchans, 
-                                     const std::vector<float> &taps)
+                                               const std::vector<float> &taps,
+                                               float oversample_rate)
   : gr_sync_block ("pfb_channelizer_ccf",
                   gr_make_io_signature (numchans, numchans, sizeof(gr_complex)),
                   gr_make_io_signature (1, 1, numchans*sizeof(gr_complex))),
-    d_updated (false)
+    d_updated (false), d_oversample_rate(oversample_rate)
 {
   d_numchans = numchans;
   d_filters = std::vector<gr_fir_ccf*>(d_numchans);
@@ -133,7 +136,39 @@ gr_pfb_channelizer_ccf::work (int noutput_items,
     return 0;               // history requirements may have changed.
   }
 
-  for(int i = 0; i < noutput_items; i++) {
+  int M = d_oversample_rate;
+  int N = d_numchans;
+  int r = N / M;
+
+  int n=0, i=0, j=0;
+  
+  printf("\nnoutput_items = %d\n", noutput_items);
+  printf("N = %d   M  = %d   r = %d\n", N, M, r);
+
+  //for(int n = 1; n < noutput_items; n++) {
+  while(n < noutput_items) {
+    j = 0;
+    i = (i + r - 1) % N;
+    //printf("i = %d   i >= 0   n = %d\n", i, n);
+    while(i >= 0) {
+      in = (gr_complex*)input_items[j];
+      d_fft->get_inbuf()[i] = d_filters[i]->filter(&in[n]);
+      j++;
+      i--;
+    }
+
+    i = N;
+    //printf("i = %d   r = %d   i >= r\n", i, r);
+    while(i > r) {
+      i--;
+      in = (gr_complex*)input_items[j];
+      d_fft->get_inbuf()[i] = d_filters[i]->filter(&in[n-1]);
+      j++;
+    }
+
+    n += (i+r) >= N;
+
+    /*
     // Move through filters from bottom to top
     for(int j = d_numchans-1; j >= 0; j--) {
       // Take in the items from the first input stream to d_numchans
@@ -142,10 +177,12 @@ gr_pfb_channelizer_ccf::work (int noutput_items,
       // Filter current input stream from bottom filter to top
       d_fft->get_inbuf()[j] = d_filters[j]->filter(&in[i]);
     }
+    */
 
     // despin through FFT
     d_fft->execute();
-    memcpy(&out[d_numchans*i], d_fft->get_outbuf(), d_numchans*sizeof(gr_complex));
+    memcpy(&out[d_numchans*n], d_fft->get_outbuf(), d_numchans*sizeof(gr_complex));
+    //memcpy(&out[d_numchans*i], d_fft->get_outbuf(), d_numchans*sizeof(gr_complex));
   }
   
   return noutput_items;