From: Tom Rondeau Date: Fri, 9 Apr 2010 04:39:55 +0000 (-0400) Subject: Removing other version of code for different sample rates. X-Git-Url: https://git.gag.com/?p=debian%2Fgnuradio;a=commitdiff_plain;h=520e64c211324ef32dabe66fa492825fe5c3eda1 Removing other version of code for different sample rates. --- 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 e1ab1ffe..5ac5c2a7 100644 --- a/gnuradio-core/src/lib/filter/gr_pfb_channelizer_ccf.cc +++ b/gnuradio-core/src/lib/filter/gr_pfb_channelizer_ccf.cc @@ -137,43 +137,6 @@ gr_pfb_channelizer_ccf::work (int noutput_items, return 0; // history requirements may have changed. } -#if 0 - int M = d_numchans; - int N = d_oversample_rate; - int lastidx = 0, i = 1, k = 0, m = 0, n = 0; - - int *idx = new int[M]; - for(k = 0; k < M; k++) - idx[k] = 0; - - while(i <= noutput_items/N) { - unsigned int x = 0; - unsigned int y = 0; - for(n = N-1; n >= 0; n--) { - for(k = 0; k < M/N; k++) - idx[(lastidx + k) % M]++; - lastidx = (lastidx + M/N) % M; - - x += M/N; - y = M/N; - for(m = 0; m < M; m++) { - in = (gr_complex*)input_items[m]; - - x = (M + x - 1) % M; - y = (M + y - 1) % M; - - d_fft->get_inbuf()[y] = d_filters[x]->filter(&in[idx[m]]); - } - - d_fft->execute(); - memcpy(out, d_fft->get_outbuf(), d_numchans*sizeof(gr_complex)); - out += d_numchans; - } - i++; - } - -#else - int M = d_oversample_rate; int N = d_numchans; int r = N / M; @@ -221,7 +184,5 @@ gr_pfb_channelizer_ccf::work (int noutput_items, delete [] idxlut; -#endif - return noutput_items; }