summaryrefslogtreecommitdiff
path: root/gnuradio-core/src
diff options
context:
space:
mode:
authorTom Rondeau2011-04-12 22:30:12 -0400
committerTom Rondeau2011-04-12 22:30:12 -0400
commite8ff9ef4bb77517428e1208ff4b3551a38107bbd (patch)
tree7be961971b2dfdd52f8ebd4397662c25a60451d7 /gnuradio-core/src
parent117bf31ca76a2751f7e9dfd06860211b7fc14205 (diff)
parentb7f8d86f0e0f022ad44fc5293ffc4cb52c85de20 (diff)
downloadgnuradio-e8ff9ef4bb77517428e1208ff4b3551a38107bbd.tar.gz
gnuradio-e8ff9ef4bb77517428e1208ff4b3551a38107bbd.tar.bz2
gnuradio-e8ff9ef4bb77517428e1208ff4b3551a38107bbd.zip
Merge branch 'master' of gnuradio.org:gnuradio into qtgui2
Diffstat (limited to 'gnuradio-core/src')
-rw-r--r--gnuradio-core/src/lib/general/gr_clock_recovery_mm_cc.cc6
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,