diff options
| author | Thomas Habets <thomas@habets.se> | 2020-08-12 12:14:59 +0100 |
|---|---|---|
| committer | Martin Braun <martin@gnuradio.org> | 2020-08-14 04:08:48 -0700 |
| commit | 8031767b8ad89804a8696ab152d30d9f15110301 (patch) | |
| tree | e88819d8829c3cf5d40f104988e4af6fa3115da2 | |
| parent | 328454fdae0e7693ec9a7829e6d126510837f152 (diff) | |
digital/msk_timing_recovery: Remove manual memory management
| -rw-r--r-- | gr-digital/lib/msk_timing_recovery_cc_impl.cc | 7 | ||||
| -rw-r--r-- | gr-digital/lib/msk_timing_recovery_cc_impl.h | 2 |
2 files changed, 4 insertions, 5 deletions
diff --git a/gr-digital/lib/msk_timing_recovery_cc_impl.cc b/gr-digital/lib/msk_timing_recovery_cc_impl.cc index 567e9b38c1..4167b70807 100644 --- a/gr-digital/lib/msk_timing_recovery_cc_impl.cc +++ b/gr-digital/lib/msk_timing_recovery_cc_impl.cc @@ -38,7 +38,6 @@ msk_timing_recovery_cc_impl::msk_timing_recovery_cc_impl(float sps, gr::io_signature::make3( 1, 3, sizeof(gr_complex), sizeof(float), sizeof(float))), d_limit(limit), - d_interp(new filter::mmse_fir_interpolator_cc()), d_dly_conj_1(0), d_dly_conj_2(0), d_dly_diff_1(0), @@ -53,7 +52,7 @@ msk_timing_recovery_cc_impl::msk_timing_recovery_cc_impl(float sps, throw std::out_of_range("osps must be 1 or 2"); } -msk_timing_recovery_cc_impl::~msk_timing_recovery_cc_impl() { delete d_interp; } +msk_timing_recovery_cc_impl::~msk_timing_recovery_cc_impl() {} void msk_timing_recovery_cc_impl::set_sps(float sps) { @@ -85,7 +84,7 @@ void msk_timing_recovery_cc_impl::forecast(int noutput_items, unsigned ninputs = ninput_items_required.size(); for (unsigned i = 0; i < ninputs; i++) { ninput_items_required[i] = - (int)ceil((noutput_items * d_sps * 2) + 3.0 * d_sps + d_interp->ntaps()); + (int)ceil((noutput_items * d_sps * 2) + 3.0 * d_sps + d_interp.ntaps()); } } @@ -159,7 +158,7 @@ int msk_timing_recovery_cc_impl::general_work(int noutput_items, // the actual equation for the nonlinearity is as follows: // e(n) = in[n]^2 * in[n-sps].conj()^2 // we then differentiate the error by subtracting the sample delayed by d_sps/2 - in_interp = d_interp->interpolate(&in[iidx], d_mu); + in_interp = d_interp.interpolate(&in[iidx], d_mu); sq = in_interp * in_interp; // conjugation is distributive. dly_conj = std::conj(d_dly_conj_2 * d_dly_conj_2); diff --git a/gr-digital/lib/msk_timing_recovery_cc_impl.h b/gr-digital/lib/msk_timing_recovery_cc_impl.h index 2b5222ac3e..7d5058247f 100644 --- a/gr-digital/lib/msk_timing_recovery_cc_impl.h +++ b/gr-digital/lib/msk_timing_recovery_cc_impl.h @@ -25,7 +25,7 @@ private: float d_sps; float d_gain; float d_limit; - filter::mmse_fir_interpolator_cc* d_interp; + filter::mmse_fir_interpolator_cc d_interp; gr_complex d_dly_conj_1, d_dly_conj_2, d_dly_diff_1; float d_mu, d_omega, d_gain_omega; int d_div; |