diff options
24 files changed, 37 insertions, 40 deletions
diff --git a/gr-digital/lib/cma_equalizer_cc_impl.cc b/gr-digital/lib/cma_equalizer_cc_impl.cc index a44d80d581..d0dc1e0961 100644 --- a/gr-digital/lib/cma_equalizer_cc_impl.cc +++ b/gr-digital/lib/cma_equalizer_cc_impl.cc @@ -34,7 +34,7 @@ cma_equalizer_cc_impl::cma_equalizer_cc_impl(int num_taps, io_signature::make(1, 1, sizeof(gr_complex)), io_signature::make(1, 1, sizeof(gr_complex)), sps), - fir_filter_ccc(sps, std::vector<gr_complex>(num_taps, gr_complex(0, 0))), + fir_filter_ccc(std::vector<gr_complex>(num_taps, gr_complex(0, 0))), d_new_taps(num_taps, gr_complex(0, 0)), d_updated(false), d_error(gr_complex(0, 0)) diff --git a/gr-digital/lib/decision_feedback_equalizer_impl.cc b/gr-digital/lib/decision_feedback_equalizer_impl.cc index 323692628f..7f39360999 100644 --- a/gr-digital/lib/decision_feedback_equalizer_impl.cc +++ b/gr-digital/lib/decision_feedback_equalizer_impl.cc @@ -64,7 +64,6 @@ decision_feedback_equalizer_impl::decision_feedback_equalizer_impl( sizeof(unsigned short) }), sps), filter::kernel::fir_filter_ccc( - sps, vector<gr_complex>(num_taps_forward + num_taps_feedback, gr_complex(0, 0))), d_num_taps_fwd(num_taps_forward), d_num_taps_rev(num_taps_feedback), diff --git a/gr-digital/lib/interpolating_resampler.cc b/gr-digital/lib/interpolating_resampler.cc index 1fa78dae63..c65df7b098 100644 --- a/gr-digital/lib/interpolating_resampler.cc +++ b/gr-digital/lib/interpolating_resampler.cc @@ -215,10 +215,10 @@ interp_resampler_pfb_no_mf_cc::interp_resampler_pfb_no_mf_cc(bool derivative, in for (int src = 0; src <= NSTEPS; src += incr) { t.assign(&taps[src][0], &taps[src][NTAPS]); - d_filters.emplace_back(1, t); + d_filters.emplace_back(t); if (d_derivative) { t.assign(&Dtaps[src][0], &Dtaps[src][DNTAPS]); - d_diff_filters.emplace_back(1, t); + d_diff_filters.emplace_back(t); } } } @@ -284,10 +284,10 @@ interp_resampler_pfb_no_mf_ff::interp_resampler_pfb_no_mf_ff(bool derivative, in for (int src = 0; src <= NSTEPS; src += incr) { t.assign(&taps[src][0], &taps[src][NTAPS]); - d_filters.emplace_back(1, t); + d_filters.emplace_back(t); if (d_derivative) { t.assign(&Dtaps[src][0], &Dtaps[src][DNTAPS]); - d_diff_filters.emplace_back(1, t); + d_diff_filters.emplace_back(t); } } } @@ -414,7 +414,7 @@ interp_resampler_pfb_mf_ccf::interp_resampler_pfb_mf_ccf(const std::vector<float if (k < m) d_taps[i][j] = taps[k]; } - d_filters.emplace_back(1, d_taps[i]); + d_filters.emplace_back(d_taps[i]); if (!d_derivative) continue; @@ -424,7 +424,7 @@ interp_resampler_pfb_mf_ccf::interp_resampler_pfb_mf_ccf(const std::vector<float if (k < n) d_diff_taps[i][j] = diff_taps[k]; } - d_diff_filters.emplace_back(1, d_diff_taps[i]); + d_diff_filters.emplace_back(d_diff_taps[i]); } } @@ -552,7 +552,7 @@ interp_resampler_pfb_mf_fff::interp_resampler_pfb_mf_fff(const std::vector<float if (k < m) d_taps[i][j] = taps[k]; } - d_filters.emplace_back(1, d_taps[i]); + d_filters.emplace_back(d_taps[i]); if (!d_derivative) continue; @@ -562,7 +562,7 @@ interp_resampler_pfb_mf_fff::interp_resampler_pfb_mf_fff(const std::vector<float if (k < n) d_diff_taps[i][j] = diff_taps[k]; } - d_diff_filters.emplace_back(1, d_diff_taps[i]); + d_diff_filters.emplace_back(d_diff_taps[i]); } } diff --git a/gr-digital/lib/kurtotic_equalizer_cc_impl.cc b/gr-digital/lib/kurtotic_equalizer_cc_impl.cc index a80c4dc451..002ee69f9f 100644 --- a/gr-digital/lib/kurtotic_equalizer_cc_impl.cc +++ b/gr-digital/lib/kurtotic_equalizer_cc_impl.cc @@ -29,8 +29,7 @@ kurtotic_equalizer_cc_impl::kurtotic_equalizer_cc_impl(int num_taps, float mu) io_signature::make(1, 1, sizeof(gr_complex)), io_signature::make(1, 1, sizeof(gr_complex)), 1), - filter::kernel::fir_filter_ccc(1, - std::vector<gr_complex>(num_taps, gr_complex(0, 0))) + filter::kernel::fir_filter_ccc(std::vector<gr_complex>(num_taps, gr_complex(0, 0))) { set_gain(mu); if (num_taps > 0) diff --git a/gr-digital/lib/linear_equalizer_impl.cc b/gr-digital/lib/linear_equalizer_impl.cc index 747e935fc3..6fbafd203b 100644 --- a/gr-digital/lib/linear_equalizer_impl.cc +++ b/gr-digital/lib/linear_equalizer_impl.cc @@ -55,7 +55,7 @@ linear_equalizer_impl::linear_equalizer_impl(unsigned num_taps, num_taps * sizeof(gr_complex), sizeof(unsigned short)), sps), - filter::kernel::fir_filter_ccc(sps, vector<gr_complex>(num_taps, gr_complex(0, 0))), + filter::kernel::fir_filter_ccc(vector<gr_complex>(num_taps, gr_complex(0, 0))), d_num_taps(num_taps), d_sps(sps), d_alg(alg), diff --git a/gr-digital/lib/lms_dd_equalizer_cc_impl.cc b/gr-digital/lib/lms_dd_equalizer_cc_impl.cc index 33fccb5757..ad40171964 100644 --- a/gr-digital/lib/lms_dd_equalizer_cc_impl.cc +++ b/gr-digital/lib/lms_dd_equalizer_cc_impl.cc @@ -36,7 +36,7 @@ lms_dd_equalizer_cc_impl::lms_dd_equalizer_cc_impl(int num_taps, io_signature::make(1, 1, sizeof(gr_complex)), io_signature::make(1, 1, sizeof(gr_complex)), sps), - fir_filter_ccc(sps, std::vector<gr_complex>(num_taps, gr_complex(0, 0))), + fir_filter_ccc(std::vector<gr_complex>(num_taps, gr_complex(0, 0))), d_new_taps(num_taps, gr_complex(0, 0)), d_updated(false), d_cnst(cnst) diff --git a/gr-digital/lib/pfb_clock_sync_ccf_impl.cc b/gr-digital/lib/pfb_clock_sync_ccf_impl.cc index 7ab1e857d9..a5f2e7cb14 100644 --- a/gr-digital/lib/pfb_clock_sync_ccf_impl.cc +++ b/gr-digital/lib/pfb_clock_sync_ccf_impl.cc @@ -86,8 +86,8 @@ pfb_clock_sync_ccf_impl::pfb_clock_sync_ccf_impl(double sps, // Create an FIR filter for each channel and zero out the taps std::vector<float> vtaps(1, 0); for (int i = 0; i < d_nfilters; i++) { - d_filters.emplace_back(1, vtaps); - d_diff_filters.emplace_back(1, vtaps); + d_filters.emplace_back(vtaps); + d_diff_filters.emplace_back(vtaps); } // Now, actually set the filters' taps diff --git a/gr-digital/lib/pfb_clock_sync_fff_impl.cc b/gr-digital/lib/pfb_clock_sync_fff_impl.cc index e15b184e22..f7ff14b586 100644 --- a/gr-digital/lib/pfb_clock_sync_fff_impl.cc +++ b/gr-digital/lib/pfb_clock_sync_fff_impl.cc @@ -82,8 +82,8 @@ pfb_clock_sync_fff_impl::pfb_clock_sync_fff_impl(double sps, // Create an FIR filter for each channel and zero out the taps std::vector<float> vtaps(1, 0); for (int i = 0; i < d_nfilters; i++) { - d_filters.emplace_back(1, vtaps); - d_diff_filters.emplace_back(1, vtaps); + d_filters.emplace_back(vtaps); + d_diff_filters.emplace_back(vtaps); } // Now, actually set the filters' taps diff --git a/gr-filter/include/gnuradio/filter/fir_filter.h b/gr-filter/include/gnuradio/filter/fir_filter.h index 92ea2a23af..88a0a9740a 100644 --- a/gr-filter/include/gnuradio/filter/fir_filter.h +++ b/gr-filter/include/gnuradio/filter/fir_filter.h @@ -25,7 +25,7 @@ template <class IN_T, class OUT_T, class TAP_T> class FILTER_API fir_filter { public: - fir_filter(int decimation, const std::vector<TAP_T>& taps); + fir_filter(const std::vector<TAP_T>& taps); // Disallow copy. // diff --git a/gr-filter/lib/filter_delay_fc_impl.cc b/gr-filter/lib/filter_delay_fc_impl.cc index b3b70a277c..a6d08e4320 100644 --- a/gr-filter/lib/filter_delay_fc_impl.cc +++ b/gr-filter/lib/filter_delay_fc_impl.cc @@ -28,7 +28,7 @@ filter_delay_fc_impl::filter_delay_fc_impl(const std::vector<float>& taps) io_signature::make(1, 2, sizeof(float)), io_signature::make(1, 1, sizeof(gr_complex))), d_taps(taps), - d_fir(1, taps), + d_fir(taps), d_delay(d_fir.ntaps() / 2), d_update(false) { diff --git a/gr-filter/lib/filterbank.cc b/gr-filter/lib/filterbank.cc index 20bdf29ca7..0877d68d80 100644 --- a/gr-filter/lib/filterbank.cc +++ b/gr-filter/lib/filterbank.cc @@ -32,7 +32,7 @@ filterbank::filterbank(const std::vector<std::vector<float>>& taps) std::vector<float> vtaps(1, 0.0f); d_fir_filters.reserve(d_nfilts); for (unsigned int i = 0; i < d_nfilts; i++) { - d_fir_filters.emplace_back(1, vtaps); + d_fir_filters.emplace_back(vtaps); } // Now, actually set the filters' taps set_taps(d_taps); diff --git a/gr-filter/lib/fir_filter.cc b/gr-filter/lib/fir_filter.cc index a0ad2cc092..b819f62d65 100644 --- a/gr-filter/lib/fir_filter.cc +++ b/gr-filter/lib/fir_filter.cc @@ -19,8 +19,7 @@ namespace filter { namespace kernel { template <class IN_T, class OUT_T, class TAP_T> -fir_filter<IN_T, OUT_T, TAP_T>::fir_filter(int decimation, const std::vector<TAP_T>& taps) - : d_output(1) +fir_filter<IN_T, OUT_T, TAP_T>::fir_filter(const std::vector<TAP_T>& taps) : d_output(1) { d_align = volk_get_alignment(); d_naligned = std::max((size_t)1, d_align / sizeof(IN_T)); diff --git a/gr-filter/lib/fir_filter_blk_impl.cc b/gr-filter/lib/fir_filter_blk_impl.cc index a3cf209949..4ec022d6da 100644 --- a/gr-filter/lib/fir_filter_blk_impl.cc +++ b/gr-filter/lib/fir_filter_blk_impl.cc @@ -35,7 +35,7 @@ fir_filter_blk_impl<IN_T, OUT_T, TAP_T>::fir_filter_blk_impl( io_signature::make(1, 1, sizeof(IN_T)), io_signature::make(1, 1, sizeof(OUT_T)), decimation), - d_fir(decimation, taps), + d_fir(taps), d_updated(false) { this->set_history(d_fir.ntaps()); diff --git a/gr-filter/lib/freq_xlating_fir_filter_impl.cc b/gr-filter/lib/freq_xlating_fir_filter_impl.cc index c8828e91d7..89b84983c9 100644 --- a/gr-filter/lib/freq_xlating_fir_filter_impl.cc +++ b/gr-filter/lib/freq_xlating_fir_filter_impl.cc @@ -42,7 +42,7 @@ freq_xlating_fir_filter_impl<IN_T, OUT_T, TAP_T>::freq_xlating_fir_filter_impl( io_signature::make(1, 1, sizeof(OUT_T)), decimation), d_proto_taps(taps), - d_composite_fir(decimation, {}), + d_composite_fir({}), d_center_freq(center_freq), d_prev_center_freq(0), d_sampling_freq(sampling_freq), diff --git a/gr-filter/lib/hilbert_fc_impl.cc b/gr-filter/lib/hilbert_fc_impl.cc index 1cc37c6eae..2d9e76333d 100644 --- a/gr-filter/lib/hilbert_fc_impl.cc +++ b/gr-filter/lib/hilbert_fc_impl.cc @@ -30,7 +30,7 @@ hilbert_fc_impl::hilbert_fc_impl(unsigned int ntaps, firdes::win_type window, do io_signature::make(1, 1, sizeof(float)), io_signature::make(1, 1, sizeof(gr_complex))), d_ntaps(ntaps | 0x1), // ensure ntaps is odd - d_hilb(1, firdes::hilbert(d_ntaps, window, beta)) + d_hilb(firdes::hilbert(d_ntaps, window, beta)) { set_history(d_ntaps); diff --git a/gr-filter/lib/interp_fir_filter_impl.cc b/gr-filter/lib/interp_fir_filter_impl.cc index 8163d0fb0d..2ab03bb538 100644 --- a/gr-filter/lib/interp_fir_filter_impl.cc +++ b/gr-filter/lib/interp_fir_filter_impl.cc @@ -50,7 +50,7 @@ interp_fir_filter_impl<IN_T, OUT_T, TAP_T>::interp_fir_filter_impl( d_firs.reserve(interpolation); for (unsigned i = 0; i < interpolation; i++) { - d_firs.emplace_back(1, dummy_taps); + d_firs.emplace_back(dummy_taps); } set_taps(taps); diff --git a/gr-filter/lib/mmse_fir_interpolator_cc.cc b/gr-filter/lib/mmse_fir_interpolator_cc.cc index 34883cb3eb..2121b97f16 100644 --- a/gr-filter/lib/mmse_fir_interpolator_cc.cc +++ b/gr-filter/lib/mmse_fir_interpolator_cc.cc @@ -26,7 +26,7 @@ std::vector<kernel::fir_filter_ccf> build_filters() filters.reserve(NSTEPS + 1); for (int i = 0; i < NSTEPS + 1; i++) { std::vector<float> t(&taps[i][0], &taps[i][NTAPS]); - filters.emplace_back(1, t); + filters.emplace_back(t); } return filters; } diff --git a/gr-filter/lib/mmse_fir_interpolator_ff.cc b/gr-filter/lib/mmse_fir_interpolator_ff.cc index 52c213401e..3064803fd8 100644 --- a/gr-filter/lib/mmse_fir_interpolator_ff.cc +++ b/gr-filter/lib/mmse_fir_interpolator_ff.cc @@ -26,7 +26,7 @@ std::vector<kernel::fir_filter_fff> build_filters() filters.reserve(NSTEPS + 1); for (int i = 0; i < NSTEPS + 1; i++) { std::vector<float> t(&taps[i][0], &taps[i][NTAPS]); - filters.emplace_back(1, t); + filters.emplace_back(t); } return filters; } diff --git a/gr-filter/lib/mmse_interp_differentiator_cc.cc b/gr-filter/lib/mmse_interp_differentiator_cc.cc index 9728b283ae..cae99b8265 100644 --- a/gr-filter/lib/mmse_interp_differentiator_cc.cc +++ b/gr-filter/lib/mmse_interp_differentiator_cc.cc @@ -26,7 +26,7 @@ std::vector<kernel::fir_filter_ccf> build_filters() filters.reserve(DNSTEPS + 1); for (int i = 0; i < DNSTEPS + 1; i++) { std::vector<float> t(&Dtaps[i][0], &Dtaps[i][DNTAPS]); - filters.emplace_back(1, t); + filters.emplace_back(t); } return filters; } diff --git a/gr-filter/lib/mmse_interp_differentiator_ff.cc b/gr-filter/lib/mmse_interp_differentiator_ff.cc index 339d9728ba..fc92719103 100644 --- a/gr-filter/lib/mmse_interp_differentiator_ff.cc +++ b/gr-filter/lib/mmse_interp_differentiator_ff.cc @@ -26,7 +26,7 @@ std::vector<kernel::fir_filter_fff> build_filters() filters.reserve(DNSTEPS + 1); for (int i = 0; i < DNSTEPS + 1; i++) { std::vector<float> t(&Dtaps[i][0], &Dtaps[i][DNTAPS]); - filters.emplace_back(1, t); + filters.emplace_back(t); } return filters; } diff --git a/gr-filter/lib/pfb_arb_resampler.cc b/gr-filter/lib/pfb_arb_resampler.cc index 52471d3428..c3d7c09f4a 100644 --- a/gr-filter/lib/pfb_arb_resampler.cc +++ b/gr-filter/lib/pfb_arb_resampler.cc @@ -48,8 +48,8 @@ pfb_arb_resampler_ccf::pfb_arb_resampler_ccf(float rate, d_filters.reserve(d_int_rate); d_diff_filters.reserve(d_int_rate); for (unsigned int i = 0; i < d_int_rate; i++) { - d_filters.emplace_back(1, vtaps); - d_diff_filters.emplace_back(1, vtaps); + d_filters.emplace_back(vtaps); + d_diff_filters.emplace_back(vtaps); } // Now, actually set the filters' taps @@ -238,8 +238,8 @@ pfb_arb_resampler_ccc::pfb_arb_resampler_ccc(float rate, // Create an FIR filter for each channel and zero out the taps std::vector<gr_complex> vtaps(0, d_int_rate); for (unsigned int i = 0; i < d_int_rate; i++) { - d_filters.emplace_back(1, vtaps); - d_diff_filters.emplace_back(1, vtaps); + d_filters.emplace_back(vtaps); + d_diff_filters.emplace_back(vtaps); } // Now, actually set the filters' taps @@ -431,8 +431,8 @@ pfb_arb_resampler_fff::pfb_arb_resampler_fff(float rate, // Create an FIR filter for each channel and zero out the taps std::vector<float> vtaps(0, d_int_rate); for (unsigned int i = 0; i < d_int_rate; i++) { - d_filters.emplace_back(1, vtaps); - d_diff_filters.emplace_back(1, vtaps); + d_filters.emplace_back(vtaps); + d_diff_filters.emplace_back(vtaps); } // Now, actually set the filters' taps diff --git a/gr-filter/lib/polyphase_filterbank.cc b/gr-filter/lib/polyphase_filterbank.cc index eb2085df5f..eea8d6cac6 100644 --- a/gr-filter/lib/polyphase_filterbank.cc +++ b/gr-filter/lib/polyphase_filterbank.cc @@ -29,7 +29,7 @@ polyphase_filterbank::polyphase_filterbank(unsigned int nfilts, // Create an FIR filter for each channel and zero out the taps std::vector<float> vtaps(1, 0.0f); for (unsigned int i = 0; i < d_nfilts; i++) { - d_fir_filters.emplace_back(1, vtaps); + d_fir_filters.emplace_back(vtaps); d_fft_filters.emplace_back(1, vtaps); } diff --git a/gr-filter/lib/rational_resampler_base_impl.cc b/gr-filter/lib/rational_resampler_base_impl.cc index 489d1cfbb6..1ce199d1e4 100644 --- a/gr-filter/lib/rational_resampler_base_impl.cc +++ b/gr-filter/lib/rational_resampler_base_impl.cc @@ -53,7 +53,7 @@ rational_resampler_base_impl<IN_T, OUT_T, TAP_T>::rational_resampler_base_impl( d_firs.reserve(interpolation); for (unsigned i = 0; i < interpolation; i++) { - d_firs.emplace_back(1, std::vector<TAP_T>()); + d_firs.emplace_back(std::vector<TAP_T>()); } set_taps(taps); diff --git a/gr-filter/python/filter/bindings/fir_filter_python.cc b/gr-filter/python/filter/bindings/fir_filter_python.cc index 45d09218dd..819dba7d80 100644 --- a/gr-filter/python/filter/bindings/fir_filter_python.cc +++ b/gr-filter/python/filter/bindings/fir_filter_python.cc @@ -14,7 +14,7 @@ /* BINDTOOL_GEN_AUTOMATIC(0) */ /* BINDTOOL_USE_PYGCCXML(0) */ /* BINDTOOL_HEADER_FILE(fir_filter.h) */ -/* BINDTOOL_HEADER_FILE_HASH(7c2f5f583b22ffa30bb7cc803bc4fbec) */ +/* BINDTOOL_HEADER_FILE_HASH(7fb532b04bc5b511d2f03a23101369c9) */ /***********************************************************************************/ #include <pybind11/complex.h> |