diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2017-08-27 11:32:20 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2017-08-27 11:32:20 -0700 |
| commit | b014fb6e26d9a363870b477dccc9dfafd890eac0 (patch) | |
| tree | 48272b792070243bd7c441523561952c3723b309 | |
| parent | 765040724dfe02b9f6533c60de1a6d67a975f388 (diff) | |
| parent | 1375fe38dd7ff6bcaffc25aed9b990a64cdb9c03 (diff) | |
Merge branch 'next' into python3
Conflicts:
volk
33 files changed, 177 insertions, 177 deletions
diff --git a/docs/sphinx/source/filter_blocks.rst b/docs/sphinx/source/filter_blocks.rst index 1ad2705e7e..50eee7db58 100644 --- a/docs/sphinx/source/filter_blocks.rst +++ b/docs/sphinx/source/filter_blocks.rst @@ -16,10 +16,10 @@ gnuradio.filters .. autoblock:: gnuradio.filter.fir_filter_fff .. autoblock:: gnuradio.filter.fir_filter_fsf .. autoblock:: gnuradio.filter.fir_filter_scc -.. autoblock:: gnuradio.filter.fractional_interpolator_cc -.. autoblock:: gnuradio.filter.fractional_interpolator_ff -.. autoblock:: gnuradio.filter.fractional_resampler_cc -.. autoblock:: gnuradio.filter.fractional_resampler_ff +.. autoblock:: gnuradio.filter.mmse_interpolator_cc +.. autoblock:: gnuradio.filter.mmse_interpolator_ff +.. autoblock:: gnuradio.filter.mmse_resampler_cc +.. autoblock:: gnuradio.filter.mmse_resampler_ff .. autoblock:: gnuradio.filter.freq_xlating_fir_filter_ccc .. autoblock:: gnuradio.filter.freq_xlating_fir_filter_ccf .. autoblock:: gnuradio.filter.freq_xlating_fir_filter_fcc diff --git a/docs/sphinx/source/index.rst b/docs/sphinx/source/index.rst index 763c04e0a5..64d4ec379d 100644 --- a/docs/sphinx/source/index.rst +++ b/docs/sphinx/source/index.rst @@ -553,10 +553,10 @@ Filter Blocks gnuradio.filter.fir_filter_fff gnuradio.filter.fir_filter_fsf gnuradio.filter.fir_filter_scc - gnuradio.filter.fractional_interpolator_cc - gnuradio.filter.fractional_interpolator_ff - gnuradio.filter.fractional_resampler_cc - gnuradio.filter.fractional_resampler_ff + gnuradio.filter.mmse_interpolator_cc + gnuradio.filter.mmse_interpolator_ff + gnuradio.filter.mmse_resampler_cc + gnuradio.filter.mmse_resampler_ff gnuradio.filter.freq_xlating_fir_filter_ccc gnuradio.filter.freq_xlating_fir_filter_ccf gnuradio.filter.freq_xlating_fir_filter_fcc @@ -907,8 +907,8 @@ Resampler Blocks .. autosummary:: :nosignatures: - gnuradio.filter.fractional_resampler_cc - gnuradio.filter.fractional_resampler_ff + gnuradio.filter.mmse_resampler_cc + gnuradio.filter.mmse_resampler_ff gnuradio.filter.pfb.arb_resampler_ccf gnuradio.filter.pfb.arb_resampler_fff gnuradio.filter.pfb.arb_resampler_ccc diff --git a/gr-blocks/examples/ctrlport/comparing_resamplers.grc b/gr-blocks/examples/ctrlport/comparing_resamplers.grc index eea9ab6ccd..e5cc973de0 100644 --- a/gr-blocks/examples/ctrlport/comparing_resamplers.grc +++ b/gr-blocks/examples/ctrlport/comparing_resamplers.grc @@ -290,10 +290,10 @@ </param> </block> <block> - <key>fractional_resampler_xx</key> + <key>mmse_resampler_xx</key> <param> <key>id</key> - <value>fractional_resampler_xx_0</value> + <value>mmse_resampler_xx_0</value> </param> <param> <key>_enabled</key> @@ -332,7 +332,7 @@ </param> <param> <key>name</key> - <value>fractional_resamp</value> + <value>mmse_resamp</value> </param> <param> <key>desc</key> @@ -371,7 +371,7 @@ </connection> <connection> <source_block_id>channels_channel_model_0</source_block_id> - <sink_block_id>fractional_resampler_xx_0</sink_block_id> + <sink_block_id>mmse_resampler_xx_0</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> @@ -382,7 +382,7 @@ <sink_key>0</sink_key> </connection> <connection> - <source_block_id>fractional_resampler_xx_0</source_block_id> + <source_block_id>mmse_resampler_xx_0</source_block_id> <sink_block_id>probe_frac_resamp</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> diff --git a/gr-channels/lib/channel_model2_impl.cc b/gr-channels/lib/channel_model2_impl.cc index 0c158be5af..59524fb83a 100644 --- a/gr-channels/lib/channel_model2_impl.cc +++ b/gr-channels/lib/channel_model2_impl.cc @@ -59,7 +59,7 @@ namespace gr { d_taps.push_back(0); } - d_timing_offset = filter::fractional_resampler_cc::make(0, epsilon); + d_timing_offset = filter::mmse_resampler_cc::make(0, epsilon); d_multipath = filter::fir_filter_ccc::make(1, d_taps); diff --git a/gr-channels/lib/channel_model2_impl.h b/gr-channels/lib/channel_model2_impl.h index 2cafce4c82..50f489f05e 100644 --- a/gr-channels/lib/channel_model2_impl.h +++ b/gr-channels/lib/channel_model2_impl.h @@ -29,7 +29,7 @@ #include <gnuradio/blocks/multiply_cc.h> #include <gnuradio/analog/sig_source_c.h> #include <gnuradio/analog/fastnoise_source_c.h> -#include <gnuradio/filter/fractional_resampler_cc.h> +#include <gnuradio/filter/mmse_resampler_cc.h> #include <gnuradio/filter/fir_filter_ccc.h> #include <gnuradio/blocks/vco_c.h> @@ -46,7 +46,7 @@ namespace gr { analog::fastnoise_source_c::sptr d_noise; - filter::fractional_resampler_cc::sptr d_timing_offset; + filter::mmse_resampler_cc::sptr d_timing_offset; filter::fir_filter_ccc::sptr d_multipath; std::vector<gr_complex> d_taps; diff --git a/gr-channels/lib/channel_model_impl.cc b/gr-channels/lib/channel_model_impl.cc index 6e3e49de73..bca1e40531 100644 --- a/gr-channels/lib/channel_model_impl.cc +++ b/gr-channels/lib/channel_model_impl.cc @@ -61,7 +61,7 @@ namespace gr { d_taps.push_back(0); } - d_timing_offset = filter::fractional_resampler_cc::make(0, epsilon); + d_timing_offset = filter::mmse_resampler_cc::make(0, epsilon); d_multipath = filter::fir_filter_ccc::make(1, d_taps); diff --git a/gr-channels/lib/channel_model_impl.h b/gr-channels/lib/channel_model_impl.h index 9247b245c0..7376bf372d 100644 --- a/gr-channels/lib/channel_model_impl.h +++ b/gr-channels/lib/channel_model_impl.h @@ -29,7 +29,7 @@ #include <gnuradio/analog/sig_source_c.h> #include <gnuradio/analog/fastnoise_source_c.h> #include <gnuradio/channels/channel_model.h> -#include <gnuradio/filter/fractional_resampler_cc.h> +#include <gnuradio/filter/mmse_resampler_cc.h> #include <gnuradio/filter/fir_filter_ccc.h> namespace gr { @@ -44,7 +44,7 @@ namespace gr { analog::sig_source_c::sptr d_freq_offset; analog::fastnoise_source_c::sptr d_noise; - filter::fractional_resampler_cc::sptr d_timing_offset; + filter::mmse_resampler_cc::sptr d_timing_offset; filter::fir_filter_ccc::sptr d_multipath; std::vector<gr_complex> d_taps; diff --git a/gr-channels/lib/dynamic_channel_model_impl.h b/gr-channels/lib/dynamic_channel_model_impl.h index b0d42c8875..c0be94aac3 100644 --- a/gr-channels/lib/dynamic_channel_model_impl.h +++ b/gr-channels/lib/dynamic_channel_model_impl.h @@ -32,7 +32,7 @@ #include <gnuradio/channels/selective_fading_model.h> #include <gnuradio/channels/sro_model.h> #include <gnuradio/channels/cfo_model.h> -#include <gnuradio/filter/fractional_resampler_cc.h> +#include <gnuradio/filter/mmse_resampler_cc.h> #include <gnuradio/filter/fir_filter_ccc.h> namespace gr { diff --git a/gr-channels/lib/sro_model_impl.h b/gr-channels/lib/sro_model_impl.h index bd55bf4801..b0b8809469 100644 --- a/gr-channels/lib/sro_model_impl.h +++ b/gr-channels/lib/sro_model_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_CHANNELS_SRO_MODEL_CC_IMPL_H #define INCLUDED_CHANNELS_SRO_MODEL_CC_IMPL_H -#include <gnuradio/filter/fractional_interpolator_cc.h> +#include <gnuradio/filter/mmse_interpolator_cc.h> #include <gnuradio/filter/mmse_fir_interpolator_cc.h> #include <gnuradio/analog/fastnoise_source_f.h> #include <gnuradio/channels/sro_model.h> diff --git a/gr-digital/examples/example_timing.py b/gr-digital/examples/example_timing.py index 93ce691cf7..348d62b6f3 100644 --- a/gr-digital/examples/example_timing.py +++ b/gr-digital/examples/example_timing.py @@ -65,7 +65,7 @@ class example_timing(gr.top_block): self.src = blocks.vector_source_c(data.tolist(), False) self.rrc = filter.interp_fir_filter_ccf(sps, rrc_taps) self.chn = channels.channel_model(noise, foffset, toffset) - self.off = filter.fractional_resampler_cc(0.20, 1.0) + self.off = filter.mmse_resampler_cc(0.20, 1.0) if mode == 0: self.clk = digital.pfb_clock_sync_ccf(sps, gain, rrc_taps_rx, diff --git a/gr-digital/python/digital/qa_constellation_receiver.py b/gr-digital/python/digital/qa_constellation_receiver.py index bcf4b18118..182e2943c4 100644 --- a/gr-digital/python/digital/qa_constellation_receiver.py +++ b/gr-digital/python/digital/qa_constellation_receiver.py @@ -65,7 +65,7 @@ class channel_model(gr.hier_block2): gr.io_signature(1, 1, gr.sizeof_gr_complex)) - timing_offset = filter.fractional_resampler_cc(0, timing) + timing_offset = filter.mmse_resampler_cc(0, timing) noise_adder = blocks.add_cc() noise = analog.noise_source_c(analog.GR_GAUSSIAN, noise_voltage, 0) diff --git a/gr-filter/grc/CMakeLists.txt b/gr-filter/grc/CMakeLists.txt index 6c67a5a6ae..d3039eb20b 100644 --- a/gr-filter/grc/CMakeLists.txt +++ b/gr-filter/grc/CMakeLists.txt @@ -24,8 +24,8 @@ install(FILES filter_fir_filter_xxx.xml filter_filter_delay_fc.xml filter_filterbank_vcvcf.xml - filter_fractional_interpolator_xx.xml - filter_fractional_resampler_xx.xml + filter_mmse_interpolator_xx.xml + filter_mmse_resampler_xx.xml filter_freq_xlating_fft_filter_ccc.xml filter_freq_xlating_fir_filter_xxx.xml filter_hilbert_fc.xml diff --git a/gr-filter/grc/filter_block_tree.xml b/gr-filter/grc/filter_block_tree.xml index 3613df8202..b296e1cc74 100644 --- a/gr-filter/grc/filter_block_tree.xml +++ b/gr-filter/grc/filter_block_tree.xml @@ -55,8 +55,8 @@ </cat> <cat> <name>Resamplers</name> - <block>fractional_resampler_xx</block> - <block>fractional_interpolator_xx</block> + <block>mmse_resampler_xx</block> + <block>mmse_interpolator_xx</block> <block>pfb_arb_resampler_xxx</block> <block>rational_resampler_xxx</block> <block>rational_resampler_base_xxx</block> diff --git a/gr-filter/grc/filter_fractional_interpolator_xx.xml b/gr-filter/grc/filter_fractional_interpolator_xx.xml index 760e8bb060..c80d23d73a 100644 --- a/gr-filter/grc/filter_fractional_interpolator_xx.xml +++ b/gr-filter/grc/filter_fractional_interpolator_xx.xml @@ -6,9 +6,9 @@ --> <block> <name>Fractional Interpolator</name> - <key>fractional_interpolator_xx</key> + <key>mmse_interpolator_xx</key> <import>from gnuradio import filter</import> - <make>filter.fractional_interpolator_$(type.fcn)($phase_shift, $interp_ratio)</make> + <make>filter.mmse_interpolator_$(type.fcn)($phase_shift, $interp_ratio)</make> <callback>set_interp_ratio($interp_ratio)</callback> <param> <name>Type</name> diff --git a/gr-filter/grc/filter_fractional_resampler_xx.xml b/gr-filter/grc/filter_fractional_resampler_xx.xml index b2b4b1066c..31a4acee80 100644 --- a/gr-filter/grc/filter_fractional_resampler_xx.xml +++ b/gr-filter/grc/filter_fractional_resampler_xx.xml @@ -6,9 +6,9 @@ --> <block> <name>Fractional Resampler</name> - <key>fractional_resampler_xx</key> + <key>mmse_resampler_xx</key> <import>from gnuradio import filter</import> - <make>filter.fractional_resampler_$(type.fcn)($phase_shift, $resamp_ratio)</make> + <make>filter.mmse_resampler_$(type.fcn)($phase_shift, $resamp_ratio)</make> <callback>set_resamp_ratio($resamp_ratio)</callback> <param> <name>Type</name> diff --git a/gr-filter/include/gnuradio/filter/CMakeLists.txt b/gr-filter/include/gnuradio/filter/CMakeLists.txt index c22c7995c0..9338d96713 100644 --- a/gr-filter/include/gnuradio/filter/CMakeLists.txt +++ b/gr-filter/include/gnuradio/filter/CMakeLists.txt @@ -57,10 +57,10 @@ install(FILES fft_filter_ccc.h fft_filter_ccf.h fft_filter_fff.h - fractional_interpolator_cc.h - fractional_interpolator_ff.h - fractional_resampler_cc.h - fractional_resampler_ff.h + mmse_interpolator_cc.h + mmse_interpolator_ff.h + mmse_resampler_cc.h + mmse_resampler_ff.h hilbert_fc.h iir_filter_ffd.h iir_filter_ccc.h diff --git a/gr-filter/include/gnuradio/filter/fractional_interpolator_cc.h b/gr-filter/include/gnuradio/filter/mmse_interpolator_cc.h index 6cd6413a57..4501f9fc56 100644 --- a/gr-filter/include/gnuradio/filter/fractional_interpolator_cc.h +++ b/gr-filter/include/gnuradio/filter/mmse_interpolator_cc.h @@ -20,8 +20,8 @@ * Boston, MA 02110-1301, USA. */ -#ifndef INCLUDED_FRACTIONAL_INTERPOLATOR_CC_H -#define INCLUDED_FRACTIONAL_INTERPOLATOR_CC_H +#ifndef INCLUDED_MMSE_INTERPOLATOR_CC_H +#define INCLUDED_MMSE_INTERPOLATOR_CC_H #include <gnuradio/filter/api.h> #include <gnuradio/block.h> @@ -33,11 +33,11 @@ namespace gr { * \brief Interpolating MMSE filter with complex input, complex output * \ingroup resamplers_blk */ - class FILTER_API fractional_interpolator_cc : virtual public block + class FILTER_API mmse_interpolator_cc : virtual public block { public: - // gr::filter::fractional_interpolator_cc::sptr - typedef boost::shared_ptr<fractional_interpolator_cc> sptr; + // gr::filter::mmse_interpolator_cc::sptr + typedef boost::shared_ptr<mmse_interpolator_cc> sptr; /*! * \brief Build the interpolating MMSE filter (complex input, complex output) @@ -57,4 +57,4 @@ namespace gr { } /* namespace filter */ } /* namespace gr */ -#endif /* INCLUDED_FRACTIONAL_INTERPOLATOR_FF_H */ +#endif /* INCLUDED_MMSE_INTERPOLATOR_FF_H */ diff --git a/gr-filter/include/gnuradio/filter/fractional_interpolator_ff.h b/gr-filter/include/gnuradio/filter/mmse_interpolator_ff.h index c8218adb77..a08935a523 100644 --- a/gr-filter/include/gnuradio/filter/fractional_interpolator_ff.h +++ b/gr-filter/include/gnuradio/filter/mmse_interpolator_ff.h @@ -20,8 +20,8 @@ * Boston, MA 02110-1301, USA. */ -#ifndef INCLUDED_FRACTIONAL_INTERPOLATOR_FF_H -#define INCLUDED_FRACTIONAL_INTERPOLATOR_FF_H +#ifndef INCLUDED_MMSE_INTERPOLATOR_FF_H +#define INCLUDED_MMSE_INTERPOLATOR_FF_H #include <gnuradio/filter/api.h> #include <gnuradio/block.h> @@ -33,11 +33,11 @@ namespace gr { * \brief Interpolating MMSE filter with float input, float output * \ingroup resamplers_blk */ - class FILTER_API fractional_interpolator_ff : virtual public block + class FILTER_API mmse_interpolator_ff : virtual public block { public: - // gr::filter::fractional_interpolator_ff::sptr - typedef boost::shared_ptr<fractional_interpolator_ff> sptr; + // gr::filter::mmse_interpolator_ff::sptr + typedef boost::shared_ptr<mmse_interpolator_ff> sptr; /*! * \brief Build the interpolating MMSE filter (float input, float output) @@ -57,4 +57,4 @@ namespace gr { } /* namespace filter */ } /* namespace gr */ -#endif /* INCLUDED_FRACTIONAL_INTERPOLATOR_FF_H */ +#endif /* INCLUDED_MMSE_INTERPOLATOR_FF_H */ diff --git a/gr-filter/include/gnuradio/filter/fractional_resampler_cc.h b/gr-filter/include/gnuradio/filter/mmse_resampler_cc.h index 65e53e23f2..008a2a923b 100644 --- a/gr-filter/include/gnuradio/filter/fractional_resampler_cc.h +++ b/gr-filter/include/gnuradio/filter/mmse_resampler_cc.h @@ -20,8 +20,8 @@ * Boston, MA 02110-1301, USA. */ -#ifndef INCLUDED_FRACTIONAL_RESAMPLER_CC_H -#define INCLUDED_FRACTIONAL_RESAMPLER_CC_H +#ifndef INCLUDED_MMSE_RESAMPLER_CC_H +#define INCLUDED_MMSE_RESAMPLER_CC_H #include <gnuradio/filter/api.h> #include <gnuradio/block.h> @@ -38,11 +38,11 @@ namespace gr { * message. Keys are pmt symbols with the strings "resamp_ratio" and "mu" * and values are pmt floats. */ - class FILTER_API fractional_resampler_cc : virtual public block + class FILTER_API mmse_resampler_cc : virtual public block { public: - // gr::filter::fractional_resampler_cc::sptr - typedef boost::shared_ptr<fractional_resampler_cc> sptr; + // gr::filter::mmse_resampler_cc::sptr + typedef boost::shared_ptr<mmse_resampler_cc> sptr; /*! * \brief Build the resampling MMSE filter (complex input, complex output) @@ -62,4 +62,4 @@ namespace gr { } /* namespace filter */ } /* namespace gr */ -#endif /* INCLUDED_FRACTIONAL_RESAMPLER_FF_H */ +#endif /* INCLUDED_MMSE_RESAMPLER_FF_H */ diff --git a/gr-filter/include/gnuradio/filter/fractional_resampler_ff.h b/gr-filter/include/gnuradio/filter/mmse_resampler_ff.h index f8d207d337..059f0850e2 100644 --- a/gr-filter/include/gnuradio/filter/fractional_resampler_ff.h +++ b/gr-filter/include/gnuradio/filter/mmse_resampler_ff.h @@ -20,8 +20,8 @@ * Boston, MA 02110-1301, USA. */ -#ifndef INCLUDED_FRACTIONAL_RESAMPLER_FF_H -#define INCLUDED_FRACTIONAL_RESAMPLER_FF_H +#ifndef INCLUDED_MMSE_RESAMPLER_FF_H +#define INCLUDED_MMSE_RESAMPLER_FF_H #include <gnuradio/filter/api.h> #include <gnuradio/block.h> @@ -39,11 +39,11 @@ namespace gr { * and values are pmt floats. */ - class FILTER_API fractional_resampler_ff : virtual public block + class FILTER_API mmse_resampler_ff : virtual public block { public: - // gr::filter::fractional_resampler_ff::sptr - typedef boost::shared_ptr<fractional_resampler_ff> sptr; + // gr::filter::mmse_resampler_ff::sptr + typedef boost::shared_ptr<mmse_resampler_ff> sptr; /*! * \brief Build the resampling MMSE filter (float input, float output) @@ -63,4 +63,4 @@ namespace gr { } /* namespace filter */ } /* namespace gr */ -#endif /* INCLUDED_FRACTIONAL_RESAMPLER_FF_H */ +#endif /* INCLUDED_MMSE_RESAMPLER_FF_H */ diff --git a/gr-filter/lib/CMakeLists.txt b/gr-filter/lib/CMakeLists.txt index ebc5381785..8bd7236865 100644 --- a/gr-filter/lib/CMakeLists.txt +++ b/gr-filter/lib/CMakeLists.txt @@ -72,10 +72,10 @@ list(APPEND filter_sources fft_filter_ccc_impl.cc fft_filter_ccf_impl.cc fft_filter_fff_impl.cc - fractional_interpolator_cc_impl.cc - fractional_interpolator_ff_impl.cc - fractional_resampler_cc_impl.cc - fractional_resampler_ff_impl.cc + mmse_interpolator_cc_impl.cc + mmse_interpolator_ff_impl.cc + mmse_resampler_cc_impl.cc + mmse_resampler_ff_impl.cc hilbert_fc_impl.cc iir_filter_ffd_impl.cc iir_filter_ccc_impl.cc diff --git a/gr-filter/lib/fractional_interpolator_cc_impl.cc b/gr-filter/lib/mmse_interpolator_cc_impl.cc index 938c377cc8..37d9e2263b 100644 --- a/gr-filter/lib/fractional_interpolator_cc_impl.cc +++ b/gr-filter/lib/mmse_interpolator_cc_impl.cc @@ -25,28 +25,28 @@ #endif #include <gnuradio/io_signature.h> -#include "fractional_interpolator_cc_impl.h" +#include "mmse_interpolator_cc_impl.h" #include <stdexcept> namespace gr { namespace filter { - fractional_interpolator_cc::sptr - fractional_interpolator_cc::make(float phase_shift, float interp_ratio) + mmse_interpolator_cc::sptr + mmse_interpolator_cc::make(float phase_shift, float interp_ratio) { return gnuradio::get_initial_sptr( - new fractional_interpolator_cc_impl(phase_shift, interp_ratio)); + new mmse_interpolator_cc_impl(phase_shift, interp_ratio)); } - fractional_interpolator_cc_impl::fractional_interpolator_cc_impl + mmse_interpolator_cc_impl::mmse_interpolator_cc_impl (float phase_shift, float interp_ratio) - : block("fractional_interpolator_cc", + : block("mmse_interpolator_cc", io_signature::make(1, 1, sizeof(gr_complex)), io_signature::make(1, 1, sizeof(gr_complex))), d_mu (phase_shift), d_mu_inc (interp_ratio), d_interp(new mmse_fir_interpolator_cc()) { - GR_LOG_WARN(d_logger, "fractional_interpolator is deprecated. Please use fractional_resampler instead."); + GR_LOG_WARN(d_logger, "mmse_interpolator is deprecated. Please use mmse_resampler instead."); if(interp_ratio <= 0) throw std::out_of_range("interpolation ratio must be > 0"); @@ -56,13 +56,13 @@ namespace gr { set_relative_rate(1.0 / interp_ratio); } - fractional_interpolator_cc_impl::~fractional_interpolator_cc_impl() + mmse_interpolator_cc_impl::~mmse_interpolator_cc_impl() { delete d_interp; } void - fractional_interpolator_cc_impl::forecast(int noutput_items, + mmse_interpolator_cc_impl::forecast(int noutput_items, gr_vector_int &ninput_items_required) { unsigned ninputs = ninput_items_required.size(); @@ -73,7 +73,7 @@ namespace gr { } int - fractional_interpolator_cc_impl::general_work(int noutput_items, + mmse_interpolator_cc_impl::general_work(int noutput_items, gr_vector_int &ninput_items, gr_vector_const_void_star &input_items, gr_vector_void_star &output_items) @@ -100,25 +100,25 @@ namespace gr { } float - fractional_interpolator_cc_impl::mu() const + mmse_interpolator_cc_impl::mu() const { return d_mu; } float - fractional_interpolator_cc_impl::interp_ratio() const + mmse_interpolator_cc_impl::interp_ratio() const { return d_mu_inc; } void - fractional_interpolator_cc_impl::set_mu(float mu) + mmse_interpolator_cc_impl::set_mu(float mu) { d_mu = mu; } void - fractional_interpolator_cc_impl::set_interp_ratio(float interp_ratio) + mmse_interpolator_cc_impl::set_interp_ratio(float interp_ratio) { d_mu_inc = interp_ratio; } diff --git a/gr-filter/lib/fractional_interpolator_cc_impl.h b/gr-filter/lib/mmse_interpolator_cc_impl.h index 786bccfbaf..e82bad3bff 100644 --- a/gr-filter/lib/fractional_interpolator_cc_impl.h +++ b/gr-filter/lib/mmse_interpolator_cc_impl.h @@ -20,17 +20,17 @@ * Boston, MA 02110-1301, USA. */ -#ifndef INCLUDED_FRACTIONAL_INTERPOLATOR_CC_IMPL_H -#define INCLUDED_FRACTIONAL_INTERPOLATOR_CC_IMPL_H +#ifndef INCLUDED_MMSE_INTERPOLATOR_CC_IMPL_H +#define INCLUDED_MMSE_INTERPOLATOR_CC_IMPL_H -#include <gnuradio/filter/fractional_interpolator_cc.h> +#include <gnuradio/filter/mmse_interpolator_cc.h> #include <gnuradio/filter/mmse_fir_interpolator_cc.h> namespace gr { namespace filter { - class FILTER_API fractional_interpolator_cc_impl - : public fractional_interpolator_cc + class FILTER_API mmse_interpolator_cc_impl + : public mmse_interpolator_cc { private: float d_mu; @@ -38,9 +38,9 @@ namespace gr { mmse_fir_interpolator_cc *d_interp; public: - fractional_interpolator_cc_impl(float phase_shift, + mmse_interpolator_cc_impl(float phase_shift, float interp_ratio); - ~fractional_interpolator_cc_impl(); + ~mmse_interpolator_cc_impl(); void forecast(int noutput_items, gr_vector_int &ninput_items_required); @@ -58,4 +58,4 @@ namespace gr { } /* namespace filter */ } /* namespace gr */ -#endif /* INCLUDED_FRACTIONAL_INTERPOLATOR_CC_IMPL_H */ +#endif /* INCLUDED_MMSE_INTERPOLATOR_CC_IMPL_H */ diff --git a/gr-filter/lib/fractional_interpolator_ff_impl.cc b/gr-filter/lib/mmse_interpolator_ff_impl.cc index 60730aa6be..6b40eecd36 100644 --- a/gr-filter/lib/fractional_interpolator_ff_impl.cc +++ b/gr-filter/lib/mmse_interpolator_ff_impl.cc @@ -25,28 +25,28 @@ #endif #include <gnuradio/io_signature.h> -#include "fractional_interpolator_ff_impl.h" +#include "mmse_interpolator_ff_impl.h" #include <stdexcept> namespace gr { namespace filter { - fractional_interpolator_ff::sptr - fractional_interpolator_ff::make(float phase_shift, float interp_ratio) + mmse_interpolator_ff::sptr + mmse_interpolator_ff::make(float phase_shift, float interp_ratio) { return gnuradio::get_initial_sptr( - new fractional_interpolator_ff_impl(phase_shift, interp_ratio)); + new mmse_interpolator_ff_impl(phase_shift, interp_ratio)); } - fractional_interpolator_ff_impl::fractional_interpolator_ff_impl + mmse_interpolator_ff_impl::mmse_interpolator_ff_impl (float phase_shift, float interp_ratio) - : block("fractional_interpolator_ff", + : block("mmse_interpolator_ff", io_signature::make(1, 1, sizeof(float)), io_signature::make(1, 1, sizeof(float))), d_mu (phase_shift), d_mu_inc (interp_ratio), d_interp(new mmse_fir_interpolator_ff()) { - GR_LOG_WARN(d_logger, "fractional_interpolator is deprecated. Please use fractional_resampler instead."); + GR_LOG_WARN(d_logger, "mmse_interpolator is deprecated. Please use mmse_resampler instead."); if(interp_ratio <= 0) throw std::out_of_range("interpolation ratio must be > 0"); @@ -56,13 +56,13 @@ namespace gr { set_relative_rate(1.0 / interp_ratio); } - fractional_interpolator_ff_impl::~fractional_interpolator_ff_impl() + mmse_interpolator_ff_impl::~mmse_interpolator_ff_impl() { delete d_interp; } void - fractional_interpolator_ff_impl::forecast(int noutput_items, + mmse_interpolator_ff_impl::forecast(int noutput_items, gr_vector_int &ninput_items_required) { unsigned ninputs = ninput_items_required.size(); @@ -73,7 +73,7 @@ namespace gr { } int - fractional_interpolator_ff_impl::general_work(int noutput_items, + mmse_interpolator_ff_impl::general_work(int noutput_items, gr_vector_int &ninput_items, gr_vector_const_void_star &input_items, gr_vector_void_star &output_items) @@ -100,25 +100,25 @@ namespace gr { } float - fractional_interpolator_ff_impl::mu() const + mmse_interpolator_ff_impl::mu() const { return d_mu; } float - fractional_interpolator_ff_impl::interp_ratio() const + mmse_interpolator_ff_impl::interp_ratio() const { return d_mu_inc; } void - fractional_interpolator_ff_impl::set_mu(float mu) + mmse_interpolator_ff_impl::set_mu(float mu) { d_mu = mu; } void - fractional_interpolator_ff_impl::set_interp_ratio(float interp_ratio) + mmse_interpolator_ff_impl::set_interp_ratio(float interp_ratio) { d_mu_inc = interp_ratio; } diff --git a/gr-filter/lib/fractional_interpolator_ff_impl.h b/gr-filter/lib/mmse_interpolator_ff_impl.h index 3b3047888f..f3a7eb55f4 100644 --- a/gr-filter/lib/fractional_interpolator_ff_impl.h +++ b/gr-filter/lib/mmse_interpolator_ff_impl.h @@ -20,17 +20,17 @@ * Boston, MA 02110-1301, USA. */ -#ifndef INCLUDED_FRACTIONAL_INTERPOLATOR_FF_IMPL_H -#define INCLUDED_FRACTIONAL_INTERPOLATOR_FF_IMPL_H +#ifndef INCLUDED_MMSE_INTERPOLATOR_FF_IMPL_H +#define INCLUDED_MMSE_INTERPOLATOR_FF_IMPL_H -#include <gnuradio/filter/fractional_interpolator_ff.h> +#include <gnuradio/filter/mmse_interpolator_ff.h> #include <gnuradio/filter/mmse_fir_interpolator_ff.h> namespace gr { namespace filter { - class FILTER_API fractional_interpolator_ff_impl - : public fractional_interpolator_ff + class FILTER_API mmse_interpolator_ff_impl + : public mmse_interpolator_ff { private: float d_mu; @@ -38,9 +38,9 @@ namespace gr { mmse_fir_interpolator_ff *d_interp; public: - fractional_interpolator_ff_impl(float phase_shift, + mmse_interpolator_ff_impl(float phase_shift, float interp_ratio); - ~fractional_interpolator_ff_impl(); + ~mmse_interpolator_ff_impl(); void forecast(int noutput_items, gr_vector_int &ninput_items_required); @@ -58,4 +58,4 @@ namespace gr { } /* namespace filter */ } /* namespace gr */ -#endif /* INCLUDED_FRACTIONAL_INTERPOLATOR_FF_IMPL_H */ +#endif /* INCLUDED_MMSE_INTERPOLATOR_FF_IMPL_H */ diff --git a/gr-filter/lib/fractional_resampler_cc_impl.cc b/gr-filter/lib/mmse_resampler_cc_impl.cc index 4d8def70cd..c77a270594 100644 --- a/gr-filter/lib/fractional_resampler_cc_impl.cc +++ b/gr-filter/lib/mmse_resampler_cc_impl.cc @@ -25,22 +25,22 @@ #endif #include <gnuradio/io_signature.h> -#include "fractional_resampler_cc_impl.h" +#include "mmse_resampler_cc_impl.h" #include <stdexcept> namespace gr { namespace filter { - fractional_resampler_cc::sptr - fractional_resampler_cc::make(float phase_shift, float resamp_ratio) + mmse_resampler_cc::sptr + mmse_resampler_cc::make(float phase_shift, float resamp_ratio) { return gnuradio::get_initial_sptr - (new fractional_resampler_cc_impl(phase_shift, resamp_ratio)); + (new mmse_resampler_cc_impl(phase_shift, resamp_ratio)); } - fractional_resampler_cc_impl::fractional_resampler_cc_impl + mmse_resampler_cc_impl::mmse_resampler_cc_impl (float phase_shift, float resamp_ratio) - : block("fractional_resampler_cc", + : block("mmse_resampler_cc", io_signature::make2(1, 2, sizeof(gr_complex), sizeof(float)), io_signature::make(1, 1, sizeof(gr_complex))), d_mu(phase_shift), d_mu_inc(resamp_ratio), @@ -54,16 +54,16 @@ namespace gr { set_relative_rate(1.0 / resamp_ratio); message_port_register_in(pmt::intern("msg_in")); set_msg_handler(pmt::intern("msg_in"), boost::bind( - &fractional_resampler_cc_impl::handle_msg, this, _1)); + &mmse_resampler_cc_impl::handle_msg, this, _1)); } - fractional_resampler_cc_impl::~fractional_resampler_cc_impl() + mmse_resampler_cc_impl::~mmse_resampler_cc_impl() { delete d_resamp; } void - fractional_resampler_cc_impl::handle_msg(pmt::pmt_t msg) { + mmse_resampler_cc_impl::handle_msg(pmt::pmt_t msg) { if(!pmt::is_dict(msg)) return; // set resamp_ratio or mu by message dict @@ -86,7 +86,7 @@ namespace gr { } void - fractional_resampler_cc_impl::forecast(int noutput_items, + mmse_resampler_cc_impl::forecast(int noutput_items, gr_vector_int &ninput_items_required) { unsigned ninputs = ninput_items_required.size(); @@ -97,7 +97,7 @@ namespace gr { } int - fractional_resampler_cc_impl::general_work(int noutput_items, + mmse_resampler_cc_impl::general_work(int noutput_items, gr_vector_int &ninput_items, gr_vector_const_void_star &input_items, gr_vector_void_star &output_items) @@ -143,25 +143,25 @@ namespace gr { } float - fractional_resampler_cc_impl::mu() const + mmse_resampler_cc_impl::mu() const { return d_mu; } float - fractional_resampler_cc_impl::resamp_ratio() const + mmse_resampler_cc_impl::resamp_ratio() const { return d_mu_inc; } void - fractional_resampler_cc_impl::set_mu(float mu) + mmse_resampler_cc_impl::set_mu(float mu) { d_mu = mu; } void - fractional_resampler_cc_impl::set_resamp_ratio(float resamp_ratio) + mmse_resampler_cc_impl::set_resamp_ratio(float resamp_ratio) { d_mu_inc = resamp_ratio; } diff --git a/gr-filter/lib/fractional_resampler_cc_impl.h b/gr-filter/lib/mmse_resampler_cc_impl.h index 8b7d9de317..d1922b6a46 100644 --- a/gr-filter/lib/fractional_resampler_cc_impl.h +++ b/gr-filter/lib/mmse_resampler_cc_impl.h @@ -20,17 +20,17 @@ * Boston, MA 02110-1301, USA. */ -#ifndef INCLUDED_FRACTIONAL_RESAMPLER_CC_IMPL_H -#define INCLUDED_FRACTIONAL_RESAMPLER_CC_IMPL_H +#ifndef INCLUDED_MMSE_RESAMPLER_CC_IMPL_H +#define INCLUDED_MMSE_RESAMPLER_CC_IMPL_H -#include <gnuradio/filter/fractional_resampler_cc.h> +#include <gnuradio/filter/mmse_resampler_cc.h> #include <gnuradio/filter/mmse_fir_interpolator_cc.h> namespace gr { namespace filter { - class FILTER_API fractional_resampler_cc_impl - : public fractional_resampler_cc + class FILTER_API mmse_resampler_cc_impl + : public mmse_resampler_cc { private: float d_mu; @@ -38,9 +38,9 @@ namespace gr { mmse_fir_interpolator_cc *d_resamp; public: - fractional_resampler_cc_impl(float phase_shift, + mmse_resampler_cc_impl(float phase_shift, float resamp_ratio); - ~fractional_resampler_cc_impl(); + ~mmse_resampler_cc_impl(); void handle_msg(pmt::pmt_t msg); @@ -60,4 +60,4 @@ namespace gr { } /* namespace filter */ } /* namespace gr */ -#endif /* INCLUDED_FRACTIONAL_RESAMPLER_CC_IMPL_H */ +#endif /* INCLUDED_MMSE_RESAMPLER_CC_IMPL_H */ diff --git a/gr-filter/lib/fractional_resampler_ff_impl.cc b/gr-filter/lib/mmse_resampler_ff_impl.cc index 6fcd7e53d3..d75df89bc4 100644 --- a/gr-filter/lib/fractional_resampler_ff_impl.cc +++ b/gr-filter/lib/mmse_resampler_ff_impl.cc @@ -25,22 +25,22 @@ #endif #include <gnuradio/io_signature.h> -#include "fractional_resampler_ff_impl.h" +#include "mmse_resampler_ff_impl.h" #include <stdexcept> namespace gr { namespace filter { - fractional_resampler_ff::sptr - fractional_resampler_ff::make(float phase_shift, float resamp_ratio) + mmse_resampler_ff::sptr + mmse_resampler_ff::make(float phase_shift, float resamp_ratio) { return gnuradio::get_initial_sptr - (new fractional_resampler_ff_impl(phase_shift, resamp_ratio)); + (new mmse_resampler_ff_impl(phase_shift, resamp_ratio)); } - fractional_resampler_ff_impl::fractional_resampler_ff_impl + mmse_resampler_ff_impl::mmse_resampler_ff_impl (float phase_shift, float resamp_ratio) - : block("fractional_resampler_ff", + : block("mmse_resampler_ff", io_signature::make(1, 2, sizeof(float)), io_signature::make(1, 1, sizeof(float))), d_mu (phase_shift), d_mu_inc (resamp_ratio), @@ -55,16 +55,16 @@ namespace gr { message_port_register_in(pmt::intern("msg_in")); set_msg_handler(pmt::intern("msg_in"), boost::bind( - &fractional_resampler_ff_impl::handle_msg, this, _1)); + &mmse_resampler_ff_impl::handle_msg, this, _1)); } - fractional_resampler_ff_impl::~fractional_resampler_ff_impl() + mmse_resampler_ff_impl::~mmse_resampler_ff_impl() { delete d_resamp; } void - fractional_resampler_ff_impl::handle_msg(pmt::pmt_t msg) { + mmse_resampler_ff_impl::handle_msg(pmt::pmt_t msg) { if(!pmt::is_dict(msg)) return; // set resamp_ratio or mu by message dict @@ -87,7 +87,7 @@ namespace gr { } void - fractional_resampler_ff_impl::forecast(int noutput_items, + mmse_resampler_ff_impl::forecast(int noutput_items, gr_vector_int &ninput_items_required) { unsigned ninputs = ninput_items_required.size(); @@ -98,7 +98,7 @@ namespace gr { } int - fractional_resampler_ff_impl::general_work(int noutput_items, + mmse_resampler_ff_impl::general_work(int noutput_items, gr_vector_int &ninput_items, gr_vector_const_void_star &input_items, gr_vector_void_star &output_items) @@ -143,25 +143,25 @@ namespace gr { } float - fractional_resampler_ff_impl::mu() const + mmse_resampler_ff_impl::mu() const { return d_mu; } float - fractional_resampler_ff_impl::resamp_ratio() const + mmse_resampler_ff_impl::resamp_ratio() const { return d_mu_inc; } void - fractional_resampler_ff_impl::set_mu(float mu) + mmse_resampler_ff_impl::set_mu(float mu) { d_mu = mu; } void - fractional_resampler_ff_impl::set_resamp_ratio(float resamp_ratio) + mmse_resampler_ff_impl::set_resamp_ratio(float resamp_ratio) { d_mu_inc = resamp_ratio; } diff --git a/gr-filter/lib/fractional_resampler_ff_impl.h b/gr-filter/lib/mmse_resampler_ff_impl.h index cccc1be4b3..1793224aeb 100644 --- a/gr-filter/lib/fractional_resampler_ff_impl.h +++ b/gr-filter/lib/mmse_resampler_ff_impl.h @@ -20,17 +20,17 @@ * Boston, MA 02110-1301, USA. */ -#ifndef INCLUDED_FRACTIONAL_RESAMPLER_FF_IMPL_H -#define INCLUDED_FRACTIONAL_RESAMPLER_FF_IMPL_H +#ifndef INCLUDED_MMSE_RESAMPLER_FF_IMPL_H +#define INCLUDED_MMSE_RESAMPLER_FF_IMPL_H -#include <gnuradio/filter/fractional_resampler_ff.h> +#include <gnuradio/filter/mmse_resampler_ff.h> #include <gnuradio/filter/mmse_fir_interpolator_ff.h> namespace gr { namespace filter { - class FILTER_API fractional_resampler_ff_impl - : public fractional_resampler_ff + class FILTER_API mmse_resampler_ff_impl + : public mmse_resampler_ff { private: float d_mu; @@ -38,9 +38,9 @@ namespace gr { mmse_fir_interpolator_ff *d_resamp; public: - fractional_resampler_ff_impl(float phase_shift, + mmse_resampler_ff_impl(float phase_shift, float resamp_ratio); - ~fractional_resampler_ff_impl(); + ~mmse_resampler_ff_impl(); void handle_msg(pmt::pmt_t msg); @@ -60,4 +60,4 @@ namespace gr { } /* namespace filter */ } /* namespace gr */ -#endif /* INCLUDED_FRACTIONAL_RESAMPLER_FF_IMPL_H */ +#endif /* INCLUDED_MMSE_RESAMPLER_FF_IMPL_H */ diff --git a/gr-filter/python/filter/qa_fractional_interpolator.py b/gr-filter/python/filter/qa_fractional_interpolator.py index 05f5a2388b..52af92f408 100644 --- a/gr-filter/python/filter/qa_fractional_interpolator.py +++ b/gr-filter/python/filter/qa_fractional_interpolator.py @@ -37,7 +37,7 @@ def sig_source_c(samp_rate, freq, amp, N): 1j*math.sin(2.*math.pi*freq*x) for x in t] return y -class test_fractional_resampler(gr_unittest.TestCase): +class test_mmse_resampler(gr_unittest.TestCase): def setUp(self): self.tb = gr.top_block() @@ -53,7 +53,7 @@ class test_fractional_resampler(gr_unittest.TestCase): freq = 10 data = sig_source_f(fs, freq, 1, N) signal = blocks.vector_source_f(data) - op = filter.fractional_interpolator_ff(0, rrate) + op = filter.mmse_interpolator_ff(0, rrate) snk = blocks.vector_sink_f() self.tb.connect(signal, op, snk) @@ -79,7 +79,7 @@ class test_fractional_resampler(gr_unittest.TestCase): freq = 10 data = sig_source_c(fs, freq, 1, N) signal = blocks.vector_source_c(data) - op = filter.fractional_interpolator_cc(0.0, rrate) + op = filter.mmse_interpolator_cc(0.0, rrate) snk = blocks.vector_sink_c() self.tb.connect(signal, op, snk) @@ -99,4 +99,4 @@ class test_fractional_resampler(gr_unittest.TestCase): if __name__ == '__main__': - gr_unittest.run(test_fractional_resampler, "test_fractional_resampler.xml") + gr_unittest.run(test_mmse_resampler, "test_mmse_resampler.xml") diff --git a/gr-filter/python/filter/qa_fractional_resampler.py b/gr-filter/python/filter/qa_fractional_resampler.py index 025bed82cb..d49bca1e18 100644 --- a/gr-filter/python/filter/qa_fractional_resampler.py +++ b/gr-filter/python/filter/qa_fractional_resampler.py @@ -41,7 +41,7 @@ def const_source_f(amp, N): y = N*[amp,] return y -class test_fractional_resampler(gr_unittest.TestCase): +class test_mmse_resampler(gr_unittest.TestCase): def setUp(self): self.tb = gr.top_block() @@ -57,7 +57,7 @@ class test_fractional_resampler(gr_unittest.TestCase): freq = 10 data = sig_source_f(fs, freq, 1, N) signal = blocks.vector_source_f(data) - op = filter.fractional_resampler_ff(0, rrate) + op = filter.mmse_resampler_ff(0, rrate) snk = blocks.vector_sink_f() self.tb.connect(signal, op, snk) @@ -82,7 +82,7 @@ class test_fractional_resampler(gr_unittest.TestCase): freq = 10 data = sig_source_c(fs, freq, 1, N) signal = blocks.vector_source_c(data) - op = filter.fractional_resampler_cc(0.0, rrate) + op = filter.mmse_resampler_cc(0.0, rrate) snk = blocks.vector_sink_c() self.tb.connect(signal, op, snk) @@ -110,7 +110,7 @@ class test_fractional_resampler(gr_unittest.TestCase): ctrl = const_source_f(rrate, N) signal = blocks.vector_source_f(data) control = blocks.vector_source_f(ctrl) - op = filter.fractional_resampler_ff(0, 1) + op = filter.mmse_resampler_ff(0, 1) snk = blocks.vector_sink_f() self.tb.connect(signal, op, snk) @@ -138,7 +138,7 @@ class test_fractional_resampler(gr_unittest.TestCase): ctrl = const_source_f(rrate, N) signal = blocks.vector_source_c(data) control = blocks.vector_source_f(ctrl) - op = filter.fractional_resampler_cc(0.0, 1) + op = filter.mmse_resampler_cc(0.0, 1) snk = blocks.vector_sink_c() self.tb.connect(signal, op, snk) @@ -158,4 +158,4 @@ class test_fractional_resampler(gr_unittest.TestCase): self.assertComplexTuplesAlmostEqual(expected_data[-Ntest:], dst_data[-Ntest:], 3) if __name__ == '__main__': - gr_unittest.run(test_fractional_resampler, "test_fractional_resampler.xml") + gr_unittest.run(test_mmse_resampler, "test_mmse_resampler.xml") diff --git a/gr-filter/swig/filter_swig.i b/gr-filter/swig/filter_swig.i index b267fb591a..db0ad0fd95 100644 --- a/gr-filter/swig/filter_swig.i +++ b/gr-filter/swig/filter_swig.i @@ -43,10 +43,10 @@ #include "gnuradio/filter/fft_filter_ccc.h" #include "gnuradio/filter/fft_filter_ccf.h" #include "gnuradio/filter/fft_filter_fff.h" -#include "gnuradio/filter/fractional_interpolator_cc.h" -#include "gnuradio/filter/fractional_interpolator_ff.h" -#include "gnuradio/filter/fractional_resampler_cc.h" -#include "gnuradio/filter/fractional_resampler_ff.h" +#include "gnuradio/filter/mmse_interpolator_cc.h" +#include "gnuradio/filter/mmse_interpolator_ff.h" +#include "gnuradio/filter/mmse_resampler_cc.h" +#include "gnuradio/filter/mmse_resampler_ff.h" #include "gnuradio/filter/freq_xlating_fir_filter_ccc.h" #include "gnuradio/filter/freq_xlating_fir_filter_ccf.h" #include "gnuradio/filter/freq_xlating_fir_filter_fcc.h" @@ -97,10 +97,10 @@ %include "gnuradio/filter/fft_filter_ccc.h" %include "gnuradio/filter/fft_filter_ccf.h" %include "gnuradio/filter/fft_filter_fff.h" -%include "gnuradio/filter/fractional_interpolator_cc.h" -%include "gnuradio/filter/fractional_interpolator_ff.h" -%include "gnuradio/filter/fractional_resampler_cc.h" -%include "gnuradio/filter/fractional_resampler_ff.h" +%include "gnuradio/filter/mmse_interpolator_cc.h" +%include "gnuradio/filter/mmse_interpolator_ff.h" +%include "gnuradio/filter/mmse_resampler_cc.h" +%include "gnuradio/filter/mmse_resampler_ff.h" %include "gnuradio/filter/freq_xlating_fir_filter_ccc.h" %include "gnuradio/filter/freq_xlating_fir_filter_ccf.h" %include "gnuradio/filter/freq_xlating_fir_filter_fcc.h" @@ -148,10 +148,10 @@ GR_SWIG_BLOCK_MAGIC2(filter, fir_filter_scc); GR_SWIG_BLOCK_MAGIC2(filter, fft_filter_ccc); GR_SWIG_BLOCK_MAGIC2(filter, fft_filter_ccf); GR_SWIG_BLOCK_MAGIC2(filter, fft_filter_fff); -GR_SWIG_BLOCK_MAGIC2(filter, fractional_interpolator_cc); -GR_SWIG_BLOCK_MAGIC2(filter, fractional_interpolator_ff); -GR_SWIG_BLOCK_MAGIC2(filter, fractional_resampler_cc); -GR_SWIG_BLOCK_MAGIC2(filter, fractional_resampler_ff); +GR_SWIG_BLOCK_MAGIC2(filter, mmse_interpolator_cc); +GR_SWIG_BLOCK_MAGIC2(filter, mmse_interpolator_ff); +GR_SWIG_BLOCK_MAGIC2(filter, mmse_resampler_cc); +GR_SWIG_BLOCK_MAGIC2(filter, mmse_resampler_ff); GR_SWIG_BLOCK_MAGIC2(filter, freq_xlating_fir_filter_ccc); GR_SWIG_BLOCK_MAGIC2(filter, freq_xlating_fir_filter_ccf); GR_SWIG_BLOCK_MAGIC2(filter, freq_xlating_fir_filter_fcc); diff --git a/volk b/volk -Subproject 018498173344ccc10c6911a828c56136e523b14 +Subproject 187993e4fb85fd9cce4f47b5d9509cc3955e784 |