diff options
| author | Tom Rondeau | 2012-01-01 10:59:20 -0500 |
|---|---|---|
| committer | Tom Rondeau | 2012-01-01 10:59:20 -0500 |
| commit | b53f0dfb6bbd0d2c0233ba3ee192a551b111d907 (patch) | |
| tree | 93005effde15ead7225fe0a549795f5a45287eb4 /gnuradio-core/src | |
| parent | 8bbb1388a1fd3519abe37514fceafaaf62844739 (diff) | |
| download | gnuradio-b53f0dfb6bbd0d2c0233ba3ee192a551b111d907.tar.gz gnuradio-b53f0dfb6bbd0d2c0233ba3ee192a551b111d907.tar.bz2 gnuradio-b53f0dfb6bbd0d2c0233ba3ee192a551b111d907.zip | |
pfb: bug fix for ccf version of the PFB clock sync to handle the d_osps parameter better.
The number of output items is now set based on the d_osps and the check in the work function is not needed (actually, that check was wrong and should never have worked correctly, anyway).
This commit also changes the number of samples needed in the QA code for the constellation receiver for a faster test.
Diffstat (limited to 'gnuradio-core/src')
| -rw-r--r-- | gnuradio-core/src/lib/filter/gr_pfb_clock_sync_ccf.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/gnuradio-core/src/lib/filter/gr_pfb_clock_sync_ccf.cc b/gnuradio-core/src/lib/filter/gr_pfb_clock_sync_ccf.cc index 633c5be07..398956ddd 100644 --- a/gnuradio-core/src/lib/filter/gr_pfb_clock_sync_ccf.cc +++ b/gnuradio-core/src/lib/filter/gr_pfb_clock_sync_ccf.cc @@ -244,6 +244,9 @@ gr_pfb_clock_sync_ccf::set_taps (const std::vector<float> &newtaps, // Set the history to ensure enough input items for each filter set_history (d_taps_per_filter + d_sps); + // Make sure there is enough output space for d_osps outputs/input. + set_output_multiple(d_osps); + d_updated = true; } @@ -376,7 +379,7 @@ gr_pfb_clock_sync_ccf::general_work (int noutput_items, float error_r, error_i; // produce output as long as we can and there are enough input samples - while((i < noutput_items-d_osps) && (count < nrequired)) { + while((i < noutput_items) && (count < nrequired)) { for(int k = 0; k < d_osps; k++) { d_filtnum = (int)floor(d_k); |