diff options
| author | Matthias P. Braendli <matthias.braendli@mpb.li> | 2015-01-23 10:18:17 +0100 |
|---|---|---|
| committer | Matthias P. Braendli <matthias.braendli@mpb.li> | 2015-01-23 10:51:26 +0100 |
| commit | e12c679b8cc8a263507c556cb24819dc0d5559b9 (patch) | |
| tree | 8f2cd06710d15ca64a4a86c1ce52bc975ec3f2b0 /src/OfdmGenerator.h | |
| parent | d82422fbb3d9d34a0566197245376548ce3ef14e (diff) | |
| parent | 94c1f63b6fd07d74f3325274dd19fd6beaf53965 (diff) | |
| download | dabmod-e12c679b8cc8a263507c556cb24819dc0d5559b9.tar.gz dabmod-e12c679b8cc8a263507c556cb24819dc0d5559b9.tar.bz2 dabmod-e12c679b8cc8a263507c556cb24819dc0d5559b9.zip | |
Merge raspine's ZeroMQ RC and UHD staticdelay
Merge raspine/master pull request, fix indentation, code style, and two
minor conflicts in:
doc/example.ini
src/DabMod.cpp
Diffstat (limited to 'src/OfdmGenerator.h')
| -rw-r--r-- | src/OfdmGenerator.h | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/src/OfdmGenerator.h b/src/OfdmGenerator.h index 5be2d03..ec9f14a 100644 --- a/src/OfdmGenerator.h +++ b/src/OfdmGenerator.h @@ -1,6 +1,11 @@ /* Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011 Her Majesty the Queen in Right of Canada (Communications Research Center Canada) + + Copyright (C) 2014 + Matthias P. Braendli, matthias.braendli@mpb.li + + http://opendigitalradio.org */ /* This file is part of ODR-DabMod. @@ -28,10 +33,14 @@ #include "porting.h" #include "ModCodec.h" -#include "kiss_fftsimd.h" +#if USE_FFTW +# include "fftw3.h" +#else +# include "kiss_fftsimd.h" +# include <kiss_fft.h> +#endif -#include <kiss_fft.h> #include <sys/types.h> @@ -48,8 +57,13 @@ public: const char* name() { return "OfdmGenerator"; } protected: +#if USE_FFTW + fftwf_plan myFftPlan; + fftwf_complex *myFftIn, *myFftOut; +#else FFT_PLAN myFftPlan; FFT_TYPE *myFftBuffer; +#endif size_t myNbSymbols; size_t myNbCarriers; size_t mySpacing; @@ -63,5 +77,5 @@ protected: unsigned myZeroSize; }; - #endif // OFDM_GENERATOR_H + |