diff options
author | Matthias P. Braendli <matthias.braendli@mpb.li> | 2017-08-21 18:14:55 +0200 |
---|---|---|
committer | Matthias P. Braendli <matthias.braendli@mpb.li> | 2017-09-28 13:36:48 +0200 |
commit | 571d57c591b23d212934f0bb969c33d15c729982 (patch) | |
tree | c5d39bea968b052de46d187ffc0cffab91084aa4 /src/OfdmGenerator.h | |
parent | 75653763057bb9bf018dfde1a3cda8681c8b8e34 (diff) | |
download | dabmod-571d57c591b23d212934f0bb969c33d15c729982.tar.gz dabmod-571d57c591b23d212934f0bb969c33d15c729982.tar.bz2 dabmod-571d57c591b23d212934f0bb969c33d15c729982.zip |
Fix some CFR things, still WIP
Diffstat (limited to 'src/OfdmGenerator.h')
-rw-r--r-- | src/OfdmGenerator.h | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/OfdmGenerator.h b/src/OfdmGenerator.h index 9a6fa01..a41d583 100644 --- a/src/OfdmGenerator.h +++ b/src/OfdmGenerator.h @@ -46,6 +46,9 @@ class OfdmGenerator : public ModCodec, public RemoteControllable OfdmGenerator(size_t nbSymbols, size_t nbCarriers, size_t spacing, + bool enableCfr, + float cfrClip, + float cfrErrorClip, bool inverse = true); virtual ~OfdmGenerator(); OfdmGenerator(const OfdmGenerator&) = delete; @@ -65,7 +68,7 @@ class OfdmGenerator : public ModCodec, public RemoteControllable const std::string& parameter) const override; protected: - void cfr_one_iteration(Buffer *symbols, size_t symbol_ix); + void cfr_one_iteration(complexf *symbol, const complexf *reference); fftwf_plan myFftPlan; fftwf_complex *myFftIn, *myFftOut; @@ -85,8 +88,11 @@ class OfdmGenerator : public ModCodec, public RemoteControllable float myCfrClip; float myCfrErrorClip; fftwf_plan myCfrFft; - std::vector<complexf> myCfrPostClip; - std::vector<complexf> myCfrPostFft; + fftwf_complex *myCfrPostClip; + fftwf_complex *myCfrPostFft; + + size_t myNumClip; + size_t myNumErrorClip; }; |