diff options
| author | Tom Rondeau | 2011-05-08 19:58:43 +0100 |
|---|---|---|
| committer | Tom Rondeau | 2011-05-08 19:58:43 +0100 |
| commit | a72bde633dda63c4471111894ca6b92a87318d5f (patch) | |
| tree | c60e447e922b1a7076dd839ed8a94fcc9b665919 /gnuradio-core | |
| parent | bdd0bd405c2ea645395917c1abb91c964210c4d9 (diff) | |
| parent | 207a2ae73bd5d6cab201bb57ed8db64fd54cfd90 (diff) | |
| download | gnuradio-a72bde633dda63c4471111894ca6b92a87318d5f.tar.gz gnuradio-a72bde633dda63c4471111894ca6b92a87318d5f.tar.bz2 gnuradio-a72bde633dda63c4471111894ca6b92a87318d5f.zip | |
Merge branch 'master' into 8psk
Diffstat (limited to 'gnuradio-core')
| -rw-r--r-- | gnuradio-core/src/lib/general/gr_clock_recovery_mm_cc.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/gnuradio-core/src/lib/general/gr_clock_recovery_mm_cc.cc b/gnuradio-core/src/lib/general/gr_clock_recovery_mm_cc.cc index 23bbf821f..7c20f7fd9 100644 --- a/gnuradio-core/src/lib/general/gr_clock_recovery_mm_cc.cc +++ b/gnuradio-core/src/lib/general/gr_clock_recovery_mm_cc.cc @@ -33,7 +33,7 @@ // Public constructor - +static const int FUDGE = 16; gr_clock_recovery_mm_cc_sptr gr_make_clock_recovery_mm_cc(float omega, float gain_omega, float mu, float gain_mu, @@ -78,7 +78,7 @@ gr_clock_recovery_mm_cc::forecast(int noutput_items, gr_vector_int &ninput_items unsigned ninputs = ninput_items_required.size(); for (unsigned i=0; i < ninputs; i++) ninput_items_required[i] = - (int) ceil((noutput_items * d_omega) + d_interp->ntaps()); + (int) ceil((noutput_items * d_omega) + d_interp->ntaps()) + FUDGE; } gr_complex @@ -111,8 +111,6 @@ gr_clock_recovery_mm_cc::slicer_45deg (gr_complex sample) algorithm," Electronics Letters, Vol. 31, no. 13, 22 June 1995, pp. 1032 - 1033. */ -static const int FUDGE = 16; - int gr_clock_recovery_mm_cc::general_work (int noutput_items, gr_vector_int &ninput_items, |