diff options
author | Matthias P. Braendli <matthias.braendli@mpb.li> | 2017-12-30 10:25:45 +0100 |
---|---|---|
committer | Matthias P. Braendli <matthias.braendli@mpb.li> | 2017-12-30 10:25:45 +0100 |
commit | e0f9c8909ecba56da4c7a2ec3507b8af19b737bd (patch) | |
tree | 7c72d6f36a37a7cad87d637f9452dbf2693cee1a /src/OfdmGenerator.h | |
parent | 0c0f828c6bccee3aeb3049cb8b5bb480153cd3b6 (diff) | |
parent | 1dadf3b7856940911724d02613085d57535da474 (diff) | |
download | dabmod-e0f9c8909ecba56da4c7a2ec3507b8af19b737bd.tar.gz dabmod-e0f9c8909ecba56da4c7a2ec3507b8af19b737bd.tar.bz2 dabmod-e0f9c8909ecba56da4c7a2ec3507b8af19b737bd.zip |
Merge branch 'next' into outputRefactoring
Diffstat (limited to 'src/OfdmGenerator.h')
-rw-r--r-- | src/OfdmGenerator.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/OfdmGenerator.h b/src/OfdmGenerator.h index 008d84e..cccccf5 100644 --- a/src/OfdmGenerator.h +++ b/src/OfdmGenerator.h @@ -30,13 +30,14 @@ # include "config.h" #endif -#include "porting.h" #include "ModPlugin.h" #include "RemoteControl.h" +#include "PAPRStats.h" #include "fftw3.h" -#include <sys/types.h> +#include <cstddef> #include <vector> #include <complex> +#include <atomic> typedef std::complex<float> complexf; @@ -102,6 +103,11 @@ class OfdmGenerator : public ModCodec, public RemoteControllable std::deque<double> myClipRatios; std::deque<double> myErrorClipRatios; + // Measure PAPR before and after CFR + PAPRStats myPaprBeforeCFR; + PAPRStats myPaprAfterCFR; + std::atomic<bool> myPaprClearRequest; + size_t myMERCalcIndex = 0; std::deque<double> myMERs; }; |