diff options
| author | Maximilian Stiefel <stiefel.maximilian@online.de> | 2020-01-07 17:03:59 -0800 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2020-01-08 10:19:44 -0800 |
| commit | 445aa4792dcdf4a8bf14600e6d931451e36f0eaa (patch) | |
| tree | 8a011d807a5f30fdf8cac945b5ba294a0937d5af /gr-digital/lib/ofdm_cyclic_prefixer_impl.h | |
| parent | 90c49ef6d4d215f1db01f591d682947fea727655 (diff) | |
digital: ofdm: Allow multiple CP lengths for cyclic prefixer
This allows to specify multiple CP lengths that can be used one
after another, for example for LTE modulators.
- Improve sanity checking
- Maintains old API
Diffstat (limited to 'gr-digital/lib/ofdm_cyclic_prefixer_impl.h')
| -rw-r--r-- | gr-digital/lib/ofdm_cyclic_prefixer_impl.h | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/gr-digital/lib/ofdm_cyclic_prefixer_impl.h b/gr-digital/lib/ofdm_cyclic_prefixer_impl.h index 50b05f95d4..4e4cab5ddd 100644 --- a/gr-digital/lib/ofdm_cyclic_prefixer_impl.h +++ b/gr-digital/lib/ofdm_cyclic_prefixer_impl.h @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2013 Free Software Foundation, Inc. + * Copyright 2013, 2018 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -24,6 +24,7 @@ #define INCLUDED_DIGITAL_OFDM_CYCLIC_PREFIXER_IMPL_H #include <gnuradio/digital/ofdm_cyclic_prefixer.h> +#include <vector> namespace gr { namespace digital { @@ -31,26 +32,34 @@ namespace digital { class ofdm_cyclic_prefixer_impl : public ofdm_cyclic_prefixer { private: - size_t d_fft_len; - //! FFT length + CP length in samples - size_t d_output_size; - //! Length of the cyclic prefix in samples - int d_cp_size; + //! FFT length + int d_fft_len; + //! State, that determines the current output length used. + unsigned d_state; + //! Variable being initialized with the largest CP. + int d_cp_max; + //! Variable being initialized with the smallest CP. + int d_cp_min; //! Length of pulse rolloff in samples int d_rolloff_len; + //! Vector, that holds different CP lengths + std::vector<int> d_cp_lengths; //! Buffers the up-flank (at the beginning of the cyclic prefix) std::vector<float> d_up_flank; //! Buffers the down-flank (which trails the symbol) std::vector<float> d_down_flank; + //! Vector, that holds tail of the predecessor symbol. std::vector<gr_complex> d_delay_line; // We do this explicitly to avoid outputting // zeroes (i.e. no history!) + //! Holds the length tag key. + const std::string d_len_tag_key; protected: int calculate_output_stream_length(const gr_vector_int& ninput_items); public: - ofdm_cyclic_prefixer_impl(size_t input_size, - size_t output_size, + ofdm_cyclic_prefixer_impl(int fft_len, + const std::vector<int>& cp_lengths, int rolloff_len, const std::string& len_tag_key); ~ofdm_cyclic_prefixer_impl(); |